--- old/functional/ControlsTests/test/javafx/scene/control/test/util/UtilTestFunctions.java	2016-12-09 13:28:08.630732307 +0300
+++ new/functional/ControlsTests/test/javafx/scene/control/test/util/UtilTestFunctions.java	2016-12-09 13:28:08.578731840 +0300
@@ -88,6 +88,8 @@
 import test.javaclient.shared.TestUtil;
 import test.javaclient.shared.Utils;
 
+import com.sun.javafx.scene.NodeHelper;
+
 /**
  * @author Alexander Kirov
  *
@@ -374,7 +376,7 @@
                 break;
         }
 
-        //Wait, until content of according Tab (root item of tab is scrollPane,
+        //Wait, until content of according Tab (root item of tab is scrollPane, 
         //with preset Id), will be findable on the scene.
         new Waiter(new Timeout("", TestUtil.isEmbedded() ? 20000 : 2000)).ensureState(new State() {
             public Object reached() {
@@ -792,11 +794,11 @@
         //For 8.0 before b64 and RT-9383
         //final ScrollEvent scrollEvent = new ScrollEvent.impl_scrollEvent(ScrollEvent.SCROLL, _scrollX, _scrollY, _scrollX, _scrollY, _scrollTextXUnits, _scrollTextX, _scrollTextYUnits, _scrollTextY, 0, _x, _y, _screenX, _screenY, false, false, false, false, false, false);
 
-        //new ScrollEvent(EventType<ScrollEvent> eventType,
-        //double x, double y, double screenX, double screenY,
-        //boolean shiftDown, boolean controlDown, boolean altDown, boolean metaDown,
-        //boolean direct, boolean inertia, double deltaX, double deltaY, double gestureDeltaX, double gestureDeltaY,
-        //ScrollEvent.HorizontalTextScrollUnits textDeltaXUnits, double textDeltaX,
+        //new ScrollEvent(EventType<ScrollEvent> eventType, 
+        //double x, double y, double screenX, double screenY, 
+        //boolean shiftDown, boolean controlDown, boolean altDown, boolean metaDown, 
+        //boolean direct, boolean inertia, double deltaX, double deltaY, double gestureDeltaX, double gestureDeltaY, 
+        //ScrollEvent.HorizontalTextScrollUnits textDeltaXUnits, double textDeltaX, 
         //ScrollEvent.VerticalTextScrollUnits textDeltaYUnits, double textDeltaY, int touchCount)
         final ScrollEvent scrollEvent = new ScrollEvent(ScrollEvent.SCROLL,
                 _x, _y, _screenX, _screenY,
@@ -815,10 +817,16 @@
                         setResult(((Node) os[0]).localToScene((Double) os[1], (Double) os[2]));
                     }
                 }.dispatch(Root.ROOT.getEnvironment(), wrap.getControl(), Double.valueOf(wrap.getScreenBounds().width / 4), Double.valueOf(wrap.getScreenBounds().height / 4));
+
+                // The following line requires --add-exports javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
                 final PickResultChooser result = new PickResultChooser();
 
+                // The following line requires --add-exports javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
                 //public PickRay(Vec3d origin, Vec3d direction, double nearClip, double farClip) {
-                (((Wrap<? extends Scene>) os[0]).getControl()).getRoot().impl_pickNode(new PickRay(new Vec3d(pointOnScene.getX(), pointOnScene.getY(), -10), new Vec3d(0, 0, 1), 1.0, 100), result);
+                NodeHelper.pickNode(
+                    (((Wrap<? extends Scene>) os[0]).getControl()).getRoot(),
+                    new PickRay(new Vec3d(pointOnScene.getX(), pointOnScene.getY(), -10), new Vec3d(0, 0, 1), 1.0, 100),
+                    result);
                 Node node = result.getIntersectedNode();
                 node.fireEvent(scrollEvent);
             }
@@ -990,7 +998,7 @@
         ((CommonPropertiesScene) scene.getControl()).setNonTestedContentVisibility(nonTestedControlsVisibility);
         ((CommonPropertiesScene) scene.getControl()).setTestedControlContainerSize(width, height);
     }
-
+    
     protected Wrap<? extends Node> getParentWrap(Wrap<? extends Node> node) {
         final Node control = node.getControl();
         return new NodeWrap(node.getEnvironment(), new GetAction<Node>(){