diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js
index 6ccd490c37..d55be78bc7 100644
--- a/lib/OpenLayers/Control.js
+++ b/lib/OpenLayers/Control.js
@@ -52,7 +52,7 @@ OpenLayers.Control.prototype = {
         // We do this before the extend so that instances can override
         // className in options.
         this.displayClass = 
-            this.CLASS_NAME.replace("OpenLayers.", "ol").replace(".","");
+            this.CLASS_NAME.replace("OpenLayers.", "ol").replace(/\./g, "");
         
         OpenLayers.Util.extend(this, options);
         
diff --git a/tests/Control/test_KeyboardDefaults.html b/tests/Control/test_KeyboardDefaults.html
index c8cb53c5c8..7c44ff4b2d 100644
--- a/tests/Control/test_KeyboardDefaults.html
+++ b/tests/Control/test_KeyboardDefaults.html
@@ -4,11 +4,12 @@
   <script type="text/javascript"><!--
     var map; 
     function test_01_Control_KeyboardDefaults_constructor (t) {
-        t.plan( 1 );
+        t.plan( 2 );
     
         control = new OpenLayers.Control.KeyboardDefaults();
         t.ok( control instanceof OpenLayers.Control.KeyboardDefaults, 
                 "new OpenLayers.Control.KeyboardDefaults returns object" );
+        t.eq( control.displayClass,  "olControlKeyboardDefaults", "displayClass is correct" );
     }
 
     function test_02_Control_KeyboardDefaults_addControl (t) {
diff --git a/tests/Control/test_LayerSwitcher.html b/tests/Control/test_LayerSwitcher.html
index d25c5148d7..cf8140880a 100644
--- a/tests/Control/test_LayerSwitcher.html
+++ b/tests/Control/test_LayerSwitcher.html
@@ -5,10 +5,11 @@
     var map; 
 
     function test_01_Control_LayerSwitcher_constructor (t) {
-        t.plan( 1 );
+        t.plan( 2 );
     
         control = new OpenLayers.Control.LayerSwitcher();
         t.ok( control instanceof OpenLayers.Control.LayerSwitcher, "new OpenLayers.Control.LayerSwitcher returns object" );
+        t.eq( control.displayClass,  "olControlLayerSwitcher", "displayClass is correct" );
     }
 
     function test_02_Control_LayerSwitcher_draw (t) {
diff --git a/tests/Control/test_NavToolbar.html b/tests/Control/test_NavToolbar.html
index a06a3cdc2f..c73218a6f8 100644
--- a/tests/Control/test_NavToolbar.html
+++ b/tests/Control/test_NavToolbar.html
@@ -4,9 +4,10 @@
   <script type="text/javascript"><!--
     var map; 
     function test_01_Control_NavToolbar_constructor (t) {
-        t.plan( 3 );
+        t.plan( 4 );
         control = new OpenLayers.Control.NavToolbar();
         t.ok( control instanceof OpenLayers.Control.NavToolbar, "new OpenLayers.Control.NavToolbar returns object" );
+        t.eq( control.displayClass,  "olControlNavToolbar", "displayClass is correct" );
         t.ok( control.controls[0] instanceof OpenLayers.Control.Navigation, "NavToolbar contains Control.Navigation object" );
         t.ok( control.controls[1] instanceof OpenLayers.Control.ZoomBox, "NavToolbar contains Control.ZoomBox object" );
     }
diff --git a/tests/Control/test_OverviewMap.html b/tests/Control/test_OverviewMap.html
index 2a56df03f4..9e49981bc8 100644
--- a/tests/Control/test_OverviewMap.html
+++ b/tests/Control/test_OverviewMap.html
@@ -3,13 +3,14 @@
   <script src="../../lib/OpenLayers.js"></script>
   <script type="text/javascript"><!--
     var map; 
-    function test_01_Control_PanZoom_constructor (t) {
-        t.plan( 1 );
+    function test_01_Control_OverviewMap_constructor (t) {
+        t.plan( 2 );
     
         control = new OpenLayers.Control.OverviewMap();
         t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" );
+        t.eq( control.displayClass,  "olControlOverviewMap", "displayClass is correct" );
     }
-    function test_02_Control_PanZoom_addControl (t) {
+    function test_02_Control_OverviewMap_addControl (t) {
         t.plan( 6 );
         map = new OpenLayers.Map('map');
         control = new OpenLayers.Control.OverviewMap();
@@ -23,7 +24,7 @@
 
         map.destroy();
     }
-    function test_03_Control_PanZoom_control_events (t) {
+    function test_03_Control_OverviewMap_control_events (t) {
         t.plan( 10 );
         var evt = {which: 1}; // control expects left-click
         map = new OpenLayers.Map('map');
diff --git a/tests/Control/test_PanZoom.html b/tests/Control/test_PanZoom.html
index efd1b9b7e6..b889a8c2fd 100644
--- a/tests/Control/test_PanZoom.html
+++ b/tests/Control/test_PanZoom.html
@@ -4,10 +4,11 @@
   <script type="text/javascript"><!--
     var map; 
     function test_01_Control_PanZoom_constructor (t) {
-        t.plan( 3 );
+        t.plan( 4 );
     
         control = new OpenLayers.Control.PanZoom();
         t.ok( control instanceof OpenLayers.Control.PanZoom, "new OpenLayers.Control.PanZoom returns object" );
+        t.eq( control.displayClass,  "olControlPanZoom", "displayClass is correct" );
         control = new OpenLayers.Control.PanZoom({position: new OpenLayers.Pixel(100,100)});
         t.eq( control.position.x, 100, "PanZoom X Set correctly."); 
         t.eq( control.position.y, 100, "PanZoom y Set correctly."); 
diff --git a/tests/Control/test_PanZoomBar.html b/tests/Control/test_PanZoomBar.html
index 1bb045d986..ac94981a49 100644
--- a/tests/Control/test_PanZoomBar.html
+++ b/tests/Control/test_PanZoomBar.html
@@ -4,10 +4,11 @@
   <script type="text/javascript"><!--
     var map; 
     function test_01_Control_PanZoomBar_constructor (t) {
-        t.plan( 3 );
+        t.plan( 4 );
     
         control = new OpenLayers.Control.PanZoomBar({position: new OpenLayers.Pixel(100,100)});
         t.ok( control instanceof OpenLayers.Control.PanZoomBar, "new OpenLayers.Control.PanZoomBar returns object" );
+        t.eq( control.displayClass,  "olControlPanZoomBar", "displayClass is correct" );
         t.eq( control.position.x, 100, "PanZoom X Set correctly."); 
         t.eq( control.position.y, 100, "PanZoom y Set correctly."); 
     }
diff --git a/tests/Control/test_Panel.html b/tests/Control/test_Panel.html
index 85ca250bd2..e6e217be96 100644
--- a/tests/Control/test_Panel.html
+++ b/tests/Control/test_Panel.html
@@ -3,10 +3,11 @@
   <script src="../../lib/OpenLayers.js"></script>
   <script type="text/javascript"><!--
     function test_Control_Panel_constructor (t) {
-        t.plan( 1 );
+        t.plan( 2 );
     
         control = new OpenLayers.Control.Panel();
         t.ok( control instanceof OpenLayers.Control.Panel, "new OpenLayers.Control returns object" );
+        t.eq( control.displayClass,  "olControlPanel", "displayClass is correct" );
     }
     function test_01_Control_Panel_constructor (t) {
     		t.plan(5);
diff --git a/tests/Control/test_Permalink.html b/tests/Control/test_Permalink.html
index a268e7f51c..2f63d933e1 100644
--- a/tests/Control/test_Permalink.html
+++ b/tests/Control/test_Permalink.html
@@ -4,10 +4,11 @@
   <script type="text/javascript"><!--
     var map; 
     function test_01_Control_Permalink_constructor (t) {
-        t.plan( 1 );
+        t.plan( 2 );
     
         control = new OpenLayers.Control.Permalink();
         t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
+        t.eq( control.displayClass,  "olControlPermalink", "displayClass is correct" );
     }
     function test_02_Control_Permalink_updateLinks (t) {
         t.plan( 2 );
diff --git a/tests/Control/test_Scale.html b/tests/Control/test_Scale.html
index 192cebd144..05fa69a0c1 100644
--- a/tests/Control/test_Scale.html
+++ b/tests/Control/test_Scale.html
@@ -4,10 +4,11 @@
   <script type="text/javascript"><!--
     var map; 
     function test_01_Control_Scale_constructor (t) {
-        t.plan( 1 );
+        t.plan( 2 );
     
         control = new OpenLayers.Control.Scale();
         t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
+        t.eq( control.displayClass,  "olControlScale", "displayClass is correct" );
     }
     function test_02_Control_Scale_updateScale (t) {
         t.plan( 4 );