Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java	(revision 12989)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java	(revision 12990)
@@ -59,5 +59,5 @@
         assertEquals(Color.BLACK, color.get());
         assertEquals(Color.BLACK, color.getDefaultValue());
-        assertEquals("color.layer.test.layer", color.getKey());
+        assertEquals("clr.layer.Test Layer.x", color.getKey());
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy	(revision 12989)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy	(revision 12990)
@@ -6,5 +6,4 @@
 import org.junit.Test
 import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.Main
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -308,5 +307,4 @@
         def expected = new Color(0x88DD22)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
-        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour1") == expected
     }
 
@@ -317,5 +315,4 @@
         def expected = new Color(0x12, 0x34, 0x56, 0x78)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
-        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour2") == expected
     }