--- old/functional/ControlsTests/src/javafx/scene/control/test/tabpane/TabPaneApp2.java	2016-12-09 13:27:57.798634964 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/tabpane/TabPaneApp2.java	2016-12-09 13:27:57.742634459 +0300
@@ -32,7 +32,7 @@
 import javafx.event.EventHandler;
 import javafx.geometry.Side;
 import javafx.scene.Scene;
-import javafx.scene.control.ButtonBuilder;
+import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
@@ -55,11 +55,11 @@
     public final static String RESET_BTN_ID = "Reset";
     public final static String ADD_SINGLE_BTN_ID = "Add single item";
     public final static String ADD_SINGLE_AT_POS_BTN_ID = "Add single item at pos";
-    public final static String DISABLE_SINGLE_AT_POS_BTN_ID = "Disable single item at pos";
+    public final static String DISABLE_SINGLE_AT_POS_BTN_ID = "Disable single item at pos";    
     public final static String REMOVE_SINGLE_AT_POS_BTN_ID = "Remove single item at pos";
     public final static String REMOVE_POS_EDIT_ID = "Remove at pos";
     public final static String ADD_POS_EDIT_ID = "Add at pos";
-    public final static String DISABLE_POS_EDIT_ID = "Disable at pos";
+    public final static String DISABLE_POS_EDIT_ID = "Disable at pos";    
     public final static String LAST_SELECTED_ID = "Last selected";
     public final static String SHOWN_CHECK_ID = "Shown";
     public final static String SHOWING_CHECK_ID = "Showing";
@@ -113,80 +113,78 @@
             error = new Label();
             error.setId(ERROR_ID);
 
-            controls.getChildren().add(
-                    ButtonBuilder.create()
-                    .text(CLEAR_BTN_ID).id(CLEAR_BTN_ID)
-                    .onAction(new EventHandler<ActionEvent>() {
-                        public void handle(ActionEvent t) {
-                            tabPane.getTabs().clear();
-                        }
-                    }).build());
-
-            controls.getChildren().add(
-                    ButtonBuilder.create()
-                    .text(RESET_BTN_ID).id(RESET_BTN_ID)
-                    .onAction(new EventHandler<ActionEvent>() {
-
-                        public void handle(ActionEvent t) {
-                            reset();
-                        }
-                    }).build());
-
-            controls.getChildren().add(
-                    ButtonBuilder.create()
-                    .text(ADD_SINGLE_BTN_ID).id(ADD_SINGLE_BTN_ID)
-                    .onAction(new EventHandler<ActionEvent>() {
-
-                        public void handle(ActionEvent t) {
-                            tabPane.getTabs().add(new NamedTab(TAB_ITEM + tabPane.getTabs().size()));
-                        }
-                    }).build());
+            Button temp;
+            
+            temp = new Button(CLEAR_BTN_ID);
+            temp.setId(CLEAR_BTN_ID);
+            temp.setOnAction(new EventHandler<ActionEvent>() {
+                public void handle(ActionEvent t) {
+                    tabPane.getTabs().clear();
+                }
+            });
+            controls.getChildren().add(temp);
+
+            temp = new Button(RESET_BTN_ID);
+            temp.setId(RESET_BTN_ID);
+            temp.setOnAction(new EventHandler<ActionEvent>() {
+                public void handle(ActionEvent t) {
+                    reset();
+                }
+            });
+            controls.getChildren().add(temp);
+
+            temp = new Button(ADD_SINGLE_BTN_ID);
+            temp.setId(ADD_SINGLE_BTN_ID);
+            temp.setOnAction(new EventHandler<ActionEvent>() {
+                public void handle(ActionEvent t) {
+                    tabPane.getTabs().add(new NamedTab(TAB_ITEM + tabPane.getTabs().size()));
+                }
+            });
+            controls.getChildren().add(temp);
 
             HBox add_position_box = new HBox(5);
             controls.getChildren().add(add_position_box);
-
+            
             final TextField add_position = new TextField("0");
             add_position.setId(ADD_POS_EDIT_ID);
 
-            add_position_box.getChildren().add(
-                    ButtonBuilder.create()
-                    .text(ADD_SINGLE_AT_POS_BTN_ID).id(ADD_SINGLE_AT_POS_BTN_ID)
-                    .onAction(new EventHandler<ActionEvent>() {
-
-                        public void handle(ActionEvent t) {
-                            tabPane.getTabs().add(new NamedTab("Tab " + tabPane.getTabs().size()));
-                        }
-                    }).build());
+            temp = new Button(ADD_SINGLE_AT_POS_BTN_ID);
+            temp.setId(ADD_SINGLE_AT_POS_BTN_ID);
+            temp.setOnAction(new EventHandler<ActionEvent>() {
+                public void handle(ActionEvent t) {
+                    tabPane.getTabs().add(new NamedTab("Tab " + tabPane.getTabs().size()));
+                }
+            });
+            add_position_box.getChildren().add(temp);
 
             final Label add_label = new Label("at");
             add_position_box.getChildren().add(add_label);
 
             add_position_box.getChildren().add(add_position);
-
-
+            
+            
             HBox disable_position_box = new HBox(5);
             controls.getChildren().add(disable_position_box);
 
             final TextField disable_position = new TextField("0");
             disable_position.setId(DISABLE_POS_EDIT_ID);
 
-            disable_position_box.getChildren().add(
-                    ButtonBuilder.create()
-                    .text(DISABLE_SINGLE_AT_POS_BTN_ID).id(DISABLE_SINGLE_AT_POS_BTN_ID)
-                    .onAction(new EventHandler<ActionEvent>() {
-
-                        public void handle(ActionEvent t) {
-                            Integer pos = Integer.valueOf(disable_position.getText());
-                            Tab tab = tabPane.getTabs().get(pos.intValue());
-                            tab.setDisable(!tab.isDisable());
-                        }
-                    }).build());
+            temp = new Button(DISABLE_SINGLE_AT_POS_BTN_ID);
+            temp.setId(DISABLE_SINGLE_AT_POS_BTN_ID);
+            temp.setOnAction(new EventHandler<ActionEvent>() {
+                public void handle(ActionEvent t) {
+                    Integer pos = Integer.valueOf(disable_position.getText());
+                    Tab tab = tabPane.getTabs().get(pos.intValue());
+                    tab.setDisable(!tab.isDisable());
+                }
+            });
+            disable_position_box.getChildren().add(temp);
 
             final Label disable_label = new Label("at");
             disable_position_box.getChildren().add(disable_label);
 
             disable_position_box.getChildren().add(disable_position);
-
+            
 
             HBox remove_position_box = new HBox(5);
             controls.getChildren().add(remove_position_box);
@@ -194,15 +192,14 @@
             final TextField remove_position = new TextField("0");
             remove_position.setId(REMOVE_POS_EDIT_ID);
 
-            remove_position_box.getChildren().add(
-                    ButtonBuilder.create()
-                    .text(REMOVE_SINGLE_AT_POS_BTN_ID).id(REMOVE_SINGLE_AT_POS_BTN_ID)
-                    .onAction(new EventHandler<ActionEvent>() {
-
-                        public void handle(ActionEvent t) {
-                            tabPane.getTabs().remove(Integer.valueOf(remove_position.getText()).intValue());
-                        }
-                    }).build());
+            temp = new Button(REMOVE_SINGLE_AT_POS_BTN_ID);
+            temp.setId(REMOVE_SINGLE_AT_POS_BTN_ID);
+            temp.setOnAction(new EventHandler<ActionEvent>() {
+                public void handle(ActionEvent t) {
+                    tabPane.getTabs().remove(Integer.valueOf(remove_position.getText()).intValue());
+                }
+            });
+            remove_position_box.getChildren().add(temp);
 
             final Label remove_label = new Label("at");
             remove_position_box.getChildren().add(remove_label);