diff --git a/lang/cem/ctest/ctconv/conv.cem.g b/lang/cem/ctest/ctconv/conv.cem.g
index af5a607fa..9dc42b05c 100644
--- a/lang/cem/ctest/ctconv/conv.cem.g
+++ b/lang/cem/ctest/ctconv/conv.cem.g
@@ -9,13 +9,18 @@
 (char) -1 = 255
 (char) 10000 = 16
 From character
-	char   127, int    127, unsigned    177, long         127, float 127.000000
-	char   255, int    255, unsigned    377, long         255, float 255.000000
-	char   255, int    255, unsigned    377, long         255, float 255.000000
+	char   127, int    127, unsigned    177, long         127
+					float 127.000000
+	char   255, int    255, unsigned    377, long         255
+					float 255.000000
+	char   255, int    255, unsigned    377, long         255
+					float 255.000000
 From integer
-	char   192, int    -64, unsigned 177700, long         -64, float -64.000000
+	char   192, int    -64, unsigned 177700, long         -64
+					float -64.000000
 From long
-	char   253, int     -3, unsigned 177775, long          -3, float -3.000000
+	char   253, int     -3, unsigned 177775, long          -3
+					float -3.000000
 From float
 	char   121, int    121, unsigned    171, long         121, float 121.500000
 	char     0, int      0, unsigned      0, long           0, float 0.000100
diff --git a/lang/cem/ctest/ctest5/test1.cem.g b/lang/cem/ctest/ctest5/test1.cem.g
index 86628cff0..0436d0e58 100644
--- a/lang/cem/ctest/ctest5/test1.cem.g
+++ b/lang/cem/ctest/ctest5/test1.cem.g
@@ -1,3 +1,3 @@
-error 13 in test 5 
+error 13 in test 11 
 program test1
 11 tests completed. Number of errors = 1
diff --git a/lang/cem/ctest/ctinit/init.cem.g b/lang/cem/ctest/ctinit/init.cem.g
index e0b435fe5..6f1803cc5 100644
--- a/lang/cem/ctest/ctinit/init.cem.g
+++ b/lang/cem/ctest/ctinit/init.cem.g
@@ -45,7 +45,7 @@ fl2	2.00000000000000000000e+00
 fl2	2.00000000000000000000e+00
 fl4	4.00000000000000000000e+00
 fl5	2.93873587705571892581e-39
-fl6	1.70141163178059625000e+38
+fl6	1.70141173319264427000e+38
 fl7	0.00000000000000000000e+00
     fla1                    fla2                    fla3
             1.000000e+00           -1.000000e+00            1.100000e+01
diff --git a/lang/cem/ctest/ctstruct/str.cem.g b/lang/cem/ctest/ctstruct/str.cem.g
index a6b5ad356..4d11e1e76 100644
--- a/lang/cem/ctest/ctstruct/str.cem.g
+++ b/lang/cem/ctest/ctstruct/str.cem.g
@@ -8,8 +8,8 @@ w1
 	st2.w1_i -577
 	st1.w1_i 577
 w2
-	s2t2: .w2_i 18000 .w2_d 3.141500
-	s2t3->w2_d 3.141500
+	s2t2: .w2_i 18000 .w2_l 31415
+	s2t3->w2_l 31415
 w3
 s3t2.w3_a[ 0] a
 s3t2.w3_a[ 1] b
@@ -37,7 +37,7 @@ s3t2.w3_a[22] w
 s3t2.w3_a[23] x
 s3t2.w3_a[24] y
 s3t2.w3_a[25] z
-s3t2.w3_x 1.000000
+s3t2.w3_u 8000
 s3t1.w3_a[ 0] A
 s3t1.w3_a[ 1] B
 s3t1.w3_a[ 2] C
@@ -64,7 +64,7 @@ s3t1.w3_a[22] W
 s3t1.w3_a[23] X
 s3t1.w3_a[24] Y
 s3t1.w3_a[25] Z
-s3t1.w3_x 0.318319
+s3t1.w3_u 587
 structure parameters
 before -1
 str.w3_a[ 0]	1
@@ -93,7 +93,7 @@ str.w3_a[22]	23
 str.w3_a[23]	24
 str.w3_a[24]	25
 str.w3_a[25]	26
-str.w3_x 2.810000
+str.w3_u 119
 after 1000
 
 Stucture valued functions