diff --git a/src/modules/Image/module_testsuite.in b/src/modules/Image/module_testsuite.in
index c8ae5d9ebfc7b0d2f6af78f48b32b4dc3a8dc783..5a641b85222ca9c211e660c5819fefef383f6fe4 100644
--- a/src/modules/Image/module_testsuite.in
+++ b/src/modules/Image/module_testsuite.in
@@ -478,7 +478,7 @@ if (sizeof(z)!=2)
 do { werror("failure; Image.image/Image.Colortable/colortable - black/white init & cast: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
 if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white init & cast: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white init & cast: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
@@ -496,10 +496,10 @@ object c=Image.Colortable(({Image.Color.white,Image.Color.black}));
 img=c*img;
 array z=(array)Image.Colortable(img);
 if (sizeof(z)!=2) 
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
-if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get two colors (black and white): "+((array(string))z)*", " )+"\n"); return 0; } while (0);
+if ((z[0]!=Image.Color.black || z1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white normal: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
@@ -518,10 +518,10 @@ c->floyd_steinberg();
 img=c*img;
 array z=(array)Image.Colortable(img);
 if (sizeof(z)!=2) 
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get two colors (black and white): "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white floyd-steinberg: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
@@ -540,10 +540,10 @@ c->ordered();
 img=c*img;
 array z=(array)Image.Colortable(img);
 if (sizeof(z)!=2) 
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get two colors (black and white): "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get two colors (black and white): "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
 (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get black and white: "+((array(string))c)*", " )+"\n"); return 0; } while (0);
+do { werror("failure; Image.image/Image.Colortable/colortable - black/white ordered: "+( "didn't get black and white: "+((array(string))z)*", " )+"\n"); return 0; } while (0);
 return 1;
 
 }
diff --git a/src/modules/Image/testsuite.in.in b/src/modules/Image/testsuite.in.in
index 2652422a0cbbe02dd61bdaf62c49bb9b62a6e0ad..771fab2d6908930337810a414e15afff5ccdfbc5 100644
--- a/src/modules/Image/testsuite.in.in
+++ b/src/modules/Image/testsuite.in.in
@@ -278,7 +278,7 @@
       fail("didn't get two colors (black and white): "+((array(string))c)*", ");
    if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - black/white normal
@@ -287,10 +287,10 @@
    img=c*img;
    array z=(array)Image.Colortable(img);
    if (sizeof(z)!=2) 
-      fail("didn't get two colors (black and white): "+((array(string))c)*", ");
-   if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
+      fail("didn't get two colors (black and white): "+((array(string))z)*", ");
+   if ((z[0]!=Image.Color.black || z1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - black/white floyd-steinberg
@@ -300,10 +300,10 @@
    img=c*img;
    array z=(array)Image.Colortable(img);
    if (sizeof(z)!=2) 
-      fail("didn't get two colors (black and white): "+((array(string))c)*", ");
+      fail("didn't get two colors (black and white): "+((array(string))z)*", ");
    if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - black/white ordered
@@ -313,10 +313,10 @@
    img=c*img;
    array z=(array)Image.Colortable(img);
    if (sizeof(z)!=2) 
-      fail("didn't get two colors (black and white): "+((array(string))c)*", ");
+      fail("didn't get two colors (black and white): "+((array(string))z)*", ");
    if ((z[0]!=Image.Color.black || z[1]!=Image.Color.white) &&
        (z[1]!=Image.Color.black || z[0]!=Image.Color.white))
-      fail("didn't get black and white: "+((array(string))c)*", ");
+      fail("didn't get black and white: "+((array(string))z)*", ");
    ok();
 
 #test colortable - standard