Index: sources/test_regression/02052006/system.cpp
===================================================================
--- sources/test_regression/02052006/system.cpp	(revision 21)
+++ sources/test_regression/02052006/system.cpp	(revision 23)
@@ -13,5 +13,5 @@
 
 struct test : sc_module {
-  int                             reg;
+  int32_t                         reg;
   sc_signal<bool>                 reg_bool;
   sc_signal<int>                  reg_int;
@@ -38,4 +38,8 @@
       ASSERT(((unsigned int)reg)    == reg_unsigned_int   .read());
       ASSERT(((char)  reg)        == reg_char  .read());
+#if 0
+      cout << (double)reg << " " << reg_double.read() << endl;
+      cout << sizeof (double) << " " << sizeof (reg_double.read()) << endl;
+#endif
       ASSERT(((double)reg)          == reg_double.read());
       ASSERT(((long)  reg)          == reg_long  .read());
@@ -48,5 +52,5 @@
       ASSERT(((signed int) reg & 0xFFFFFFFF) == (signed int) (reg_i32 .read()));
       ASSERT(((signed int) reg & 0x0000FFFF) == (signed int) (reg_i16 .read()));
-      ASSERT(((signed int) reg & 0x0000003F)  == (signed int) (reg_i6  .read()));
+      ASSERT(((signed int) reg & 0x0000003F) == (signed int) (reg_i6  .read()));
       reg        = reg + 1;
       reg_bool   = reg & 1;
@@ -54,5 +58,5 @@
       reg_unsigned_int = reg;
       reg_char   = reg;
-      reg_double = reg;
+      reg_double .write(reg);
       reg_long   = reg;
       reg_ui32   = reg;
@@ -80,16 +84,16 @@
 
   SC_HAS_PROCESS(test);
-	test (sc_module_name n) : sc_module (n),
+    test (sc_module_name n) : sc_module (n),
     clk("clk")
   {
-		SC_METHOD(trans);
-		sensitive << clk.pos();
+    SC_METHOD(trans);
+    sensitive << clk.pos();
     dont_initialize();
-	};
+  };
 };
 
 int sc_main (int argc, char *argv[])
 {
-	sc_clock        signal_clk("my_clock",1, 0.5);
+  sc_clock        signal_clk("my_clock",1, 0.5);
   sc_signal<bool> resetn("resetn");
 
@@ -98,13 +102,13 @@
   test1.resetn (resetn);
 
-	// Init & run
-	sc_start (0);
+  // Init & run
+  sc_start (0);
 
   resetn = false;
-	sc_start (4);
+  sc_start (4);
   resetn = true;
   sc_start (100);
 
-	return EXIT_SUCCESS;
+  return EXIT_SUCCESS;
 }
 
Index: sources/test_regression/19042005/system.cpp
===================================================================
--- sources/test_regression/19042005/system.cpp	(revision 21)
+++ sources/test_regression/19042005/system.cpp	(revision 23)
@@ -128,6 +128,6 @@
 	sc_trace(system_trace_file, signal_clk, "clk");
 
-  bool   b1 = 0;
-  long   l1 = 0;
+  bool     b1 = 0;
+  uint64_t l1 = 0;
 
 #if 0
Index: sources/test_regression/19042005/system_systemcass.x-60_reference.vcd
===================================================================
--- sources/test_regression/19042005/system_systemcass.x-60_reference.vcd	(revision 21)
+++ sources/test_regression/19042005/system_systemcass.x-60_reference.vcd	(revision 23)
@@ -7,5 +7,5 @@
 $var wire    1  aaa  clk       $end
 $var wire    1  aab  b1       $end
-$var wire   32  aac  l1 [31:0]       $end
+$var wire   64  aac  l1 [63:0]       $end
 $var wire    1  aad  test1.i1       $end
 $var wire    8  aae  test1.i2 [7:0]       $end
Index: sources/test_regression/28102005/system.cpp
===================================================================
--- sources/test_regression/28102005/system.cpp	(revision 21)
+++ sources/test_regression/28102005/system.cpp	(revision 23)
@@ -27,8 +27,12 @@
 check_time (int i)
 {
-	const sc_time &t = sc_time_stamp ();
+  const sc_time &t = sc_time_stamp ();
   CERR(i);
   CERR(t.to_double());
+#ifdef SYSTEMCASS_SPECIFIC
+  ASSERT((int) (t.to_double ()) == i);
+#else
   ASSERT((int) (t.to_double ()) == i * 1000);
+#endif
   CERR(t.to_seconds ());
 	double seconds = t.to_seconds()*1000000000;
@@ -37,4 +41,7 @@
   char s[256];
   const char *unit;
+#ifdef SYSTEMCASS_SPECIFIC
+  unit = "NS";
+#else
   if (i == 0)
     unit = "s";
@@ -43,4 +50,5 @@
   else
     unit = "ns";
+#endif
   sprintf (s, "%d %s", i,unit);
   CERR(s);
@@ -55,20 +63,20 @@
 
   check_time (0);
-	sc_start (0);
+  sc_start (0);
 
   check_time (0);
-	sc_start (1);
+  sc_start (1);
   check_time (1);
 
-	sc_start (15);
+  sc_start (15);
   check_time (16);
 
-	sc_start (7);
+  sc_start (7);
   check_time (23);
 
-	sc_start (100);
+  sc_start (100);
   check_time (123);
 
-	sc_start (1000);
+  sc_start (1000);
   check_time (1123);
   cerr << "Test OK.\n";