diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlMoveUpDownTooling.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlMoveUpDownTooling.test
index 0e650b3..a41b57d 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlMoveUpDownTooling.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlMoveUpDownTooling.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _2IkQMNnHEee0McrTbR2zPw
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 7/26/18 12:49 AM
+Runtime-Version: 2.5.2.202006292356
+Save-Time: 7/23/20 10:24 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -49,13 +49,13 @@
     get-property "getChildren().Control[2].getChildren().Control[0].getClassName()" 
         | equals "org.eclipse.swt.widgets.Button" | verify-true
     get-property "getChildren().Control[2].getChildren().Control[0].isVisible()" | equals true | verify-true
-    get-property "getChildren().Control[2].getChildren().Control[0].getToolTipText()" | equals "Add an instance of" 
+    get-property "getChildren().Control[2].getChildren().Control[0].getToolTipText()" | equals "Add an instance of User" 
         | verify-true
     get-property "getChildren().Control[2].getChildren().Control[0].isEnabled()" | equals true | verify-true
     get-property "getChildren().Control[2].getChildren().Control[1].getClassName()" 
         | equals "org.eclipse.swt.widgets.Button" | verify-true
     get-property "getChildren().Control[2].getChildren().Control[1].isVisible()" | equals true | verify-true
-    get-property "getChildren().Control[2].getChildren().Control[1].getToolTipText()" | equals "Remove the selected" 
+    get-property "getChildren().Control[2].getChildren().Control[1].getToolTipText()" | equals "Remove the selected User" 
         | verify-true
     get-property "getChildren().Control[2].getChildren().Control[1].isEnabled()" | equals false | verify-true
 }
@@ -67,32 +67,32 @@
     get-property "getChildren().Control[2].getChildren().Control[0].getClassName()" 
         | equals "org.eclipse.swt.widgets.Button" | verify-true
     get-property "getChildren().Control[2].getChildren().Control[0].isVisible()" | equals true | verify-true
-    get-property "getChildren().Control[2].getChildren().Control[0].getToolTipText()" | equals "Move up the selected" 
+    get-property "getChildren().Control[2].getChildren().Control[0].getToolTipText()" | equals "Move up the selected User" 
         | verify-true
     get-property "getChildren().Control[2].getChildren().Control[0].isEnabled()" | equals false | verify-true
     get-property "getChildren().Control[2].getChildren().Control[1].getClassName()" 
         | equals "org.eclipse.swt.widgets.Button" | verify-true
     get-property "getChildren().Control[2].getChildren().Control[1].isVisible()" | equals true | verify-true
-    get-property "getChildren().Control[2].getChildren().Control[1].getToolTipText()" | equals "Move down the selected" 
+    get-property "getChildren().Control[2].getChildren().Control[1].getToolTipText()" | equals "Move down the selected User" 
         | verify-true
     get-property "getChildren().Control[2].getChildren().Control[1].isEnabled()" | equals false | verify-true
     get-property "getChildren().Control[2].getChildren().Control[2].getClassName()" 
         | equals "org.eclipse.swt.widgets.Button" | verify-true
     get-property "getChildren().Control[2].getChildren().Control[2].isVisible()" | equals true | verify-true
-    get-property "getChildren().Control[2].getChildren().Control[2].getToolTipText()" | equals "Add an instance of" 
+    get-property "getChildren().Control[2].getChildren().Control[2].getToolTipText()" | equals "Add an instance of User" 
         | verify-true
     get-property "getChildren().Control[2].getChildren().Control[2].isEnabled()" | equals true | verify-true
     get-property "getChildren().Control[2].getChildren().Control[3].getClassName()" 
         | equals "org.eclipse.swt.widgets.Button" | verify-true
     get-property "getChildren().Control[2].getChildren().Control[3].isVisible()" | equals true | verify-true
-    get-property "getChildren().Control[2].getChildren().Control[3].getToolTipText()" | equals "Remove the selected" 
+    get-property "getChildren().Control[2].getChildren().Control[3].getToolTipText()" | equals "Remove the selected User" 
         | verify-true
     get-property "getChildren().Control[2].getChildren().Control[3].isEnabled()" | equals false | verify-true
 }
 
 //add items to table
 with [get-view "EMF Forms Preview"] {
-    with [get-button "Add an instance of"] {
+    with [get-button "Add an instance of User"] {
         click
         click
         click
@@ -127,7 +127,7 @@
 //move UP
 with [get-view "EMF Forms Preview"] {
     get-table | select asd -column "First Name"
-    get-button "Move up the selected" | click
+    get-button "Move up the selected User" | click
 }
 with [get-view "EMF Forms Preview" | get-table] {
    get-cell -row 0 -column 2 | get-property "values['Last Name']" | equals fgh | verify-true
@@ -138,19 +138,19 @@
 //assert first item UP is disabled
 with [get-view "EMF Forms Preview"] {
     get-table | select asd -column "First Name"
-    get-button "Move up the selected" | get-property enablement | equals false | verify-true
+    get-button "Move up the selected User" | get-property enablement | equals false | verify-true
 }
 
 //assert last item DOWN is disabled
 with [get-view "EMF Forms Preview"] {
     get-table | select yxc -column "First Name"
-    get-button "Move down the selected" | get-property enablement | equals false | verify-true
+    get-button "Move down the selected User" | get-property enablement | equals false | verify-true
 }
 
 //move second item DOWN
 with [get-view "EMF Forms Preview"] {
     get-table | select qwe -column "First Name"
-    get-button "Move down the selected" | click
+    get-button "Move down the selected User" | click
 }
 with [get-view "EMF Forms Preview" | get-table] {
    get-cell -row 0 -column 2 | get-property "values['Last Name']" | equals fgh | verify-true
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlReadOnlyBehavior.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlReadOnlyBehavior.test
index ba81240..fde0258 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlReadOnlyBehavior.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlReadOnlyBehavior.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _O-MQUNwVEeeMsObmKZ9qhw
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 12/8/17 4:45 PM
+Runtime-Version: 2.5.2.202006292356
+Save-Time: 7/23/20 10:23 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -21,7 +21,8 @@
 Entry-Name: .content
 
 get-view "Project Explorer" | get-tree 
-    | select "org.eclipse.emf.ecp.makeithappen.model.viewmodel/viewmodels/UserGroup.view" | double-click
+    | select "org.eclipse.emf.ecp.makeithappen.model.viewmodel/viewmodels/UserGroup.view" | get-menu 
+    -path "Open With/View Model Editor" | click
 with [get-editor "UserGroup.view"] {
     with [get-tree] {
         select View | get-menu -path TableControl | click
@@ -49,7 +50,7 @@
 // refresh preview
 with [get-view "EMF Forms Preview"] {
     get-button "Refresh Preview View" | click
-    get-button "Add an instance of" | click
+    get-button "Add an instance of User" | click
 }
 
 // edit in edit mode
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlWithDetail_Scroll.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlWithDetail_Scroll.test
index 5d0f389..5b2341c 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlWithDetail_Scroll.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TableControlWithDetail_Scroll.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _jOkp0CpNEem3i-Gw7uP7Ew
-Runtime-Version: 2.4.2.201905052359
-Save-Time: 7/3/19 9:46 AM
+Runtime-Version: 2.5.2.202006292356
+Save-Time: 7/23/20 10:25 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -21,7 +21,8 @@
 Entry-Name: .content
 
 get-view "Project Explorer" | get-tree 
-    | select "org.eclipse.emf.ecp.makeithappen.model.viewmodel/viewmodels/UserGroup.view" | double-click
+    | select "org.eclipse.emf.ecp.makeithappen.model.viewmodel/viewmodels/UserGroup.view" | get-menu 
+    -path "Open With/View Model Editor" | click
 with [get-editor "UserGroup.view"] {
     with [get-tree] {
         select View | get-menu -path TableControl | click
@@ -49,7 +50,8 @@
 get-editor "UserGroup.view" | get-combo -after [get-label "Detail Editing*"] | select WithPanel
 get-button "Save (M1+S)" | click
 get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model.viewmodel/viewmodels/User.view" 
-    | double-click
+    | get-menu 
+    -path "Open With/View Model Editor" | click
 with [get-editor "User.view" | get-tree] {
     select View | get-menu -path VerticalLayout | click
     select View | get-menu -path VerticalLayout | click
@@ -87,7 +89,7 @@
 }
 with [get-view "EMF Forms Preview"] {
     get-button "Refresh Preview View" | click
-    get-button "Add an instance of" | click
+    get-button "Add an instance of User" | click
 }
 with [get-view "EMF Forms Preview" | get-control Any -after [get-label Users] -index 10] {
     get-property "getHorizontalBar().isVisible()" | equals true | verify-true
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
index 605dc54..2321205 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _uDtLYDnOEeiT54i24ck9dw
-Runtime-Version: 2.4.2.201905052359
-Save-Time: 10/5/19 9:54 PM
+Runtime-Version: 2.5.2.202006292356
+Save-Time: 7/23/20 10:28 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -70,13 +70,13 @@
 get-view "EMF Forms Preview" | get-button "Clear Sample Data" | click
 //get-view "EMF Forms Preview" | get-button "Refresh Preview View" | click
 get-view "EMF Forms Preview" | get-table | get-property "getColumnCount()" | equals 19 | verify-true
-get-view "EMF Forms Preview" | get-button "Add an instance of EStructuralFeature" | click
-with [get-window "Select Sub Class and Template" | get-tree] {
+get-view "EMF Forms Preview" | get-button "Add an instance of EStructural Feature" | click
+with [get-window "New Reference Element" | get-tree] {
     get-property itemCount | equals 2 | verify-true
     get-property "getItems().TreeItem[0].getText()" | equals EAttribute | verify-true
     get-property "getItems().TreeItem[1].getText()" | equals EReference | verify-true
 }
-with [get-window "Select Sub Class and Template"] {
+with [get-window "New Reference Element"] {
     get-tree | select EAttribute
     get-button Finish | click
 }
@@ -134,9 +134,9 @@
         }
         apply-cell-edit -deactivate
     }
-    get-button "Add an instance of EStructuralFeature" | click
+    get-button "Add an instance of EStructural Feature" | click
 }
-with [get-window "Select Sub Class and Template"] {
+with [get-window "New Reference Element"] {
     get-tree | select EReference
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelBulkMigration.test b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelBulkMigration.test
index 8c30d0d..3ae88ae 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelBulkMigration.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelBulkMigration.test
@@ -6,15 +6,16 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _YFwVIEobEeiHp8RnhxiMOg
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 4/27/18 4:31 PM
+Runtime-Version: 2.5.2.202006292356
+Save-Time: 7/23/20 10:53 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-view "Project Explorer" | get-tree | select "barView/Bar.view" | double-click
+get-view "Project Explorer" | get-tree | select "barView/Bar.view" | get-menu 
+    -path "Open With/View Model Editor" | click
 get-window "Perform migration to the latest view model version?" | get-button Yes | click
 get-window "Migrate view models from workspace" | get-button Yes | click
 get-window "Migrate view models from workspace" | get-table | select "Foo.view \\[fooView\\/Foo.view\\]"
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelRules_nested.test b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelRules_nested.test
index c6c39ee..40e3a50 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelRules_nested.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewModelRules_nested.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _o1gAAKS1EemqHtyndiPQqQ
-Runtime-Version: 2.5.0.201907120000
-Save-Time: 7/12/19 5:23 PM
+Runtime-Version: 2.5.2.202006292356
+Save-Time: 7/23/20 10:57 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -115,7 +115,7 @@
 get-view "EMF Forms Preview" | get-button "Refresh Preview View" | click
 get-view "EMF Forms Preview" | get-editbox -after [get-label Name] | get-property enablement | equals false 
 	| verify-true
-get-view "EMF Forms Preview" | get-button "Add an instance of" | click
+get-view "EMF Forms Preview" | get-button "Add an instance of User" | click
 get-view "EMF Forms Preview" | get-editbox -after [get-label Name] | get-property enablement | equals false 
 	| verify-true
 with [get-view "EMF Forms Preview" | get-table] {