Index: /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java	(revision 11274)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java	(revision 11275)
@@ -5,8 +5,6 @@
 import static org.junit.Assert.assertTrue;
 
-import java.awt.geom.Area;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,5 +41,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform();
+    public JOSMTestRules test = new JOSMTestRules().platform().projection().commands();
 
     /**
@@ -152,30 +150,33 @@
 
         // Mock left/right hand traffic database
-        Field leftHandTrafficPolygons = RightAndLefthandTraffic.class
-            .getDeclaredField("leftHandTrafficPolygons");
         Field rlCache = RightAndLefthandTraffic.class.getDeclaredField("rlCache");
-        Utils.setObjectsAccessible(leftHandTrafficPolygons, rlCache);
-        leftHandTrafficPolygons.set(null, new ArrayList<Area>());
+        Utils.setObjectsAccessible(rlCache);
+        Object origRlCache = rlCache.get(null);
         rlCache.set(null, new GeoPropertyIndex<>(new ConstantTrafficHand(true), 24));
 
-        CreateCircleAction action = new CreateCircleAction();
-        action.setEnabled(true);
         try {
-            Main.getLayerManager().addLayer(layer);
-            action.actionPerformed(null);
+            CreateCircleAction action = new CreateCircleAction();
+            action.setEnabled(true);
+            try {
+                Main.getLayerManager().addLayer(layer);
+                action.actionPerformed(null);
+            } finally {
+                // Ensure we clean the place before leaving, even if test fails.
+                Main.getLayerManager().removeLayer(layer);
+            }
+
+            // Expected result: Dataset contain one closed way, clockwise
+            Collection<Way> resultingWays = dataSet.getWays();
+            assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
+                       resultingWays.size(), 1);
+            Way resultingWay = resultingWays.iterator().next();
+            assertTrue("Resulting way is not closed",
+                       resultingWay.isClosed());
+            assertTrue("Found anti-clockwise way while traffic is left hand.",
+                       Geometry.isClockwise(resultingWay));
         } finally {
-            // Ensure we clean the place before leaving, even if test fails.
-            Main.getLayerManager().removeLayer(layer);
+            // Restore left/right hand traffic database
+            rlCache.set(null, origRlCache);
         }
-
-        // Expected result: Dataset contain one closed way, clockwise
-        Collection<Way> resultingWays = dataSet.getWays();
-        assertSame(String.format("Expect one way after perform action. %d found", resultingWays.size()),
-                   resultingWays.size(), 1);
-        Way resultingWay = resultingWays.iterator().next();
-        assertTrue("Resulting way is not closed",
-                   resultingWay.isClosed());
-        assertTrue("Found anti-clockwise way while traffic is left hand.",
-                   Geometry.isClockwise(resultingWay));
     }
 }