--- old/functional/ControlsTests/src/javafx/scene/control/test/accordion/NewAccordionApp.java	2017-02-10 15:01:33.969142959 +0300
+++ new/functional/ControlsTests/src/javafx/scene/control/test/accordion/NewAccordionApp.java	2017-02-10 15:01:33.921142413 +0300
@@ -78,14 +78,17 @@
 
         private void prepareScene() {
             pane = new Pane();
-            testedAccordion = AccordionBuilder.create().id(TESTED_ACCORDION_ID).build();
+            testedAccordion = new Accordion();
+            testedAccordion.setId(TESTED_ACCORDION_ID);
 
             PropertiesTable tb = new PropertiesTable(testedAccordion);
             PropertyTablesFactory.explorePropertiesList(testedAccordion, tb);
 
             final TabPaneWithControl tabPane = new TabPaneWithControl("Accordion", tb);
 
-            final TextField tf = TextFieldBuilder.create().id(ACCORDION_ADD_INDEX_TEXT_FIELD_ID).text("0").prefWidth(40).build();
+            final TextField tf = new TextField("0");
+            tf.setId(ACCORDION_ADD_INDEX_TEXT_FIELD_ID);
+            tf.setPrefWidth(40);
 
             HBox nodeshb = new NodesChoserFactory("Add!", new NodesChoserFactory.NodeAction<Node>() {
 
@@ -110,7 +113,8 @@
             hb.setPadding(new Insets(5, 5, 5, 5));
             hb.setStyle("-fx-border-color : green;");
 
-            Button resetButton = ButtonBuilder.create().id(RESET_BUTTON_ID).text("Reset").build();
+            Button resetButton = new Button("Reset");
+            resetButton.setId(RESET_BUTTON_ID);
             resetButton.setOnAction(new EventHandler<ActionEvent>() {
 
                 public void handle(ActionEvent t) {