Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java	(revision 15242)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java	(revision 15245)
@@ -4,5 +4,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory.Functions;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java	(revision 15242)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java	(revision 15245)
@@ -422,9 +422,9 @@
         /* Check with empty role and one object */
         Environment e = new Environment(rel1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertEquals(1, ExpressionFactory.Functions.count_roles(e, ""));
+        assertEquals(1, Functions.count_roles(e, ""));
 
         /* Check with non-empty role and one object */
         e = new Environment(rel1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertEquals(0, ExpressionFactory.Functions.count_roles(e, "from"));
+        assertEquals(0, Functions.count_roles(e, "from"));
 
         /* Check with empty role and two objects */
@@ -433,17 +433,17 @@
         rel1.addMember(new RelationMember("", way2));
         e = new Environment(rel1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertEquals(2, ExpressionFactory.Functions.count_roles(e, ""));
+        assertEquals(2, Functions.count_roles(e, ""));
 
         /* Check with non-empty role and two objects */
         rel1.setMember(0, new RelationMember("from", way1));
         e = new Environment(rel1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertEquals(1, ExpressionFactory.Functions.count_roles(e, "from"));
+        assertEquals(1, Functions.count_roles(e, "from"));
 
         /* Check with multiple roles */
-        assertEquals(1, ExpressionFactory.Functions.count_roles(e, "from", "to"));
+        assertEquals(1, Functions.count_roles(e, "from", "to"));
 
         /* Check with non-relation */
         e = new Environment(way1, new MultiCascade(), Environment.DEFAULT_LAYER, null);
-        assertEquals(0, ExpressionFactory.Functions.count_roles(e, "from", "to"));
+        assertEquals(0, Functions.count_roles(e, "from", "to"));
     }