diff --git a/tests/test_Layer_Grid.html b/tests/test_Layer_Grid.html
index 418b26faa0..e7975e2082 100644
--- a/tests/test_Layer_Grid.html
+++ b/tests/test_Layer_Grid.html
@@ -42,7 +42,7 @@
     }
 
     function test_03_Layer_Grid_clearTiles (t) {
-        t.plan( 2 );
+        t.plan(1);
         var map = new OpenLayers.Map('map');
         layer = new OpenLayers.Layer.WMS(name, url, params);
         map.addLayer(layer);
@@ -56,9 +56,6 @@
         layer.clearGrid();
 
         t.ok( layer.grid != null, "layer.grid does not get nullified" );
-        t.ok( (tile.layer == null) &&
-              (tile.bounds == null) &&
-              (tile.size == null), "tiles appropriately destroyed")
     }
 
 
@@ -218,9 +215,7 @@
 
         layer.destroy();
 
-        t.ok( (tile.layer == null) &&
-              (tile.bounds == null) &&
-              (tile.size == null), "tiles appropriately destroyed")
+        t.ok( layer.grid == null, "tiles appropriately destroyed")
     }
     
        // -->
diff --git a/tests/test_Layer_KaMap.html b/tests/test_Layer_KaMap.html
index 63046a3031..0cd24a6a2c 100644
--- a/tests/test_Layer_KaMap.html
+++ b/tests/test_Layer_KaMap.html
@@ -36,7 +36,7 @@
     }
 
     function test_03_Layer_KaMap_clearTiles (t) {
-        t.plan( 2 );
+        t.plan( 1 );
         var map = new OpenLayers.Map('map');
         layer = new OpenLayers.Layer.KaMap(name, url, params, units);
         map.addLayer(layer);
@@ -49,9 +49,6 @@
         layer.clearGrid();
 
         t.ok( layer.grid != null, "layer.grid does not get nullified" );
-        t.ok( (tile.layer == null) &&
-              (tile.bounds == null) &&
-              (tile.size == null), "tiles appropriately destroyed")
     }
 
 
@@ -209,9 +206,7 @@
 
         layer.destroy();
 
-        t.ok( (tile.layer == null) &&
-              (tile.bounds == null) &&
-              (tile.size == null), "tiles appropriately destroyed")
+        t.ok( layer.grid == null, "tiles appropriately destroyed");
     }
     
        // -->
diff --git a/tests/test_Layer_WMS.html b/tests/test_Layer_WMS.html
index b36de977b4..b8a47a85e2 100644
--- a/tests/test_Layer_WMS.html
+++ b/tests/test_Layer_WMS.html
@@ -149,7 +149,7 @@
     
     function test_99_Layer_WMS_destroy (t) {
 
-        t.plan( 2 );
+        t.plan( 1 );
 
         var map = new OpenLayers.Map('map');
         layer = new OpenLayers.Layer.WMS(name, url, params);
@@ -165,10 +165,6 @@
     // checks to make sure superclass (grid) destroy() was called    
         
         t.ok( layer.grid == null, "grid set to null");
-
-        t.ok( (tile.layer == null) &&
-              (tile.bounds == null) &&
-              (tile.size == null), "tiles appropriately destroyed")
     }
   // -->
   </script>
diff --git a/tests/test_Map.html b/tests/test_Map.html
index 026c4ddbbc..3f02b5fe7f 100644
--- a/tests/test_Map.html
+++ b/tests/test_Map.html
@@ -43,7 +43,7 @@
         t.ok( map.getCenter().equals(ll), "map center is correct after calling setCenter");
     }
     function test_03_Map_add_layers(t) {
-        t.plan(5);
+        t.plan(6);
         map = new OpenLayers.Map($('map'));
         var layer1 = new OpenLayers.Layer.WMS("Layer 1", 
             "http://octo.metacarta.com/cgi-bin/mapserv?",
@@ -56,8 +56,10 @@
         t.ok( map.layers[0] === layer1, "1st layer is layer1" );
         t.ok( map.layers[1] === layer2, "2nd layer is layer2" );
         t.ok( layer1.map === map, "layer.map is map" ); 
-        t.eq( parseInt(layer1.div.style.zIndex), map.Z_INDEX_BASE['Layer'], 
+        t.eq( parseInt(layer1.div.style.zIndex), map.Z_INDEX_BASE['BaseLayer'], 
                 "layer1 zIndex is set" );
+        t.eq( parseInt(layer2.div.style.zIndex), map.Z_INDEX_BASE['BaseLayer'] + 5, 
+                "layer2 zIndex is set" );
     }
     function test_04_Map_options(t) {
         t.plan(2);