--- old/modules/graphics/src/test/java/test/javafx/css/CssMetaDataTest.java	2016-06-03 11:04:43.681423142 -0700
+++ new/modules/graphics/src/test/java/test/javafx/css/CssMetaDataTest.java	2016-06-03 11:04:43.505423144 -0700
@@ -57,6 +57,7 @@
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.jmx.MXNodeAlgorithm;
 import com.sun.javafx.jmx.MXNodeAlgorithmContext;
+import com.sun.javafx.scene.NodeHelper;
 import javafx.css.CompoundSelector;
 import javafx.css.CssMetaData;
 import javafx.css.CssParser;
@@ -219,20 +220,6 @@
     public void testEquals() {
         TestNode testNode = new TestNode();
         Node node = new Node() {
-            @Override
-            public BaseBounds impl_computeGeomBounds(BaseBounds bb, BaseTransform bt) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            protected boolean impl_computeContains(double d, double d1) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public Object impl_processMXNode(MXNodeAlgorithm mxna, MXNodeAlgorithmContext mxnac) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
         };
 
         CssMetaData testNodeOpacity = get(TestNode.getClassCssMetaData(), "-fx-opacity");
@@ -358,7 +345,7 @@
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -478,7 +465,7 @@
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -601,7 +588,7 @@
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -728,7 +715,7 @@
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -839,7 +826,7 @@
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -947,7 +934,7 @@
         stage.show();
 
         final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FILL, rectangle);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -1026,7 +1013,7 @@
         stage.show();
 
         final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FONT, text);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -1110,7 +1097,7 @@
         stage.show();
 
         final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
+        final List<Style> actuals = NodeHelper.getMatchingStyles(FONT, text);
 
         //        System.err.println("matchingStyles: " + matchingStyles);
         //        System.err.println("expecteds: " + expecteds);
@@ -1295,7 +1282,7 @@
         stage.show();
 
         CssMetaData prop = ((StyleableProperty)text.fillProperty()).getCssMetaData();
-        List list = Node.impl_getMatchingStyles(prop, text);
+        List list = NodeHelper.getMatchingStyles(prop, text);
 
         assertEquals(3, list.size(), 0);