311 files changed, 4107 insertions, 1463 deletions
diff --git a/tests/ECPQ7Tests/EPPTests/download.sh b/tests/ECPQ7Tests/EPPTests/download.sh
index fc7d7269f9..eaf2fcd58c 100755
--- a/tests/ECPQ7Tests/EPPTests/download.sh
+++ b/tests/ECPQ7Tests/EPPTests/download.sh
@@ -2,7 +2,7 @@ if [ $# -lt 3 ]; then
 	exit
 fi
 AUT_DIR="$1/aut"
-rm -rf ${AUT_DIR}/*
+#rm -rf ${AUT_DIR}/*
 mkdir -p ${AUT_DIR}
 cd ${AUT_DIR}
 wget -O $2_$3.tar.gz https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/$2/$3/eclipse-committers-$2-$3-linux-gtk-x86_64.tar.gz\&r=1 --proxy=off
diff --git a/tests/ECPQ7Tests/EPPTests/pom.xml b/tests/ECPQ7Tests/EPPTests/pom.xml
index 8a5d6a29bd..b1d6d202c2 100644
--- a/tests/ECPQ7Tests/EPPTests/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/pom.xml
@@ -24,7 +24,7 @@
 	</profiles>
 	<properties>
 		<emfstore-update-site>http://download.eclipse.org/emfstore/releases_19</emfstore-update-site>
-		<aut-path>/home/data/httpd/download.eclipse.org/ecp</aut-path>
+		<aut-path>.</aut-path>
 	</properties>
 	<build>
 		<pluginManagement>
@@ -85,6 +85,8 @@
 									<feature>org.eclipse.emf.ecp.sdk.feature.feature.group</feature>
 									<feature>org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group</feature>
 									<feature>org.eclipse.emfforms.view.annotation.feature.feature.group</feature>
+									<feature>org.eclipse.emfforms.datatemplate.ide.feature.feature.group</feature>
+									<feature>org.eclipse.emfforms.datatemplate.feature.feature.group</feature>
 								</features>
 							</injection>
 							<injection>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test b/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test
new file mode 100644
index 0000000000..4c77555c49
--- /dev/null
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test
@@ -0,0 +1,105 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _ihvnUC3mEeSwhO5Nwx0hPg,_ih4KMC3mEeSwhO5Nwx0hPg,_D4Pj4C3lEeSwhO5Nwx0hPg
+Element-Name: DataTemplateEditor Smoke
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _XogaUM-8EemDG-PUFK2qgQ
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:57 PM
+Testcase-Type: ecl
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model.viewmodel" | get-menu 
+    -path "New/Other..." | click
+with [get-window New] {
+    get-tree | select "EMF Forms/DataTemplate"
+    get-button "Next >" | click
+}
+with [get-window -class WizardDialog] {
+    get-editbox -after [get-label "File name:"] | set-text "test.datatemplate"
+    get-button Finish | click
+}
+with [get-editor "test.datatemplate"] {
+    get-tree | select "Template Collection" | get-menu -path Template | click
+    get-button "Create and link new Instance" | click
+}
+get-window "Select Sub Class and Template" | get-tree | select "template/ViewTemplate" | double-click
+with [get-editor "test.datatemplate"] {
+    get-tree | select "Template Collection/Template/View Template" | get-menu -path Style | click
+    get-button "Link Style Property" | click
+}
+get-window "Select Elements" | get-table | get-property itemCount | equals 0 | verify-true
+get-window "Select Elements" | get-button Cancel | click
+get-editor "test.datatemplate" | get-button "Create and link new Style Property" | click
+with [get-window "Select Sub Class and Template"] {
+    get-tree | select "fontProperties/FontPropertiesStyleProperty"
+    get-button Finish | click
+}
+get-window FontPropertiesStyleProperty | get-button OK | click
+with [get-editor "test.datatemplate"] {
+    get-tree | select "Template Collection/Template/View Template" | get-menu -path Style | click
+    get-button "Link Style Property" | click
+}
+get-window "Select Elements" | get-table | get-property itemCount | equals 1 | verify-true
+get-window "Select Elements" | get-button Cancel | click
+get-editor "test.datatemplate" | get-button "Create and link new Style Property" | click
+with [get-window "Select Sub Class and Template"] {
+    get-tree | select "tableValidation/TableValidationStyleProperty"
+    get-button Finish | click
+}
+with [get-window TableValidationStyleProperty] {
+    get-editbox -after [get-label "Column Width"] | set-focus
+    get-button Cancel | click
+}
+with [get-editor "test.datatemplate"] {
+    get-tree | select "Template Collection" | get-menu -path Template | click
+    get-button "Create and link new Instance" | click
+}
+with [get-window "Select Sub Class and Template"] {
+    get-tree | select "template/ViewTemplate"
+    get-button Finish | click
+}
+with [get-editor "test.datatemplate"] {
+    get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 1 | get-item 
+        -path "View Template"] | get-menu -path Style | click
+    get-button "Link Style Property" | click
+}
+get-window "Select Elements" | get-table | get-property itemCount | equals 0 | verify-true
+get-window "Select Elements" | get-button Cancel | click
+with [get-editor "test.datatemplate"] {
+    get-tree | select "Template Collection" | get-menu -path Template | click
+    get-button "Create and link new Instance" | click
+}
+get-window "Select Sub Class and Template" | get-tree | select "bowling/League" | double-click
+with [get-editor "test.datatemplate"] {
+    get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2 | get-item -path League]
+    get-button "Add an instance of Player" | click
+    get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2]
+    get-button "Delete Reference" | click
+}
+get-window Confirmation | get-button Yes | click
+get-editor "test.datatemplate" | get-tree | get-item -path "Template Collection" | get-item -path Template -index 2 
+    | get-property childCount | equals 0 | verify-true
+with [get-editor "test.datatemplate"] {
+    get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2]
+    get-button "Create and link new Instance" | click
+}
+with [get-window "Select Sub Class and Template"] {
+    get-tree | select "bowling/Fan"
+    get-button Finish | click
+}
+with [get-editor "test.datatemplate"] {
+    get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2 | get-item -path Fan]
+    get-button "Create and link new Tournament" | click
+}
+get-window "Cannot create element" 
+    | get-label "Cannot add new objects to non-containment references in a template." 
+    | get-property caption 
+    | equals "Cannot add new objects to non-containment references in a template." | verify-true
+get-window "Cannot create element" | get-button OK | click
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
index 7e7859a59d..7de1451081 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
@@ -130,7 +130,7 @@ with [get-view "EMF Forms Preview"] {
     get-editbox -after [get-label "Last Name*"] | get-property text | equals "" | verify-true
     with [get-label "" -after [get-label "Last Name*"]] {
         get-property backgroundColor | equals "#FFFFFF" | verify-true
-        get-property "image.path" | equals "org.eclipse.emf.ecp.edit.swt/icons/validation_error.png" | verify-true
+        get-property "image.path" | equals "org.eclipse.emfforms.swt.core/icons/validation_error.png" | verify-true
     }
 }
 with [get-view "EMF Forms Preview"] {
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
index 5723f0a86c..605dc54636 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
@@ -1,13 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _ZOi4wZ77EeOm87IlbkWrfQ,_ihvnUC3mEeSwhO5Nwx0hPg
+Contexts: _ZOi4wZ77EeOm87IlbkWrfQ,_Iu0EsS36EeSYRYqCbC6LMQ
 Element-Name: TableSubTypeSupport
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _uDtLYDnOEeiT54i24ck9dw
 Runtime-Version: 2.4.2.201905052359
-Save-Time: 5/6/19 3:00 PM
+Save-Time: 10/5/19 9:54 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -71,12 +71,12 @@ 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 "New Reference Element" | get-tree] {
+with [get-window "Select Sub Class and Template" | 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 "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select EAttribute
     get-button Finish | click
 }
@@ -136,7 +136,7 @@ with [get-view "EMF Forms Preview"] {
     }
     get-button "Add an instance of EStructuralFeature" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select EReference
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
index 37d8d95f25..5ff71c2030 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _uCoUgDmmEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:30 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:57 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,19 +18,19 @@ with [get-editor "new_file.template"] {
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "bool/AndSelector"
     get-button Finish | click
 }
 with [get-window AndSelector] {
     get-button "Create and link new Style Selector" | click
-    with [get-window "New Reference Element"] {
+    with [get-window "Select Sub Class and Template"] {
         get-tree | select "viewModelElement/ViewModelElementSelector"
         get-button Finish | click
     }
     get-window ViewModelElementSelector | get-button OK | click
     get-button "Create and link new Style Selector" | click
-    with [get-window "New Reference Element"] {
+    with [get-window "Select Sub Class and Template"] {
         get-tree | select "annotation/AnnotationSelector"
         get-button Finish | click
     }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
index ed7e959168..d518aea349 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _PcpI0DmJEeiUsKIXZxWPjg
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:22 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,7 +18,7 @@ with [get-editor "new_file.template"] {
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "annotation/AnnotationSelector"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
index b0edb24a8e..f01f801d56 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _-p_yMKoHEeminf0o9fO9mA
-Runtime-Version: 2.5.0.201907120000
-Save-Time: 7/19/19 2:44 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -25,7 +25,7 @@ with [get-editor "new_file.template"] {
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Style Property" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "mandatory/MandatoryStyleProperty"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
index 58db264344..c90c19adbc 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _6KV0MKoAEeminf0o9fO9mA
-Runtime-Version: 2.5.0.201907120000
-Save-Time: 7/19/19 2:44 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -24,7 +24,7 @@ with [get-editor "new_file.template"] {
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Style Property" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "mandatory/MandatoryStyleProperty"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
index 950f0d77dc..ef02657b2f 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _JU4aMDmmEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:26 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,13 +18,13 @@ with [get-editor "new_file.template"] {
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "hierarchy/HierarchySelector"
     get-button Finish | click
 }
 with [get-window HierarchySelector] {
     get-button "Create and link new Selector" | click
-    with [get-window "New Reference Element"] {
+    with [get-window "Select Sub Class and Template"] {
         get-tree | select "viewModelElement/ViewModelElementSelector"
         get-button Finish | click
     }
@@ -46,7 +46,7 @@ with [get-editor "new_file.template"] {
     }
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "viewModelElement/ViewModelElementSelector"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
index ee3a51f46d..c451da58cd 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _RKICsDmnEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:33 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,7 +18,7 @@ with [get-editor "new_file.template"] {
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Style Property" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "wrap/LabelWrapStyleProperty"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test
index 8aa2cac743..f3934bc6b8 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test
@@ -118,7 +118,7 @@ with [get-view "EMF Forms Preview"] {
     get-editbox -after [get-label "First Name"] | get-property "getText()" | equals "" | verify-true
     get-editbox -after [get-label "Last Name*"] | get-property "getText()" | equals "" | verify-true
     get-label "" -after [get-label "Last Name*"] | get-property "image.path" 
-        | equals "org.eclipse.emf.ecp.edit.swt/icons/validation_error.png" | verify-true
+        | equals "org.eclipse.emfforms.swt.core/icons/validation_error.png" | verify-true
     get-combo -after [get-label Gender] | get-property selection | equals Male | verify-true
 }
 //change user1 details
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test b/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test
index 03fdc760f8..66b745cbb2 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test
@@ -54,7 +54,7 @@ get-view "EMF Forms Preview" | get-button "Automatically refresh Preview View" |
 // Check that controls are present and that validation works
 get-view "EMF Forms Preview" | get-label "Name*" | get-property caption | equals "Name*" | verify-true
 get-view "EMF Forms Preview" | get-label "" -after [get-label "Name*"] | get-property "image.path" 
-    | equals "org.eclipse.emf.ecp.edit.swt/icons/validation_error.png" | verify-true
+    | equals "org.eclipse.emfforms.swt.core/icons/validation_error.png" | verify-true
 with [get-view "EMF Forms Preview" | get-editbox -after [get-label "Name*"]] {
     set-text Test
     key-type "TRAVERSE_TAB_NEXT"
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
index b9302d973d..b1f46c5e4e 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
@@ -299,9 +299,9 @@ get-window -class WizardDialog | get-button Cancel | click
 get-editor "User.view" | get-tree | select View | get-menu -path Control | click
 with [get-editor "User.view" | get-tree] {
     get-item -path "View/Control" | get-property "image.decorations[0].path" 
-        | equals "org.eclipse.emf.ecp.edit.swt/icons/error_decorate.png" | verify-true
+        | equals "org.eclipse.emfforms.swt.core/icons/error_decorate.png" | verify-true
     get-item -path View | get-property "image.decorations[0].path" 
-        | equals "org.eclipse.emf.ecp.edit.swt/icons/error_decorate.png" | verify-true
+        | equals "org.eclipse.emfforms.swt.core/icons/error_decorate.png" | verify-true
 }
 get-editor "User.view" | get-tree | select "View/Control" | get-menu -path Delete | click
 verify-error { get-editor "User.view" | get-tree | get-item -path View | get-property "image.decorations[0].path" -raw}
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
index 22563c5fc8..085bf1cd0e 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker EMFStore Provider Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.changebroker.provider.test
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
index 17af4e1c77..61a48cddba 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.changebroker.provider.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 		<build>
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
index e212cbf7c5..4b189676ef 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
index 05c2ae8ae1..dabdb7e6ec 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.changebroker.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 		<build>
diff --git a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
index a7f4e216ec..ca2d440d69 100644
--- a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.22.0",
- org.eclipse.emf.ecp.common.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.23.0",
+ org.eclipse.emf.ecp.common.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.util;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)";visibility:=reexport,
diff --git a/tests/org.eclipse.emf.ecp.common.test/pom.xml b/tests/org.eclipse.emf.ecp.common.test/pom.xml
index 75a0b4020d..5e321ad853 100644
--- a/tests/org.eclipse.emf.ecp.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.common.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.common.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
index 2a6a8a2d5d..9ca58e81c1 100644
--- a/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Common UI Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml b/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
index 1b31afaf6c..7d08417d40 100644
--- a/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.common.ui.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF
index c883937c50..35057c29eb 100644
--- a/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Bundle-SymbolicName: org.eclipse.emf.ecp.controls.fx.test
 Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.controls.fx.test;version="1.3.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.controls.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.test.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.controls.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.test.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.controls.fx.test
diff --git a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
index 9dc10586d4..dcf6d05762 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.concurrent.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.concurrent.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.concurrent.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,1.10.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.equinox.ds
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.concurrent.test
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.internal.ui;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.internal.ui;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
index ac8f8b3915..cae1a4ce73 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.rap.concurrent.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
index e61db962c4..871f78c569 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Rap Sessionprovider Concurrent Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
index c2bd8db5b0..987a168ba2 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
index e165b18061..b69b18274b 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Rap Sessionprovider Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
index 6a03df531b..bccb8b3339 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
index f7df72e89f..5eb6c30a60 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.test
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
index 174c62caaf..0f0cfe9a7c 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.rap.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
index cc9a60da14..d78218ded8 100644
--- a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.core.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.core.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="3.1.0",
  org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="4.0.0",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.core.test/pom.xml b/tests/org.eclipse.emf.ecp.core.test/pom.xml
index 4482786c56..c436dd689b 100644
--- a/tests/org.eclipse.emf.ecp.core.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
index c5bf6a0286..aeaf131121 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Diff Merge Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.test
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
index f80836ee8c..ea9db96bf1 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.diffmerge.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
index 1d58a9f33b..3a75d5549f 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECore GenModel Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.ecore.editor.test;version="1.2.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ecore.editor.test
 Import-Package: org.eclipse.ui.part;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
index 65fcf11553..a143f57aef 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ecore.editor.test</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
   <build>
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
index 67a1ac04e4..dd93af6ea5 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.edit.internal.model.testData;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.model.testData.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.model.testData.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.table;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.edit.internal.model.testData;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.model.testData.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.model.testData.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.table;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.2,3.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.prevalidation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.8.0,3.0.0)"
-Automatic-Module-Name: org.eclipse.emf.ecp.edit.swt.test
-Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.22.0,1.23.0)"
+Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.ecp.edit.swt.test
+Import-Package: org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
index 2354fdfc8b..e6a5c4322b 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.edit.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/DeleteServiceAdapter_PTest.java b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/DeleteServiceAdapter_PTest.java
new file mode 100644
index 0000000000..b249e5fdcb
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/DeleteServiceAdapter_PTest.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Christian W. Damus and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christian W. Damus - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.internal.swt.util;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.verify;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.eclipse.emf.ecp.edit.spi.DeleteService;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
+import org.eclipse.emf.emfstore.bowling.BowlingFactory;
+import org.eclipse.emf.emfstore.bowling.League;
+import org.eclipse.emf.emfstore.bowling.Player;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+/**
+ * Tests for the {@code DeleteServiceAdapter} class via the {@link ConditionalDeleteService} APIs that provide instances of it.
+ */
+@SuppressWarnings("nls")
+@RunWith(MockitoJUnitRunner.class)
+public class DeleteServiceAdapter_PTest {
+
+	private League league;
+	private Player player;
+
+	@Mock
+	private DeleteService delegate;
+
+	@Mock
+	private ConditionalDeleteService cdelegate;
+
+	/**
+	 * Test the null adapter (the adapter for an absent delete service).
+	 */
+	@Test
+	public void test_canDelete_null() {
+		final ConditionalDeleteService service = ConditionalDeleteService.adapt(null);
+
+		final Collection<?> objects = Arrays.asList(player, league);
+		assertThat("can delete without delegate", service.canDelete(player), is(false));
+		assertThat("can delete without delegate", service.canDelete(objects), is(false));
+	}
+
+	@Test
+	public void test_canDelete_single() {
+		final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+		assertThat(service.canDelete(player), is(true));
+		assertThat(service.canDelete(league), is(false));
+	}
+
+	@Test
+	public void test_canDelete_multiple() {
+		final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+		assertThat(service.canDelete(Arrays.asList(player)), is(true));
+		assertThat(service.canDelete(Arrays.asList(player, league)), is(false));
+	}
+
+	@Test
+	public void test_canDelete_single2() {
+		final ConditionalDeleteService service = ConditionalDeleteService.adapt(cdelegate);
+
+		service.canDelete(player);
+
+		verify(cdelegate).canDelete(player);
+	}
+
+	@Test
+	public void test_canDelete_multiple2() {
+		final ConditionalDeleteService service = ConditionalDeleteService.adapt(cdelegate);
+
+		final Collection<?> objects = Arrays.asList(player, league);
+		service.canDelete(objects);
+
+		verify(cdelegate).canDelete(objects);
+	}
+
+	@Test
+	public void test_deleteElement() {
+		final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+		service.deleteElement(player);
+
+		verify(delegate).deleteElement(player);
+	}
+
+	@Test
+	public void test_deleteElementse() {
+		final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+		final Collection<Object> objects = Arrays.asList(player, league);
+		service.deleteElements(objects);
+
+		verify(delegate).deleteElements(objects);
+	}
+
+	//
+	// Test framework
+	//
+
+	@Before
+	public void createModel() {
+		league = BowlingFactory.eINSTANCE.createLeague();
+		player = BowlingFactory.eINSTANCE.createPlayer();
+
+		league.getPlayers().add(player);
+	}
+
+}
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java
index b3289f0b43..0344274a2d 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,9 +10,12 @@
  *
  * Contributors:
  * jfaltermeier - initial API and implementation
+ * Christian W. Damus - bug 552385
  ******************************************************************************/
 package org.eclipse.emf.ecp.edit.internal.swt.util;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -21,19 +24,25 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
+import java.util.Collection;
 
 import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.ecp.edit.spi.DeleteService;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
 import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
 import org.eclipse.emf.ecp.test.university.Address;
 import org.eclipse.emf.ecp.test.university.Professor;
 import org.eclipse.emf.ecp.test.university.UniversityFactory;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.edit.command.OverrideableCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.emfstore.bowling.BowlingFactory;
@@ -48,10 +57,12 @@ import org.junit.Test;
  * @author jfaltermeier
  *
  */
+@SuppressWarnings("nls")
 public class EMFDeleteSerivceImpl_PTest {
 
-	private DeleteService deleteService;
+	private ConditionalDeleteService deleteService;
 	private AdapterFactoryEditingDomain domain;
+	private ViewModelContext context;
 	private Resource resource;
 	private League league;
 	private Game game;
@@ -60,13 +71,25 @@ public class EMFDeleteSerivceImpl_PTest {
 	private Player player3;
 	private Tournament tournament;
 
+	private EObject denyDeletion;
+
 	@Before
 	public void setUp() {
 		final ResourceSet resourceSet = new ResourceSetImpl();
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl()); //$NON-NLS-1$
 		domain = new AdapterFactoryEditingDomain(
 			new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
-			new BasicCommandStack(), resourceSet);
+			new BasicCommandStack(), resourceSet) {
+
+			@Override
+			public Command createOverrideCommand(OverrideableCommand command) {
+				if (denyDeletion != null && command instanceof RemoveCommand
+					&& ((RemoveCommand) command).getCollection().contains(denyDeletion)) {
+					return UnexecutableCommand.INSTANCE;
+				}
+				return super.createOverrideCommand(command);
+			}
+		};
 		resourceSet.eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
 		resource = resourceSet.createResource(URI.createURI("VIRTUAL_URI")); //$NON-NLS-1$
 
@@ -91,7 +114,7 @@ public class EMFDeleteSerivceImpl_PTest {
 		game.setPlayer(player1);
 
 		deleteService = new EMFDeleteServiceImpl();
-		final ViewModelContext context = mock(ViewModelContext.class);
+		context = mock(ViewModelContext.class);
 		when(context.getDomainModel()).thenReturn(league);
 		deleteService.instantiate(context);
 	}
@@ -143,4 +166,40 @@ public class EMFDeleteSerivceImpl_PTest {
 		assertSame(address1, professor.getAddresses().get(0));
 	}
 
+	@Test
+	public void testCanDeleteElement() {
+		assertThat("can delete returns false", deleteService.canDelete(player1), is(true));
+
+		denyDeletion = player1;
+		assertThat("can delete returns true", deleteService.canDelete(player1), is(false));
+	}
+
+	@Test
+	public void testCanDeleteElements() {
+		final Collection<?> objects = Arrays.asList(player1, player2);
+
+		assertThat("can delete returns false", deleteService.canDelete(objects), is(true));
+
+		denyDeletion = player2; // Not the first one
+		assertThat("can delete returns true", deleteService.canDelete(objects), is(false));
+	}
+
+	@Test
+	public void testCanDeleteNoEditingDomain() {
+		// Disconnect everything from the editing domain
+		resource.getContents().clear();
+		resource.getResourceSet().eAdapters().clear();
+		resource.getResourceSet().getResources().clear();
+		resource.unload();
+		resource.eAdapters().clear();
+
+		// Re-initialize to forget the editing domain
+		deleteService.dispose();
+		deleteService.instantiate(context);
+
+		assertThat("cannot delete a contained object", deleteService.canDelete(player1), is(true));
+
+		assertThat("can delete a root object", deleteService.canDelete(league), is(false));
+	}
+
 }
diff --git a/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
index ee030a236e..7773b0ebb1 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF To Web JSON Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.json.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.22.0",
- org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.23.0",
+ org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.json.test
diff --git a/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml b/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
index 12e9574cb6..e3eb267349 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emf2web.json.test</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
index ed8db13425..12310df46b 100644
--- a/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE Editor View Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ide.editor.view.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ide.editor.view.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.view.test
diff --git a/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
index 7460a17c0d..fca5a0f6d5 100644
--- a/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.editor.view.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
index 84d62e617f..1c4538c79b 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.util.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
@@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,1.10.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.util.test
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
index 3df9ce968e..868960b8d1 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.util.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
index e57862b78f..c912c4c293 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDEViewModelRegistry Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.0.0,3.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
index 2335d1266c..a81fc1dfbc 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.view.service.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
index a914fc8167..8788bfe972 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Integrationtest
 Bundle-SymbolicName: org.eclipse.emf.ecp.integrationtest
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.integrationtest.Activator
-Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
index 82c2215122..4adc15a57a 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.integrationtest</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
index 35019c1793..0b042b355f 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Model Quick Fix Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
index 696d9786f9..06e92f8e10 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.quickfix.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
index b354dc0adb..634907ed2c 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Test Model Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.test.university.provider.UniversityEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.test.model.edit
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
index c01c9f4879..59512d06d6 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.model.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
index 6bc6053904..4c2670a433 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecp.test.model.feature"
       label="ECP Test Model Feature"
-      version="1.22.0.qualifier">
+      version="1.23.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
index 78f82cd796..1df1987e7f 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.test.model.feature</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
index 15d0ec876b..50fa09a7c4 100644
--- a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Test Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university;version="1.22.0",
- org.eclipse.emf.ecp.test.university.impl;version="1.22.0",
- org.eclipse.emf.ecp.test.university.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.test.university;version="1.23.0",
+ org.eclipse.emf.ecp.test.university.impl;version="1.23.0",
+ org.eclipse.emf.ecp.test.university.util;version="1.23.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.test.model
diff --git a/tests/org.eclipse.emf.ecp.test.model/pom.xml b/tests/org.eclipse.emf.ecp.test.model/pom.xml
index fd4b4ba9ea..e567d40e3d 100644
--- a/tests/org.eclipse.emf.ecp.test.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.model</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
index 56d8c133e2..0f74ef7d34 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation View Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.validation.test
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
index 18be6f7a57..3315b47db1 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.validation.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
index 9fc91a80a5..0462c3d440 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Editor Controls - Tests for Blocking UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
index dada50d8a0..0637ca338e 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
index f6fc8985d9..3b425f9dfb 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.22.0",
- org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.controls;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.editor.controls;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.23.0",
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.controls;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
index 5ace925249..f891c2c46c 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
index 76f261dc1b..615131daf7 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP String Modifier with Line Wrapping Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.linewrapper.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.linewrapper.tests
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
index 48b50a5f7a..22933167d4 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.linewrapper.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
index f9d5dbedd4..95c210d1c7 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Renderer Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.spi.swt.layout;version="1.22.0";uses:="org.hamcrest",
- org.eclipse.emf.ecp.ui.view.spi.swt.masterdetail;version="1.22.0",
- org.eclipse.emf.ecp.ui.view.spi.swt.selection.test;version="1.22.0";uses:="org.hamcrest,org.eclipse.jface.viewers",
- org.eclipse.emf.ecp.ui.view.swt;version="1.22.0";
+Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.spi.swt.layout;version="1.23.0";uses:="org.hamcrest",
+ org.eclipse.emf.ecp.ui.view.spi.swt.masterdetail;version="1.23.0",
+ org.eclipse.emf.ecp.ui.view.spi.swt.selection.test;version="1.23.0";uses:="org.hamcrest,org.eclipse.jface.viewers",
+ org.eclipse.emf.ecp.ui.view.swt;version="1.23.0";
   uses:="org.eclipse.emf.ecore,
    org.osgi.framework,
    org.eclipse.swt.widgets,
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecp.ui.view.swt.reference",
- org.eclipse.emf.ecp.ui.view.swt.test;version="1.22.0";
+ org.eclipse.emf.ecp.ui.view.swt.test;version="1.23.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecp.ui.view.swt.reference,
    org.eclipse.emf.common.notify,
@@ -23,15 +23,15 @@ Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.22.0";x-inte
    org.eclipse.emf.edit.domain"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.swt.test
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
index 1fd89b73bf..ad6f67b664 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
index 5f555a9c2e..6426e7616c 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.test
-Bundle-Version: 1.22.0.qualifier
-Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.23.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.ui;bundle-version="3.104.0",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.test
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
index f32adc6e18..8e0f0cb331 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
index af8c4841c3..f8253fd73d 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Diagnostician Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
index 2e30ce00f7..d0e6ca5d97 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.validation.diagnostician.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
index 25299bbe38..aaad4b950d 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.validation.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.util;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.validation.test
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
index 2efb7abb8b..26f2317cf1 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.validation.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
index 2b9ed0dd34..41e266954b 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Categorization Model's Edit Bundle
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.model.edit.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.model.edit.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
index 5ac40a23c1..de767bace8 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.categorization.model.edit.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch
index 1a5edf02d3..3701fe348c 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch
@@ -33,7 +33,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.batik.constants*1.11.0.v20190515-0436@default:default,org.apache.batik.css*1.11.0.v20190515-0436@default:default,org.apache.batik.i18n*1.11.0.v20190515-0436@default:default,org.apache.batik.util*1.11.0.v20190515-0436@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.batik.constants*1.11.0.v20190515-0436@default:default,org.apache.batik.css*1.11.0.v20190515-0436@default:default,org.apache.batik.i18n*1.11.0.v20190515-0436@default:default,org.apache.batik.util*1.11.0.v20190515-0436@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.ecp.test.common@default:default,org.eclipse.emf.ecp.test.model@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view.test@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.view.categorization.model.edit@default:default,org.eclipse.emf.ecp.view.categorization.model@default:default,org.eclipse.emf.ecp.view.categorization.swt.test@default:false,org.eclipse.emf.ecp.view.categorization.swt@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common.di@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.rule.model@default:default,org.eclipse.emf.ecp.view.rule@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.test.common.swt@default:default,org.eclipse.emf.ecp.view.test.common@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.segments@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di.extension@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.model.localization@default:default,org.eclipse.emfforms.view.multisegment.model@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
index 425d835a08..ecca9813f6 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Categorization Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.swt.test
-Import-Package: org.eclipse.emf.ecp.test.common;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.test.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
  org.eclipse.swt.layout;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
index a24eb7f2e8..2876aaa640 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.categorization.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java
index c7f6127436..ae08028b6f 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,14 +10,28 @@
  *
  * Contributors:
  * Eugen - initial API and implementation
+ * Christian W. Damus - bug 552852
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.spi.categorization.swt;
 
+import static java.util.Collections.singleton;
+import static org.eclipse.emf.ecp.view.test.common.spi.EMFMocking.eMock;
+import static org.hamcrest.CoreMatchers.anything;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.TreeIterator;
@@ -42,6 +56,7 @@ import org.eclipse.emf.ecp.view.test.common.swt.spi.DatabindingClassRunner;
 import org.eclipse.emf.emfstore.bowling.BowlingFactory;
 import org.eclipse.emf.emfstore.bowling.Player;
 import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.swt.core.EMFFormsNoRendererException;
 import org.eclipse.emfforms.spi.swt.core.EMFFormsRendererFactory;
 import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
 import org.eclipse.swt.custom.CTabFolder;
@@ -52,7 +67,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -63,13 +77,6 @@ import org.junit.runner.RunWith;
 @RunWith(DatabindingClassRunner.class)
 public class CategorizationRenderer_PTest {
 
-	/**
-	 * @throws java.lang.Exception
-	 */
-	@Before
-	public void setUp() throws Exception {
-	}
-
 	@Test
 	public void testCategorizationElementTreeRenderer() throws NoRendererFoundException,
 		NoPropertyDescriptorFoundExeption {
@@ -98,22 +105,30 @@ public class CategorizationRenderer_PTest {
 
 	@Test
 	public void testCategorizationElementTabRenderer() throws NoRendererFoundException,
-		NoPropertyDescriptorFoundExeption {
+		NoPropertyDescriptorFoundExeption, EMFFormsNoRendererException {
+
+		final Set<Object> contextUsers = new HashSet<>();
+
 		final ReportService reportService = mock(ReportService.class);
-		final EMFFormsRendererFactory emfFormsRendererFactory = mock(EMFFormsRendererFactory.class);
+		final EMFFormsRendererFactory emfFormsRendererFactory = mockRendererFactory(reportService);
 
 		final SWTGridCell gridCell = mock(SWTGridCell.class);
 		final Shell shell = new Shell();
 		final VCategorizationElement categorizationElement = mock(VCategorizationElement.class);
 		final EList<VAbstractCategorization> categorizations = new BasicEList<VAbstractCategorization>();
+		categorizations.add(eMock(VCategory.class));
 		when(categorizationElement.getCategorizations()).thenReturn(categorizations);
-		final ViewModelContext vmc = mock(ViewModelContext.class);
+		final ViewModelContext vmc = mockViewModelContext(contextUsers);
 		final VTViewTemplateProvider viewTemplateProvider = mock(VTViewTemplateProvider.class);
 		final CategorizationElementTabbedSWTRenderer categorizatrionElementRenderer = new CategorizationElementTabbedSWTRenderer(
 			categorizationElement, vmc, reportService, emfFormsRendererFactory, viewTemplateProvider);
 		categorizatrionElementRenderer.init();
 		final Control render = categorizatrionElementRenderer.render(gridCell, shell);
+		categorizatrionElementRenderer.finalizeRendering(shell);
 		assertTrue(CTabFolder.class.isInstance(render));
+
+		shell.dispose();
+		assertThat("Some context user remains", contextUsers, not(hasItem(anything())));
 	}
 
 	@Test
@@ -190,8 +205,11 @@ public class CategorizationRenderer_PTest {
 	@Test
 	public void testCompositeCategoryElementTabRenderer() throws NoRendererFoundException,
 		NoPropertyDescriptorFoundExeption {
+
+		final Set<Object> contextUsers = new HashSet<>();
+
 		final ReportService reportService = mock(ReportService.class);
-		final EMFFormsRendererFactory emfFormsRendererFactory = mock(EMFFormsRendererFactory.class);
+		final EMFFormsRendererFactory emfFormsRendererFactory = mockRendererFactory(reportService);
 
 		final SWTGridCell gridCell = mock(SWTGridCell.class);
 		final Shell shell = new Shell();
@@ -199,15 +217,21 @@ public class CategorizationRenderer_PTest {
 		final EList<VAbstractCategorization> categorizations = new BasicEList<VAbstractCategorization>();
 		final VCategorization categorization = mock(VCategorization.class);
 		categorizations.add(categorization);
-		when(categorization.getCategorizations()).thenReturn(new BasicEList<VAbstractCategorization>());
+		final EList<VAbstractCategorization> tabs = new BasicEList<VAbstractCategorization>(
+			singleton(eMock(VCategory.class)));
+		when(categorization.getCategorizations()).thenReturn(tabs);
 		when(categorizationElement.getCategorizations()).thenReturn(categorizations);
-		final ViewModelContext vmc = mock(ViewModelContext.class);
+		final ViewModelContext vmc = mockViewModelContext(contextUsers);
 		final VTViewTemplateProvider viewTemplateProvider = mock(VTViewTemplateProvider.class);
 		final CompositeCategorySWTTabRenderer categorizatrionElementRenderer = new CompositeCategorySWTTabRenderer(
 			categorization, vmc, reportService, emfFormsRendererFactory, viewTemplateProvider);
 		categorizatrionElementRenderer.init();
 		final Control render = categorizatrionElementRenderer.render(gridCell, shell);
+		categorizatrionElementRenderer.finalizeRendering(shell);
 		assertTrue(CTabFolder.class.isInstance(render));
+
+		shell.dispose();
+		assertThat("Some context user remains", contextUsers, not(hasItem(anything())));
 	}
 
 	@Test
@@ -276,4 +300,34 @@ public class CategorizationRenderer_PTest {
 		assertTrue(tree.isEnabled());
 		assertTrue(detailComposite.isEnabled());
 	}
+
+	//
+	// Test framework
+	//
+
+	ViewModelContext mockViewModelContext(Set<Object> users) {
+		final ViewModelContext result = mock(ViewModelContext.class);
+		doAnswer(invocation -> users.add(invocation.getArguments()[0])).when(result).addContextUser(any());
+		doAnswer(invocation -> users.remove(invocation.getArguments()[0])).when(result).removeContextUser(any());
+		return result;
+	}
+
+	EMFFormsRendererFactory mockRendererFactory(ReportService reportService) {
+		final EMFFormsRendererFactory result = mock(EMFFormsRendererFactory.class);
+		try {
+			when(result.getRendererInstance(isA(VCategory.class), any()))
+				.thenAnswer(invocation -> {
+					final SWTCategoryRenderer renderer = new SWTCategoryRenderer(
+						(VCategory) invocation.getArguments()[0],
+						(ViewModelContext) invocation.getArguments()[1], reportService, result);
+					renderer.init();
+					return renderer;
+				});
+		} catch (final EMFFormsNoRendererException e) {
+			e.printStackTrace();
+			fail("Exception in mock set-up: " + e.getMessage());
+		}
+
+		return result;
+	}
 }
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java
index 1170953eb9..1ed11066e7 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java
@@ -13,16 +13,21 @@
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.spi.categorization.swt;
 
+import static org.eclipse.emf.ecp.common.spi.UniqueSetting.createSetting;
 import static org.eclipse.emf.ecp.view.test.common.spi.EMFMocking.eMock;
 import static org.eclipse.emf.ecp.view.test.common.spi.EMFMocking.withESettings;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecp.test.common.DefaultRealm;
 import org.eclipse.emf.ecp.view.internal.categorization.swt.CategorizationRevealProvider;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization;
@@ -32,7 +37,11 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategory;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.model.VContainedContainer;
 import org.eclipse.emf.ecp.view.spi.model.VContainer;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emf.ecp.view.spi.vertical.model.VVerticalFactory;
+import org.eclipse.emf.ecp.view.spi.vertical.model.VVerticalLayout;
 import org.eclipse.emf.ecp.view.test.common.spi.EMFFormsRevealServiceFixture;
 import org.eclipse.emf.ecp.view.test.common.spi.EMFFormsViewContextFixture.DomainModel;
 import org.eclipse.emf.ecp.view.test.common.spi.EMFFormsViewContextFixture.ViewModel;
@@ -41,6 +50,7 @@ import org.eclipse.emf.ecp.view.test.common.spi.EMock;
 import org.eclipse.emf.ecp.view.test.common.swt.spi.SWTViewTestHelper;
 import org.eclipse.emfforms.bazaar.Bid;
 import org.eclipse.emfforms.bazaar.Create;
+import org.eclipse.emfforms.spi.core.services.controlmapper.EMFFormsSettingToControlMapper;
 import org.eclipse.emfforms.spi.core.services.reveal.EMFFormsRevealProvider;
 import org.eclipse.emfforms.spi.core.services.reveal.RevealStep;
 import org.eclipse.swt.widgets.Shell;
@@ -61,9 +71,8 @@ public class CategorizationRevealProvider_PTest {
 	private final VCategorizationElement categorizations = VCategorizationFactory.eINSTANCE
 		.createCategorizationElement();
 
-	@EMock
 	@DomainModel
-	private EObject rootObject;
+	private final EObject rootObject = EcoreFactory.eINSTANCE.createEClass();
 
 	@EMock
 	private EObject obj1;
@@ -192,6 +201,40 @@ public class CategorizationRevealProvider_PTest {
 		verify(reveal).run();
 	}
 
+	/**
+	 * Integration test for revealing a specific control (by feature) within a tree categorization,
+	 * which is the scenario that didn't work as reported in <a href="http://eclip.se/551066">bug 551066</a>.
+	 * The test relies on the fact that the non-default category containing the control to be revealed
+	 * would not end up being selected if the control within did not provide a successful reveal step.
+	 *
+	 * @see <a href="http://eclip.se/551066">bug 551066</a>
+	 */
+	@Test
+	public void revealSpecificControlInTree() {
+		final VVerticalLayout vertical = VVerticalFactory.eINSTANCE.createVerticalLayout();
+		cat3.setComposite(vertical);
+
+		final VControl control = VViewFactory.eINSTANCE.createControl();
+		final EStructuralFeature feature = EcorePackage.Literals.ENAMED_ELEMENT__NAME;
+		control.setDomainModelReference(feature);
+		vertical.getChildren().add(control);
+
+		// Revealing a control requires the settings mapper
+		final EMFFormsSettingToControlMapper mapper = mock(EMFFormsSettingToControlMapper.class);
+		when(mapper.hasControlsFor(rootObject)).thenReturn(true);
+		when(mapper.hasMapping(createSetting(rootObject, feature), control)).thenReturn(true);
+		fixture.putService(EMFFormsSettingToControlMapper.class, mapper);
+
+		render();
+
+		fixture.reveal(rootObject, feature);
+
+		// The category would only be selected if the control within it was revealed.
+		// In the case of bug 551066, context injection of the ControlRevealProvider failed
+		// to create the provider because the name control renderer was not yet available
+		assertThat("The category was not selected", categorizations.getCurrentSelection(), is(cat3));
+	}
+
 	//
 	// Test framework
 	//
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
index c9c2138f56..4077659f11 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compound Control SWT Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
 Import-Package: org.eclipse.swt.graphics;version="0.0.0",
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
index cfad571ac6..efee2f000a 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.compoundcontrol.swt.test</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
   <build>
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
index bae8d5bf51..2f2de66d1c 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Model Context Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.context;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.context;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.context.tests
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
index 68d0cf83f5..b0274c0c2a 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.context.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch
index 07c47aa12a..5b8ea3acb9 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch
@@ -24,6 +24,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.ecp.view.control.multireference.tests.AllPluginTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
@@ -32,8 +33,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.batik.constants@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.i18n@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding*1.7.100.v20181030-1443@default:default,org.eclipse.core.databinding.observable*1.6.300.v20180827-2028@default:default,org.eclipse.core.databinding.property*1.6.300.v20180827-2028@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core*1.3.0.v201303031735@default:default,org.hamcrest.core*1.3.0.v20180420-1519@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.test.common@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view.test@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference.tests@default:false,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.model.test@default:false,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.test.common.swt@default:default,org.eclipse.emf.ecp.view.test.common@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common.prevalidation@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.multisegment.model@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.batik.constants*1.11.0.v20190515-0436@default:default,org.apache.batik.css*1.11.0.v20190515-0436@default:default,org.apache.batik.i18n*1.11.0.v20190515-0436@default:default,org.apache.batik.util*1.11.0.v20190515-0436@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.macosx@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.test.common@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view.test@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference.tests@default:false,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common.di@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.model.test@default:false,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.test.common.swt@default:default,org.eclipse.emf.ecp.view.test.common@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common.prevalidation@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.segments@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.multisegment.model@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
index d6b70bae0a..9a8f2ab169 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Multi Reference Control Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.control.multireference;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.control.multireference;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
index 53574ddbc5..649633b6e1 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.control.multireference.tests</artifactId>
@@ -67,5 +67,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java
index 3861602c6e..95a846d02c 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java
@@ -10,7 +10,7 @@
  *
  * Contributors:
  * Lucas Koehler - initial API and implementation
- * Christian W. Damus - bug 527736
+ * Christian W. Damus - bugs 527736, 552385
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.internal.control.multireference;
 
@@ -56,6 +56,8 @@ import org.eclipse.emf.ecore.ETypedElement;
 import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.edit.spi.DeleteService;
+import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
 import org.eclipse.emf.ecp.view.model.common.AbstractGridCell.Alignment;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.model.VControl;
@@ -177,6 +179,8 @@ public class MultiReferenceRenderer_PTest {
 
 		when(viewContext.getDomainModel()).thenReturn(eObject);
 		when(viewContext.getViewModel()).thenReturn(vControl);
+		// Required for delete button enablement
+		when(viewContext.getService(DeleteService.class)).thenReturn(new EMFDeleteServiceImpl());
 
 		when(vControl.getDomainModelReference()).thenReturn(domainModelReference);
 
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
index ddec532268..0e97b57267 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.provider;version="1.22.0",
- org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.core.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.provider;version="1.23.0",
+ org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.core.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
@@ -25,14 +25,14 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="1.0.0",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
index 882be6d6fe..c5c181bfea 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.core.swt.tests</artifactId>
@@ -62,5 +62,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java
index 8a1444b0b0..8bd9679da0 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java
@@ -15,9 +15,11 @@ package org.eclipse.emf.ecp.view.spi.core.swt;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,7 +33,6 @@ import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
 import org.eclipse.emf.ecp.test.common.DefaultRealm;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.model.LabelAlignment;
@@ -54,6 +55,8 @@ import org.eclipse.emfforms.spi.core.services.label.NoLabelFoundException;
 import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
 import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
 import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService;
 import org.eclipse.emfforms.swt.common.test.AbstractControl_PTest.TestObservableValue;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
@@ -232,8 +235,10 @@ public class AbstractControlSWTRenderer_PTest {
 		assertEquals(SWT.RIGHT, Label.class.cast(render).getAlignment());
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
-	public void testgetValidationBackgroundColor() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+	public void testgetValidationBackgroundColorLegacy()
+		throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
 		/* setup */
 		final SWTValidationHelper validationHelper = Mockito.mock(SWTValidationHelper.class);
 
@@ -275,8 +280,10 @@ public class AbstractControlSWTRenderer_PTest {
 
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
-	public void testgetValidationForeGroundColor() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+	public void testgetValidationForeGroundColorLegacy()
+		throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
 		/* setup */
 		final SWTValidationHelper validationHelper = Mockito.mock(SWTValidationHelper.class);
 
@@ -317,8 +324,9 @@ public class AbstractControlSWTRenderer_PTest {
 
 	}
 
+	@SuppressWarnings("deprecation")
 	@Test
-	public void testgetValidationIcon() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+	public void testgetValidationIconLegacy() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
 		/* setup */
 		final SWTValidationHelper validationHelper = Mockito.mock(SWTValidationHelper.class);
 
@@ -469,6 +477,98 @@ public class AbstractControlSWTRenderer_PTest {
 		assertEquals(SWT.RIGHT, Label.class.cast(render).getAlignment());
 	}
 
+	/** Verify retrieving the validation icon for a VElement is forwarded to the {@link SWTValidationUiService}. */
+	@Test
+	public void getValidationIcon() {
+		final SWTValidationUiService validationUiService = mock(SWTValidationUiService.class);
+
+		renderer = new TestAbstractControlSWTRenderer(
+			vControl,
+			viewModelContext,
+			reportService,
+			emfFormsDatabinding,
+			emfFormsLabelProvider,
+			viewTemplateProvider, validationUiService);
+		renderer.init();
+
+		final Image expected = new Image(Display.getCurrent(), 1, 1);
+		when(validationUiService.getValidationIcon(vControl, viewModelContext)).thenReturn(expected);
+
+		final Image result = renderer.getValidationIcon();
+		assertSame(expected, result);
+	}
+
+	/**
+	 * Verify retrieving the validation foreground color for a VElement is forwarded to the
+	 * {@link SWTValidationUiService}.
+	 */
+	@Test
+	public void getValidationForegroundColor() {
+		final SWTValidationUiService validationUiService = mock(SWTValidationUiService.class);
+
+		renderer = new TestAbstractControlSWTRenderer(
+			vControl,
+			viewModelContext,
+			reportService,
+			emfFormsDatabinding,
+			emfFormsLabelProvider,
+			viewTemplateProvider, validationUiService);
+		renderer.init();
+
+		final Color expected = new Color(Display.getCurrent(), 1, 2, 3);
+		when(validationUiService.getValidationForegroundColor(vControl, viewModelContext)).thenReturn(expected);
+
+		final Color result = renderer.getValidationForegroundColor();
+		assertSame(expected, result);
+	}
+
+	/**
+	 * Verify retrieving the validation background color for a VElement is forwarded to the
+	 * {@link SWTValidationUiService}.
+	 */
+	@Test
+	public void getValidationBackgroundColor() {
+		final SWTValidationUiService validationUiService = mock(SWTValidationUiService.class);
+
+		renderer = new TestAbstractControlSWTRenderer(
+			vControl,
+			viewModelContext,
+			reportService,
+			emfFormsDatabinding,
+			emfFormsLabelProvider,
+			viewTemplateProvider, validationUiService);
+		renderer.init();
+
+		final Color expected = new Color(Display.getCurrent(), 1, 2, 3);
+		when(validationUiService.getValidationBackgroundColor(vControl, viewModelContext)).thenReturn(expected);
+
+		final Color result = renderer.getValidationBackgroundColor();
+		assertSame(expected, result);
+	}
+
+	/**
+	 * Test that the {@link SWTValidationUiService} implementation is retrieved from the view model context if it is not
+	 * given in the constructor.
+	 */
+	@Test
+	public void validationUiServiceRetrieval() {
+		final SWTValidationUiService customService = mock(SWTValidationUiService.class);
+		final Image expected = new Image(Display.getCurrent(), 1, 1);
+		when(customService.getValidationIcon(vControl, viewModelContext)).thenReturn(expected);
+		when(viewModelContext.getService(SWTValidationUiService.class)).thenReturn(customService);
+		renderer = new TestAbstractControlSWTRenderer(
+			vControl,
+			viewModelContext,
+			reportService,
+			emfFormsDatabinding,
+			emfFormsLabelProvider,
+			viewTemplateProvider);
+		renderer.init();
+		final Image result = renderer.getValidationIcon();
+		assertSame(expected, result);
+
+	}
+
 	private class TestAbstractControlSWTRenderer extends AbstractControlSWTRenderer<VControl> {
 
 		TestAbstractControlSWTRenderer(
@@ -503,6 +603,22 @@ public class AbstractControlSWTRenderer_PTest {
 				vtViewTemplateProvider, swtValidationHelper);
 		}
 
+		TestAbstractControlSWTRenderer(
+			VControl vElement,
+			ViewModelContext viewContext,
+			ReportService reportService,
+			EMFFormsDatabinding emfFormsDatabinding,
+			EMFFormsLabelProvider emfFormsLabelProvider,
+			VTViewTemplateProvider vtViewTemplateProvider, SWTValidationUiService validationUiService) {
+			super(
+				vElement,
+				viewContext,
+				reportService,
+				emfFormsDatabinding,
+				emfFormsLabelProvider,
+				vtViewTemplateProvider, validationUiService);
+		}
+
 		@Override
 		public SWTGridDescription getGridDescription(SWTGridDescription gridDescription) {
 			final SWTGridDescription simpleGrid = GridDescriptionFactory.INSTANCE.createSimpleGrid(1, 1, this);
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
index 2dbb2af332..d64c22dda7 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,41 +2,41 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Custom SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.custom.ui.swt.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
index 9d4d674430..433e4453dc 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.custom.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
index c8fea8da58..3a79bb309f 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.dynamictree.feature"
       label="Dynamic Tree Feature"
-      version="1.22.0.qualifier"
+      version="1.23.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.dynamictree.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.22.0.qualifier">
+      license-feature-version="1.23.0.qualifier">
 
    <description>
       %description
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
index 9260ce64f6..e11bea0e8b 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.dynamictree.feature</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
index 4fe9fd7235..ea9131be92 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.provider.DynamicTreeEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.23.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
index 64678f98a9..e49119d3bd 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
index 8fec99586b..116f8f7aa3 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.test.Activator
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.22.0";
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.23.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.core.databinding,
    org.eclipse.emf.ecp.view.context,
@@ -17,24 +17,24 @@ Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.22.0"
    org.eclipse.emf.ecp.internal.ui.view.builders"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.junit;bundle-version="4.11.0",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.200,2.0.0)",
  org.eclipse.swt;bundle-version="[3.102.1,4.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
index e73eebfc78..5402254f4f 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
index 48ec8269df..39d3f82220 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.22.0",
- org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.23.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model
 Service-Component: OSGI-INF/dynamicContainmentTreeDMRConverter.xml
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
index f4f99613ea..24bcbeb2f3 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
index 2671aa5b02..f4c94b48b6 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Dynamic Tree SWT UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.ui.swt
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
index 746a12c993..3f7ad8b9a9 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
   <artifactId>org.eclipse.emf.ecp.view.dynamictree.ui.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
index 89cd45c778..f281a11771 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Dynamic Tree UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.ui
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
index 0fc3874839..7ff958d8ca 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
   <artifactId>org.eclipse.emf.ecp.view.dynamictree.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
index 815de22f27..1cc30883b2 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._1160to1200;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._140to1170;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._160to1170;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._1160to1200;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._140to1170;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._160to1170;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.23.0,1.24.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.edapt.test
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
index 458b8205d4..3a2ccf4b9d 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
@@ -6,12 +6,12 @@
 <parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
   </parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.edapt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
index bb085f5589..f60749945e 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
@@ -2,42 +2,42 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.util.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.22.0",
- org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.23.0",
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
index acde9e8a0a..e32a31e1e2 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.edapt.util.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
index 5aa5bcc6c5..36b1bf917f 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Group SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.group.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
index 82904ad5fa..ec71beae9a 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.group.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
index 1ef74f5327..b58372615b 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Horizontal SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
index bc3472f51b..bf52373ce2 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.horizontal.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
index 645ed36c36..a62bdc2c5f 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.indexdmr.model.test
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
index d298a25e65..85e037c34b 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.indexdmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
index 719e3b09ca..30f8d75f80 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.22.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.22.0",
- org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.23.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.keyattributedmr.model.test
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
index 00fb100425..b412d90f95 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.keyattributedmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
index 78f86a0ad2..ce3a4304b4 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.model.test
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
index 34016662df..534a0498f4 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.mappingdmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
index dad8b695de..70299c1813 100644
--- a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Template Tooling Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.migrator.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml b/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
index 5d8918f475..fd85c8a4e7 100644
--- a/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.migrator.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
index 2b581ce498..3dd055abc3 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Common Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common.test
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
index cc49b57abc..6fb80afb5c 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
index 4b80ea9bff..ae7805cc5b 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.edit.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
index d1ae5e96f4..ae3a98edfb 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.edit.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
index 62496db243..b27f40437c 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecp.view.model.editor.test.feature"
       label="View Model Editor Test Feature"
-      version="1.22.0.qualifier">
+      version="1.23.0.qualifier">
 
    <description>
       Plugins for testing the View Model Editor with Q7. 
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
index f555d2d483..30eca8c565 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.22.0-SNAPSHOT</version>
+    <version>1.23.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.editor.test.feature</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
index 097dc6cd93..9bd694e215 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Editor Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.22.0,1.23.0)"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.23.0,1.24.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.editor.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.refactoring;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.refactoring;version="1.23.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
index 92b0bf6782..10497b0aaa 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.editor.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
index d1584f63b4..71e2e346d3 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Editor Test Plugin for Q7
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.testplugin;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.editor.testplugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
index 33e33bc33e..d9cff1ccb8 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.editor.testplugin</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
index bb2e8fa1bd..8401adbdc6 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Integrationtest
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.integrationtest
-Bundle-Version: 1.22.0.qualifier
-Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.annotation.model.edit;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.annotation.model.edit;bundle-version="[1.23.0,1.24.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.integrationtest
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
index 40ab313522..f16f4b08d1 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.integrationtest</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
index d3bc0acc19..0f4bda3adb 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Preview Common Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.common.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.23.0,1.24.0)"
 Export-Package: org.eclipse.emf.ecp.view.model.preview.common.test;version="0.0.0"
 Require-Bundle: org.eclipse.swt;bundle-version="[3.106.2,4.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
index 1f2052607b..363b132816 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.preview.common.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
index 6645c9ae0a..fc4d2f829f 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.generator.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
index 1b7792e3e0..3ed2ed48a6 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.provider.generator.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
index de253152a1..93f01ae579 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP XMI Provider Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.junit;bundle-version="4.0.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.xmi.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
index 3bd0ed4756..95d7445c9d 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.provider.xmi.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
index 84aa1f60db..a6cb755efa 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Model Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.test
-Import-Package: org.eclipse.emf.ecp.view.spi.group.model;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.spi.group.model;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
index 14cc3ebd9a..874f7b2dce 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
index 8be14ca5cc..2116e90fc5 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
@@ -2,36 +2,36 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.rule.ui.swt.test,org.eclipse.emf.ecp.view.unset.test",
- org.eclipse.emf.ecp.view.spi.rule;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.rule.ui.swt.test,org.eclipse.emf.ecp.view.unset.test",
+ org.eclipse.emf.ecp.view.spi.rule;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.test
-Import-Package: org.eclipse.emf.ecp.view.spi.validation;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.spi.validation;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
index 46d5fa7b9c..c4a038d9ec 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.rule.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
index 69d27c0b30..389d8eb52d 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
index 31032dd059..44f5e67f3f 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.rule.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
index 0aba3a0b2a..c19eaf4a65 100644
--- a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Section SWT Renderers
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.section.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.section.swt;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.section.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.swt;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.section.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
index b244bf9910..849f395943 100644
--- a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.section.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
index b8805df5ce..45b151c720 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Stack Model SWT Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
index ed76dd136b..772c33ded2 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.stack.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
index dfd9a25875..f9d8382719 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Model Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.table.model.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.table.model.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
index 7c9f14cddb..c79a525f23 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.table.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
index f64b336823..be35fb081f 100644
--- a/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Utils for Table Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.test.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.test.common;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.view.table.test.common;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.test.common
diff --git a/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml b/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
index f2eb327dd0..76c99953aa 100644
--- a/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-tests-parent</artifactId>
-    <version>1.22.0-SNAPSHOT</version>
+    <version>1.23.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.test.common</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
index 84c4f6e90e..782e16e035 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.22.0",
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.23.0",
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.util;version="1.23.0";x-internal:=true
 Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.databinding.beans;bundle-version="1.3.0",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
index c833f399b3..f41cdef7fa 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
index 8d58dcfba8..fe46568331 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,56 +2,56 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Table SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.22.0",
- org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.23.0",
+ org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
 Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.equinox.registry;bundle-version="[3.5.400,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.common;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.11.1,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
index e10e083982..4fa67ccfaf 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.table.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
index 5702a7bb98..cb461318a6 100644
--- a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Validation Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.validation.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.validation.test;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.validation.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.validation.test
diff --git a/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
index 0a5557d22a..5166abb76a 100644
--- a/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.table.validation.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
index 8984bce826..366b537ad2 100644
--- a/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Template Model Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.template.model.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.template.model.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.model.test
-Import-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
index 00cc30bc04..8e60e52bc0 100644
--- a/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.template.model.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
index 63d167ad52..aa59516851 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Template Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.22.0",
- org.eclipse.emf.ecp.view.template.service;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.service.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.service;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.service.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.service.test
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
index f1c28a9948..eee46f7088 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.template.service.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	
 		<build>
diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
index e97af2fa2c..6630776497 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.tooling.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.tooling.test
diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
index e6f24746dc..ad45794394 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.template.tooling.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
index fbd594dd03..81d4a621ea 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Helper Class for the SWT View Model Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common.swt
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.23.0"
 Require-Bundle: org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common.swt
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
index d5ff09716d..3f2011323d 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
@@ -7,12 +7,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
   <artifactId>org.eclipse.emf.ecp.view.test.common.swt</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
index 553270cf8d..d4d5336da5 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Test Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common
 Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
  org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.reveal;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.reveal;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
index dc60daa920..90af2f9658 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.test.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
index 0095ed61e4..5aad3a8e41 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the TreeMasterDetail Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)"
+Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
index 31433c948c..c5bfe2e21c 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test</artifactId>
-  <version>1.22.0-SNAPSHOT</version>
+  <version>1.23.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
index 4a118ba71f..17b73c0d7d 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms TreeMasterDetail Validation Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.validation.test
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
index b9bd467bec..82681ce3eb 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.treemasterdetail.validation.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
index 237e01dfc8..d17df14e46 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
@@ -2,40 +2,40 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor SWTBot Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.ui.editor.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.ui.editor.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.22.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
- org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.23.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
+ org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.swtbot.eclipse.finder;bundle-version="[2.1.1,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="4.11.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="3.102.0",
  org.eclipse.swtbot.junit4_x;bundle-version="2.1.1",
  org.eclipse.jface.databinding;bundle-version="1.6.200",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.ui.editor.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
index 79a7c62cc7..ef18779ef6 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.ui.editor.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
index ed682cd4b6..c191e8faf7 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Unset Service Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.unset;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.unset;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.unset.test
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
index 8616302224..6ffa9b8d22 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.unset.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
index 34d81c1b1c..922de75289 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
@@ -2,19 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .,
  lib/commons-beanutils-1.9.2.jar,
  lib/commons-lang3-3.3.2.jar,
  lib/org.apache.bval.bundle-0.5.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: car;version="1.22.0";x-internal:=true,
- car.impl;version="1.22.0";x-internal:=true,
- car.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean.test;version="1.22.0";x-internal:=true
+Export-Package: car;version="1.23.0";x-internal:=true,
+ car.impl;version="1.23.0";x-internal:=true,
+ car.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.bean.test
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.23.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
index 3b2e1e870a..6a3d6a7c43 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.validation.bean.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
index 90f9838643..14ec5d934b 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.22.0",
- org.eclipse.emf.ecp.view.validation.test.model;version="1.22.0",
- org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.validation.test.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.23.0",
+ org.eclipse.emf.ecp.view.validation.test.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.validation.test.model.util;version="1.23.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.prevalidation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
index 26eb6da139..8c74d986bc 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.validation.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationProvider_PTest.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationProvider_PTest.java
index d1dc9e833d..923312512c 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationProvider_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationProvider_PTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,9 +10,12 @@
  *
  * Contributors:
  * Eugen Neufeld - initial API and implementation
+ * Christian W. Damus - bug 552715
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.validation.test;
 
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -252,4 +255,74 @@ public class ValidationProvider_PTest {
 		validationService.validate(Collections.singleton(EObject.class.cast(computer)));
 		assertEquals(Diagnostic.OK, control.getDiagnostic().getHighestSeverity());
 	}
+
+	/**
+	 * @see <a href="http://eclip.se/552715">bug 552715</a>
+	 */
+	@Test
+	public void testValidationProviderInitializedWithContext() {
+		final ViewModelContext[] capturedContext = { null };
+
+		validationService.addValidationProvider(new ValidationProvider() {
+
+			@Override
+			public List<Diagnostic> validate(EObject eObject) {
+				return Collections.emptyList();
+			}
+
+			@Override
+			public void setContext(ViewModelContext context) {
+				capturedContext[0] = context;
+			}
+		});
+
+		assertThat("No view-model context captured", capturedContext[0], notNullValue());
+	}
+
+	/**
+	 * @see <a href="http://eclip.se/552715">bug 552715</a>
+	 */
+	@Test
+	public void testValidationProviderDisposedWithContext() {
+		final ViewModelContext[] capturedContext = { null };
+
+		final ValidationProvider provider = new ValidationProvider() {
+
+			@Override
+			public List<Diagnostic> validate(EObject eObject) {
+				return Collections.emptyList();
+			}
+
+			@Override
+			public void unsetContext(ViewModelContext context) {
+				capturedContext[0] = context;
+			}
+		};
+		validationService.addValidationProvider(provider);
+		validationService.removeValidationProvider(provider);
+
+		assertThat("No view-model context captured", capturedContext[0], notNullValue());
+	}
+
+	/**
+	 * @see <a href="http://eclip.se/552715">bug 552715</a>
+	 */
+	@Test
+	public void testValidationProviderInvokedWithContext() {
+		final ViewModelContext[] capturedContext = { null };
+
+		final ValidationProvider provider = new ValidationProvider.ContextSensitive() {
+
+			@Override
+			public Iterable<? extends Diagnostic> validate(ViewModelContext context, EObject object) {
+				capturedContext[0] = context;
+				return Collections.emptyList();
+			}
+		};
+
+		validationService.addValidationProvider(provider);
+
+		assertThat("No view-model context captured", capturedContext[0], notNullValue());
+	}
+
 }
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java
index 214c7d9348..1501c3afde 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2018 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,17 +10,24 @@
  *
  * Contributors:
  * Stefan Dirix - initial API and implementation
- * Christian W. Damus - bug 533522
+ * Christian W. Damus - bugs 533522, 552127
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.validation.test;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.ecore.EObject;
@@ -35,6 +42,7 @@ import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
 import org.eclipse.emf.ecp.view.spi.validation.ValidationProvider;
 import org.eclipse.emf.ecp.view.spi.validation.ValidationService;
+import org.eclipse.emf.ecp.view.spi.validation.ViewValidationListener;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent;
 import org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild;
@@ -389,4 +397,82 @@ public class ValidationService_PTest {
 		/* assert no NPE */
 	}
 
+	@Test
+	public void testValidate_Iterable() {
+		final AtomicReference<Collection<EObject>> validated = new AtomicReference<>();
+
+		// CHECKSTYLE.OFF: AnonInnerLength - it's a test
+		final ValidationService validationService = new ValidationService() {
+
+			@Override
+			public void validate(Collection<EObject> eObjects) {
+				validated.set(eObjects);
+			}
+
+			@Override
+			public void instantiate(ViewModelContext context) {
+				// Not interesting
+			}
+
+			@Override
+			public int getPriority() {
+				// Not interesting
+				return 0;
+			}
+
+			@Override
+			public void dispose() {
+				// Not interesting
+			}
+
+			@Override
+			public void childViewModelContextAdded(ViewModelContext childContext) {
+				// Not interesting
+			}
+
+			@Override
+			public void removeValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
+				// Not interesting
+			}
+
+			@Override
+			public void removeValidationProvider(ValidationProvider validationProvider) {
+				// Not interesting
+			}
+
+			@Override
+			public void registerValidationListener(ViewValidationListener listener) {
+				// TODO Auto-generated method stub
+			}
+
+			@Override
+			public void deregisterValidationListener(ViewValidationListener listener) {
+				// Not interesting
+			}
+
+			@Override
+			public void addValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
+				// Not interesting
+			}
+
+			@Override
+			public void addValidationProvider(ValidationProvider validationProvider) {
+				// Not interesting
+			}
+		};
+		// CHECKSTYLE.ON: AnonInnerLength
+
+		final List<EObject> eObjects = Arrays.asList(
+			mock(EObject.class, "a"),
+			mock(EObject.class, "b"),
+			mock(EObject.class, "c"));
+
+		final Iterable<EObject> iterable = eObjects::iterator;
+		validationService.validate(iterable);
+
+		assertThat("No collection passed to validation service", validated.get(), notNullValue());
+		assertThat("Collection has wrong size", validated.get().size(), is(eObjects.size()));
+		assertThat("Collection has wrong elements", new ArrayList<>(validated.get()), equalTo(eObjects));
+	}
+
 }
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
index cbf9f7d6e3..00b91db7bb 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the VerticalSWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
index 541cb8b135..060aa9c70a 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.vertical.ui.swt.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
index 051b2ba495..67a9ca7332 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewProxy Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.22.0",
- org.eclipse.emf.ecp.view.viewproxy.tests;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.23.0",
+ org.eclipse.emf.ecp.view.viewproxy.tests;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.viewproxy.tests
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
index 956024be61..e7cd707405 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.viewproxy.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
index 503e926127..32f00bc818 100644
--- a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui.rap.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.ui.rap.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.ui.rap.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.workspace.ui.rap.test
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
index 6a1bd78d22..b8bd99eaef 100644
--- a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.workspace.ui.rap.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
index 78047f8502..00f4720e0b 100644
--- a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Locale Tests
 Bundle-SymbolicName: org.eclipse.emfforms.common.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.common.sort;version="1.22.0",
- org.eclipse.emfforms.common.tests;version="1.22.0",
- org.eclipse.emfforms.spi.common.locale;version="1.22.0",
- org.eclipse.emfforms.spi.common.validation;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.common.sort;version="1.23.0",
+ org.eclipse.emfforms.common.tests;version="1.23.0",
+ org.eclipse.emfforms.spi.common.locale;version="1.23.0",
+ org.eclipse.emfforms.spi.common.validation;version="1.23.0"
 Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.common.tests
diff --git a/tests/org.eclipse.emfforms.common.tests/pom.xml b/tests/org.eclipse.emfforms.common.tests/pom.xml
index 565e7aa09a..35a5250fbf 100644
--- a/tests/org.eclipse.emfforms.common.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.common.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.common.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
index 7b024545d7..4820e29780 100644
--- a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Common Validation Tests
 Bundle-SymbolicName: org.eclipse.emfforms.common.validation.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.common.validation.tests;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.common.validation.tests;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
diff --git a/tests/org.eclipse.emfforms.common.validation.tests/pom.xml b/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
index 42d8b62fe6..541dd86a53 100644
--- a/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.common.validation.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
index 0c6fdbcd57..1a6dd9c2b4 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bazaar Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.bazaar.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.bazaar.internal;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.bazaar.internal;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
@@ -12,5 +12,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.bazaar.tests
 Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
  org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml b/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
index b94b4baf3b..571521983b 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.bazaar.tests</artifactId>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch
index 3cc1a39080..a1d816c265 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch
@@ -1,43 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/core/services/databinding/featurepath/tests/AllIntegrationTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emfforms.core.services.databinding.featurepath.tests.AllIntegrationTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emfforms.core.services.databinding.featurepath.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.emf.cdo.server.product.tcp_h2"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.xml@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-all@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath.tests@default:false,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.databinding@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/core/services/databinding/featurepath/tests/AllIntegrationTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emfforms.core.services.databinding.featurepath.tests.AllIntegrationTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emfforms.core.services.databinding.featurepath.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.emf.cdo.server.product.tcp_h2"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.inject@default:default,org.apache.felix.scr@1:true,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.featurepath.tests@default:false,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
index 7d51c14e81..3475fa108a 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Databinding Services Featurepath Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
 Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.featurepath.tests
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
index ca46adedb4..6813efd561 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.featurepath.tests</artifactId>
@@ -42,6 +42,6 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java
index c824223d87..68c1fe4735 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2018 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
  *
  * Contributors:
  * Lucas Koehler - initial API and implementation
+ * Christian W. Damus - bug 553224
  ******************************************************************************/
 package org.eclipse.emfforms.internal.core.services.databinding.featurepath;
 
@@ -18,6 +19,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import java.util.LinkedList;
+import java.util.regex.Pattern;
 
 import org.eclipse.core.databinding.property.list.IListProperty;
 import org.eclipse.core.databinding.property.value.IValueProperty;
@@ -27,6 +29,7 @@ import org.eclipse.emf.databinding.IEMFListProperty;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EStructuralFeature.Setting;
@@ -35,8 +38,13 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -50,9 +58,13 @@ import org.eclipse.emfforms.core.services.databinding.testmodel.test.model.TestF
 import org.eclipse.emfforms.core.services.databinding.testmodel.test.model.TestPackage;
 import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
 import org.eclipse.emfforms.spi.core.services.databinding.DomainModelReferenceConverter;
+import org.hamcrest.CustomTypeSafeMatcher;
+import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 /**
  * JUnit test for {@link FeaturePathDomainModelReferenceConverter}.
@@ -65,6 +77,9 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	private FeaturePathDomainModelReferenceConverter converter;
 	private static EObject validEObject;
 
+	@Rule
+	public final ExpectedException thrown = ExpectedException.none();
+
 	@BeforeClass
 	public static void setupClass() {
 		validEObject = createValidEObject();
@@ -81,11 +96,12 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 
 	private static Resource createVirtualResource() {
 		final ResourceSet rs = new ResourceSetImpl();
+		rs.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); //$NON-NLS-1$
 		final AdapterFactoryEditingDomain domain = new AdapterFactoryEditingDomain(
 			new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
 			new BasicCommandStack(), rs);
 		rs.eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
-		final Resource resource = rs.createResource(URI.createURI("VIRTAUAL_URI")); //$NON-NLS-1$
+		final Resource resource = rs.createResource(URI.createURI("VIRTUAL_URI.xmi")); //$NON-NLS-1$
 		return resource;
 	}
 
@@ -102,6 +118,28 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 		return AdapterFactoryEditingDomain.getEditingDomainFor(object);
 	}
 
+	private static VFeaturePathDomainModelReference createValidDMR() {
+		final Resource resource = createVirtualResource();
+		final VView view = VViewFactory.eINSTANCE.createView();
+		final VControl control = VViewFactory.eINSTANCE.createControl();
+		view.getChildren().add(control);
+		resource.getContents().add(view);
+		final VFeaturePathDomainModelReference result = VViewFactory.eINSTANCE.createFeaturePathDomainModelReference();
+		control.setDomainModelReference(result);
+		((XMLResource) resource).setID(result, "theDMR"); //$NON-NLS-1$
+		return result;
+	}
+
+	static Matcher<String> find(String regex) {
+		return new CustomTypeSafeMatcher<String>("matches '" + regex + "'") { //$NON-NLS-1$//$NON-NLS-2$
+			@Override
+			protected boolean matchesSafely(String item) {
+				final java.util.regex.Matcher m = Pattern.compile(regex).matcher(item);
+				return m.find();
+			}
+		};
+	}
+
 	/**
 	 * Set up that is executed before every test.
 	 */
@@ -133,8 +171,11 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	 * {@link org.eclipse.emfforms.core.services.databinding.featurepath.FeaturePathDomainModelReferenceConverter#isApplicable(org.eclipse.emf.ecp.view.spi.model.VDomainModelReference)}
 	 * .
 	 */
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testIsApplicableNull() {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
 		converter.isApplicable(null);
 	}
 
@@ -212,8 +253,12 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	 *
 	 * @throws DatabindingFailedException if the databinding failed
 	 */
-	@Test(expected = DatabindingFailedException.class)
+	@Test
 	public void testConvertToValuePropertyNoFeature() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("field domainModelEFeature"); //$NON-NLS-1$
+		thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
 		final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
 			.createFeaturePathDomainModelReference();
 		converter.convertToValueProperty(pathReference, validEObject);
@@ -226,8 +271,11 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	 *
 	 * @throws DatabindingFailedException if the databinding failed
 	 */
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testConvertToValuePropertyNull() throws DatabindingFailedException {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
 		converter.convertToValueProperty(null, validEObject);
 	}
 
@@ -238,9 +286,55 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	 *
 	 * @throws DatabindingFailedException if the databinding failed
 	 */
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testConvertToValuePropertyWrongReferenceType() throws DatabindingFailedException {
-		converter.convertToValueProperty(mock(VDomainModelReference.class), validEObject);
+		final VDomainModelReference dmr = mock(VDomainModelReference.class);
+
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("DomainModelReference " + dmr.toString()); //$NON-NLS-1$
+		thrown.expectMessage("is not an instance of VFeaturePathDomainModelReference"); //$NON-NLS-1$
+
+		converter.convertToValueProperty(dmr, validEObject);
+	}
+
+	@Test
+	public void testConvertToValuePropertyListReferenceFirstInPath() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("not a single reference: A.bList (test)"); //$NON-NLS-1$
+		thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+
+		final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+			.createFeaturePathDomainModelReference();
+		// create reference path to the attribute
+		final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+		referencePath.add(TestPackage.Literals.A__BLIST);
+		referencePath.add(TestPackage.Literals.B__C);
+		referencePath.add(TestPackage.Literals.C__D);
+
+		pathReference.getDomainModelEReferencePath().addAll(referencePath);
+		pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+		converter.convertToValueProperty(pathReference, validEObject);
+	}
+
+	@Test
+	public void testConvertToValuePropertyListReferenceInPath() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("not a single reference: B.cList (test)"); //$NON-NLS-1$
+		thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+
+		final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+			.createFeaturePathDomainModelReference();
+		// create reference path to the attribute
+		final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+		referencePath.add(TestPackage.Literals.A__B);
+		referencePath.add(TestPackage.Literals.B__CLIST);
+		referencePath.add(TestPackage.Literals.C__D);
+
+		pathReference.getDomainModelEReferencePath().addAll(referencePath);
+		pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+		converter.convertToValueProperty(pathReference, validEObject);
 	}
 
 	@Test
@@ -344,8 +438,12 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	 *
 	 * @throws DatabindingFailedException if the databinding failed
 	 */
-	@Test(expected = DatabindingFailedException.class)
+	@Test
 	public void testConvertToListPropertyNoFeature() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("field domainModelEFeature"); //$NON-NLS-1$
+		thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
 		final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
 			.createFeaturePathDomainModelReference();
 		converter.convertToListProperty(pathReference, validEObject);
@@ -388,8 +486,11 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	 *
 	 * @throws DatabindingFailedException if the databinding failed
 	 */
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testConvertToListPropertyNull() throws DatabindingFailedException {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
 		converter.convertToListProperty(null, validEObject);
 	}
 
@@ -400,8 +501,11 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 	 *
 	 * @throws DatabindingFailedException if the databinding failed
 	 */
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testConvertToListPropertyWrongReferenceType() throws DatabindingFailedException {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("not an instance of VFeaturePathDomainModelReference"); //$NON-NLS-1$
+
 		converter.convertToListProperty(mock(VDomainModelReference.class), validEObject);
 	}
 
@@ -456,30 +560,203 @@ public class FeaturePathDomainModelReferenceConverter_Test {
 		assertEquals(expected, setting.get(true));
 	}
 
-	@Test(expected = DatabindingFailedException.class)
+	@Test
 	public void testGetSettingNoFeature() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("field domainModelEFeature"); //$NON-NLS-1$
+		thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
 		final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
 			.createFeaturePathDomainModelReference();
 		converter.getSetting(pathReference, validEObject);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testGetSettingNull() throws DatabindingFailedException {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
 		converter.getSetting(null, validEObject);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testGetSettingWrongReferenceType() throws DatabindingFailedException {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("not an instance of VFeaturePathDomainModelReference"); //$NON-NLS-1$
+
 		converter.getSetting(mock(VDomainModelReference.class), validEObject);
 	}
 
-	@Test(expected = DatabindingFailedException.class)
+	@Test
 	public void testGetSettingInvalidFeatureInPath() throws DatabindingFailedException {
-		final VFeaturePathDomainModelReference reference = VViewFactory.eINSTANCE
-			.createFeaturePathDomainModelReference();
-		reference.getDomainModelEReferencePath().add(TestPackage.eINSTANCE.getDExtended_A());
-		reference.setDomainModelEFeature(TestPackage.eINSTANCE.getA_B());
-		final D d = TestFactory.eINSTANCE.createD();
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("EClass D (test) has no such feature DExtended.a (test)"); //$NON-NLS-1$
+		thrown.expectMessage(find(
+			"The DMR is VFeaturePathDomainModelReferenceImpl@\\p{XDigit}+ \\(changeListener: null\\)<VIRTUAL_URI\\.xmi#theDMR>")); //$NON-NLS-1$
+		thrown.expectMessage(
+			find("resolved EObject is DImpl@\\p{XDigit}+ \\(x: null, yList: null\\)<VIRTUAL_URI\\.xmi#/>")); //$NON-NLS-1$
+
+		final D d = (D) createValidEObject(TestPackage.Literals.D);
+		final VFeaturePathDomainModelReference reference = createValidDMR();
+		reference.getDomainModelEReferencePath().add(TestPackage.Literals.DEXTENDED__A);
+		reference.setDomainModelEFeature(TestPackage.Literals.A__B);
 		converter.getSetting(reference, d);
 	}
+
+	@Test
+	public void testGetSettingUnresolvedFeature() throws DatabindingFailedException {
+		final EPackage pkg = EcoreFactory.eINSTANCE.createEPackage();
+		pkg.setName("gone"); //$NON-NLS-1$
+		pkg.setNsPrefix("gone"); //$NON-NLS-1$
+		pkg.setNsURI("http://www.eclipse.org/ecp/test/gone"); //$NON-NLS-1$
+		final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+		eClass.setName("Gone"); //$NON-NLS-1$
+		final EReference ref = EcoreFactory.eINSTANCE.createEReference();
+		ref.setName("ref"); //$NON-NLS-1$
+		ref.setEType(eClass);
+		eClass.getEStructuralFeatures().add(ref);
+		pkg.getEClassifiers().add(eClass);
+		final Resource resource = new EcoreResourceFactoryImpl().createResource(URI.createURI(pkg.getNsURI()));
+		resource.getContents().add(pkg);
+
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("domainModelEFeature Gone.ref (http://www.eclipse.org/ecp/test/gone)"); //$NON-NLS-1$
+		thrown.expectMessage(find(
+			"DMR VFeaturePathDomainModelReferenceImpl@\\p{XDigit}+ \\(changeListener: null\\)<VIRTUAL_URI\\.xmi#theDMR>")); //$NON-NLS-1$
+		thrown.expectMessage("is a proxy"); //$NON-NLS-1$
+
+		final D d = (D) createValidEObject(TestPackage.Literals.D);
+		final VFeaturePathDomainModelReference reference = createValidDMR();
+		reference.getDomainModelEReferencePath().add(TestPackage.Literals.DEXTENDED__A);
+		reference.setDomainModelEFeature(ref);
+
+		// Unload the package to proxify everything
+		resource.unload();
+
+		converter.getSetting(reference, d);
+	}
+
+	@Test
+	public void testGetSettingUnresolvedReferenceInPath() throws DatabindingFailedException {
+		final EPackage pkg = EcoreFactory.eINSTANCE.createEPackage();
+		pkg.setName("gone"); //$NON-NLS-1$
+		pkg.setNsPrefix("gone"); //$NON-NLS-1$
+		pkg.setNsURI("http://www.eclipse.org/ecp/test/gone"); //$NON-NLS-1$
+		final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+		eClass.setName("Gone"); //$NON-NLS-1$
+		final EReference ref = EcoreFactory.eINSTANCE.createEReference();
+		ref.setName("ref"); //$NON-NLS-1$
+		ref.setEType(eClass);
+		eClass.getEStructuralFeatures().add(ref);
+		pkg.getEClassifiers().add(eClass);
+		final Resource resource = new EcoreResourceFactoryImpl().createResource(URI.createURI(pkg.getNsURI()));
+		resource.getContents().add(pkg);
+
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("path reference Gone.ref (http://www.eclipse.org/ecp/test/gone)"); //$NON-NLS-1$
+		thrown.expectMessage(find(
+			"DMR VFeaturePathDomainModelReferenceImpl@\\p{XDigit}+ \\(changeListener: null\\)<VIRTUAL_URI\\.xmi#theDMR>")); //$NON-NLS-1$
+		thrown.expectMessage("is a proxy"); //$NON-NLS-1$
+
+		final D d = (D) createValidEObject(TestPackage.Literals.D);
+		final VFeaturePathDomainModelReference reference = createValidDMR();
+		reference.getDomainModelEReferencePath().add(ref);
+		reference.setDomainModelEFeature(TestPackage.Literals.A__B);
+
+		// Unload the package to proxify everything
+		resource.unload();
+
+		converter.getSetting(reference, d);
+	}
+
+	@Test
+	public void testGetSettingListReferenceInPath() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("not a single reference: B.cList (test)"); //$NON-NLS-1$
+		thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+		thrown.expectMessage(
+			find("resolved EObject is BImpl@\\p{XDigit}+<VIRTUAL_URI\\.xmi#//@b>")); //$NON-NLS-1$
+
+		final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+			.createFeaturePathDomainModelReference();
+		// create reference path to the attribute
+		final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+		referencePath.add(TestPackage.Literals.A__B);
+		referencePath.add(TestPackage.Literals.B__CLIST);
+		referencePath.add(TestPackage.Literals.C__D);
+
+		pathReference.getDomainModelEReferencePath().addAll(referencePath);
+		pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+		final A a = (A) createValidEObject(TestPackage.Literals.A);
+		final B b = TestFactory.eINSTANCE.createB();
+		a.setB(b);
+		converter.getSetting(pathReference, a);
+	}
+
+	@Test
+	public void testGetSettingMissingObjectInPath() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+		thrown.expectMessage(
+			find("resolved EObject is BImpl@\\p{XDigit}+<VIRTUAL_URI\\.xmi#//@b>")); //$NON-NLS-1$
+		thrown.expectMessage("Reference being resolved is B.c (test)"); //$NON-NLS-1$
+
+		final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+			.createFeaturePathDomainModelReference();
+		// create reference path to the attribute
+		final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+		referencePath.add(TestPackage.Literals.A__B);
+		referencePath.add(TestPackage.Literals.B__C);
+		referencePath.add(TestPackage.Literals.C__D);
+
+		pathReference.getDomainModelEReferencePath().addAll(referencePath);
+		pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+		final A a = (A) createValidEObject(TestPackage.Literals.A);
+		final B b = TestFactory.eINSTANCE.createB();
+		a.setB(b);
+		converter.getSetting(pathReference, a);
+	}
+
+	@Test
+	public void testGetSettingFeatureHasNoType() throws DatabindingFailedException {
+		final EPackage pkg = EcoreFactory.eINSTANCE.createEPackage();
+		pkg.setName("untyped"); //$NON-NLS-1$
+		pkg.setNsPrefix("ut"); //$NON-NLS-1$
+		pkg.setNsURI("http://www.eclipse.org/ecp/test/untyped"); //$NON-NLS-1$
+		final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+		eClass.setName("Untyped"); //$NON-NLS-1$
+		final EReference ref = EcoreFactory.eINSTANCE.createEReference();
+		ref.setName("untyped"); //$NON-NLS-1$
+		// Don't set a type (that's the point)
+		eClass.getEStructuralFeatures().add(ref);
+		pkg.getEClassifiers().add(eClass);
+		final Resource resource = new EcoreResourceFactoryImpl().createResource(URI.createURI(pkg.getNsURI()));
+		resource.getContents().add(pkg);
+
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage("in DMR VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+		thrown.expectMessage("eType of the feature Untyped.untyped (http://www.eclipse.org/ecp/test/untyped) is null"); //$NON-NLS-1$
+
+		final VFeaturePathDomainModelReference dmr = createValidDMR();
+		dmr.setDomainModelEFeature(ref);
+
+		final EObject untyped = createValidEObject(eClass);
+		converter.getSetting(dmr, untyped);
+	}
+
+	@Test
+	public void testGetSettingObjectDoesNotHaveFeature() throws DatabindingFailedException {
+		thrown.expect(DatabindingFailedException.class);
+		thrown.expectMessage(find("resolved EObject BImpl@\\p{XDigit}+<VIRTUAL_URI.xmi#/>")); //$NON-NLS-1$
+		thrown.expectMessage("doesn't have the feature C.d (test)"); //$NON-NLS-1$
+
+		final VFeaturePathDomainModelReference dmr = createValidDMR();
+		dmr.setDomainModelEFeature(TestPackage.Literals.C__D);
+
+		final EObject b = createValidEObject(TestPackage.Literals.B);
+		converter.getSetting(dmr, b);
+	}
+
 }
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
index 8784ae332f..1160885c79 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.index;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.index;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.index.tests
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
index 2d3cb92883..07fe1c96bd 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.index.tests</artifactId>
@@ -27,5 +27,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emfforms</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
index 8512a97a8b..3846ee6e41 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Databinding Services Integration Test
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.integrationtest
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.integrationtest
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
index 9e1d85a156..dc4b66f51c 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.integrationtest</artifactId>
@@ -52,5 +52,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
index 6522ace64b..a88e5b57c9 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
index 73e98b16e6..6c5ff69e95 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.keyattribute.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
index 3ceb70a3ab..9f83ea446d 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.mapping.tests
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
index 4b77e7992d..4f6debdd80 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.mapping.tests</artifactId>
@@ -27,5 +27,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emfforms</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
index fedab3b3a6..bc300992b1 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.testmodel;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.22.0",
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.23.0",
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.23.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
index ef77f3b344..01cdc9163b 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.testmodel</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
index f81881b89c..78896c98eb 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms DataTemplate Service Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.datatemplate.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.datatemplate;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emfforms.core.services.datatemplate;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.datatemplate.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit.util;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.datatemplate;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.datatemplate.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.datatemplate;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
@@ -19,7 +19,7 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
index 7b35de55fc..11c66c2033 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.datatemplate.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
index 4ea4ef9842..50ad4c5f44 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Domain Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.default.tests
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
index dc49ca3156..b7df789c7d 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.default.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
index 2e0c05a728..f0de1fc7d4 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
index 7921f3ad0f..264c5fab96 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.index.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
index 1a4b75edda..94c838e781 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
index 6b35244d71..27cc67ba53 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
index 437266a1f5..72fe370c03 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
index 89518a71e6..6974198d5e 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.mapping.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
index 6a6769e257..2b4d21767a 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Service EMF Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
index 0cf2b85f46..4c7a13a2d9 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.emf.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
index 7b4da9d3eb..8dcf67e62f 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Legacy Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.legacy;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.legacy;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.legacy.tests
-Import-Package: org.eclipse.emfforms.common;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
index ff878e3db8..7886c41063 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.legacy.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
index 9707c60f42..521ff56852 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Mapping Provider Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.panel.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
index 9e33d57283..0f1c1d87a3 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.mappingprovider.table.panel.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
index 771749edba..549b935bee 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Mapping Provider Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
index f8b3dd5b94..d449ff2045 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.mappingprovider.table.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
index 485292cce4..75fee098c4 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Core Services for Featurepath Segments Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.featurepath.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.featurepath.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.featurepath.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
index fe3fc7b472..33c484bccd 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.featurepath.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
index 7ffade9cd6..04dfd2d1e4 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Core Services for Index Segments Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.index.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.index.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.index;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.index.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.index;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
index 55477b496a..04d1e94dc3 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.index.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
index 74a4c846d9..f00cf51902 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Mapping Segment Services Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.mapping.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.mapping.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.mapping.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.mapping.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
index 902c8fba42..1327a860b4 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.mapping.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
index b306683014..175721279c 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Multi Segment Services Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.multi.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.multi.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.multi;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.multi.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.multi;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.multi.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
index 42661fd4fe..577149b3ef 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.multi.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
index 03d4273b88..352ba505a7 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Services for DMR Segments Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
index abeb83474a..62085e9823 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.segments.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
index ac179fcaf5..b13c645b39 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Key Attribute Structural Change Tester Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.common;bundle-version="[2.11.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
index 223ea61755..cc8e31133e 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
index 016cf5a238..fc8d64893c 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange;version="1.23.0";x-internal:=true
 Require-Bundle: org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.test
 Import-Package: org.osgi.framework;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
index baccbf735f..3cb344b058 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.structuralchange.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
index 6509a71ddd..b730109718 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.view;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.reveal;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.tests;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.view;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.reveal;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.tests;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.tests
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
index 499f1d7295..073f9bb329 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.classpath b/tests/org.eclipse.emfforms.datatemplate.model.tests/.classpath
new file mode 100644
index 0000000000..3e5654f17e
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.classpath
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.project b/tests/org.eclipse.emfforms.datatemplate.model.tests/.project
new file mode 100644
index 0000000000..1fb72b61a6
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emfforms.datatemplate.model.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..557976e20e
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,419 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..6ed49370b8
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * https\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier\: EPL-2.0\n * \n * Contributors\:\n * ${user} - initial API and implementation\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * {@inheritDoc}\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\n\t\t\t// Log AND handle Exceptions if possible \n            //\n            // You can just uncomment one of the lines below to log an exception\:\n\t\t\t// logException will show the logged excpetion to the user\n\t\t\t// ModelUtil.logException(${exception_var});\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\n\t\t\t// logWarning will only add the message to the error log\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\n\t\t\t//\t\t\t\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..864e30fe5d
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..cfb400b0e3
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Ignore
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Warning
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+changed_execution_env=Error
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Ignore
+incompatible_api_component_version_report_minor_without_api_change=Ignore
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..611427ed8c
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMFForms DataTemplate Model Tests
+Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.model.tests
+Bundle-Version: 1.23.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: Eclipse Modeling Project
+Fragment-Host: org.eclipse.emfforms.datatemplate.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.datatemplate.tests;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
+ org.junit;bundle-version="[4.11.0,5.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.emfforms.datatemplate.model.tests
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/build.properties b/tests/org.eclipse.emfforms.datatemplate.model.tests/build.properties
new file mode 100644
index 0000000000..366941c0d6
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/build.properties
@@ -0,0 +1,17 @@
+# Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# 
+# SPDX-License-Identifier: EPL-2.0
+# 
+# Contributors:
+# EclipseSource Muenchen GmbH - initial API and implementation
+
+bin.includes = .,\
+               META-INF/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml b/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml
new file mode 100644
index 0000000000..8bdef29f31
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.emf.ecp</groupId>
+    <artifactId>ecp-tests-parent</artifactId>
+    <version>1.23.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.emf.ecp</groupId>
+  <artifactId>org.eclipse.emfforms.datatemplate.model.tests</artifactId>
+  <version>1.23.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${mav-surefire-version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>test</phase>
+            <configuration>
+              <skipTests>false</skipTests>
+              <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+              <includes>
+                <include>**/DataTemplateAllTests.java</include>
+              </includes>
+              <testFailureIgnore>true</testFailureIgnore>
+            </configuration>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <testFailureIgnore>true</testFailureIgnore>
+          <!-- We don't have tests that require Eclipse run-time -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateAllTests.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateAllTests.java
new file mode 100644
index 0000000000..daad896e3f
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateAllTests.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * <!-- begin-user-doc -->
+ * A test suite for the '<em><b>DataTemplate</b></em>' model.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DataTemplateAllTests extends TestSuite {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static void main(String[] args) {
+		TestRunner.run(suite());
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static Test suiteGen() {
+		final TestSuite suite = new DataTemplateAllTests("DataTemplate Tests"); //$NON-NLS-1$
+		return suite;
+	}
+
+	/**
+	 * @generated NOT
+	 */
+	public static Test suite() {
+		final TestSuite suite = (TestSuite) suiteGen();
+		suite.addTest(DataTemplateTests.suite());
+		return suite;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public DataTemplateAllTests(String name) {
+		super(name);
+	}
+
+} // DataTemplateAllTests
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateTests.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateTests.java
new file mode 100644
index 0000000000..a1bca6ad52
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateTests.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * <!-- begin-user-doc -->
+ * A test suite for the '<em><b>datatemplate</b></em>' package.
+ * <!-- end-user-doc -->
+ * 
+ * @generated
+ */
+public class DataTemplateTests extends TestSuite {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public static void main(String[] args) {
+		TestRunner.run(suite());
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public static Test suiteGen() {
+		final TestSuite suite = new DataTemplateTests("datatemplate Tests"); //$NON-NLS-1$
+		return suite;
+	}
+
+	/**
+	 * @generated NOT
+	 */
+	public static Test suite() {
+		final TestSuite suite = (TestSuite) suiteGen();
+		suite.addTestSuite(TemplateTest.class);
+		return suite;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public DataTemplateTests(String name) {
+		super(name);
+	}
+
+} // DataTemplateTests
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateCollectionTest.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateCollectionTest.java
new file mode 100644
index 0000000000..ee9ac53574
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateCollectionTest.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import junit.framework.TestCase;
+
+import junit.textui.TestRunner;
+
+import org.eclipse.emfforms.datatemplate.DataTemplateFactory;
+import org.eclipse.emfforms.datatemplate.TemplateCollection;
+
+/**
+ * <!-- begin-user-doc -->
+ * A test case for the model object '<em><b>Template Collection</b></em>'.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TemplateCollectionTest extends TestCase {
+
+	/**
+	 * The fixture for this Template Collection test case.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TemplateCollection fixture = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static void main(String[] args) {
+		TestRunner.run(TemplateCollectionTest.class);
+	}
+
+	/**
+	 * Constructs a new Template Collection test case with the given name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TemplateCollectionTest(String name) {
+		super(name);
+	}
+
+	/**
+	 * Sets the fixture for this Template Collection test case.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void setFixture(TemplateCollection fixture) {
+		this.fixture = fixture;
+	}
+
+	/**
+	 * Returns the fixture for this Template Collection test case.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TemplateCollection getFixture() {
+		return fixture;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see junit.framework.TestCase#setUp()
+	 * @generated
+	 */
+	@Override
+	protected void setUp() throws Exception {
+		setFixture(DataTemplateFactory.eINSTANCE.createTemplateCollection());
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see junit.framework.TestCase#tearDown()
+	 * @generated
+	 */
+	@Override
+	protected void tearDown() throws Exception {
+		setFixture(null);
+	}
+
+} //TemplateCollectionTest
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateTest.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateTest.java
new file mode 100644
index 0000000000..5e5c91f827
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateTest.java
@@ -0,0 +1,200 @@
+/**
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
+import org.eclipse.emfforms.datatemplate.DataTemplateFactory;
+import org.eclipse.emfforms.datatemplate.DataTemplatePackage;
+import org.eclipse.emfforms.datatemplate.Template;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object
+ * '<em><b>Template</b></em>'. <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@SuppressWarnings("nls")
+public class TemplateTest extends TestCase {
+
+	/**
+	 * The fixture for this Template test case. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected Template fixture = null;
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static void main(String[] args) {
+		TestRunner.run(TemplateTest.class);
+	}
+
+	/**
+	 * Constructs a new Template test case with the given name. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public TemplateTest(String name) {
+		super(name);
+	}
+
+	/**
+	 * Sets the fixture for this Template test case. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void setFixture(Template fixture) {
+		this.fixture = fixture;
+	}
+
+	/**
+	 * Returns the fixture for this Template test case. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected Template getFixture() {
+		return fixture;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @see junit.framework.TestCase#setUp()
+	 * @generated
+	 */
+	@Override
+	protected void setUp() throws Exception {
+		setFixture(DataTemplateFactory.eINSTANCE.createTemplate());
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 *
+	 * @see junit.framework.TestCase#tearDown()
+	 * @generated
+	 */
+	@Override
+	protected void tearDown() throws Exception {
+		setFixture(null);
+	}
+
+	static URL getResourceURL(Class<?> contextClass, String path) {
+		URL result = contextClass.getResource(path);
+
+		if (result == null) {
+			// We're in Eclipse
+			final String contextURL = contextClass.getResource(contextClass.getSimpleName() + ".class")
+				.toExternalForm();
+
+			try {
+				if (path.startsWith("/")) {
+					final String baseURL = contextURL.substring(0, contextURL.lastIndexOf("/bin/"));
+					result = new URL(baseURL + path);
+				} else {
+					final String baseURL = contextURL.substring(0, contextURL.lastIndexOf("/") + 1);
+					result = new URL(baseURL + path);
+				}
+			} catch (final MalformedURLException e) {
+				e.printStackTrace();
+				fail("Could not get resource '" + path + "': " + e.getMessage());
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Per bug 550814, dynamic instances of the template model must be supported.
+	 * This test fails without the fix for 550814 because the EObject class in the
+	 * dynamic implementation of Ecore has no relation to the static EObject class.
+	 *
+	 * @see <a href="http://eclip.se/550814">bug 550814</a>
+	 */
+	public void testDynamicInstance() throws IOException {
+		// Load the dynamic Ecore model
+		final ResourceSet rset = new ResourceSetImpl();
+		final URIConverter converter = new ExtensibleURIConverterImpl();
+		rset.setURIConverter(converter);
+		rset.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl());
+		final URL modelURL = getResourceURL(DataTemplatePackage.class, "/model/datatemplate.ecore");
+		URI physicalURI = URI.createURI(modelURL.toExternalForm(), true);
+		final URI modelURI = URI
+			.createPlatformPluginURI("org.eclipse.emfforms.datatemplate.model/model/datatemplate.ecore", true);
+		converter.getURIMap().put(modelURI.trimSegments(2).appendSegment(""),
+			physicalURI.trimSegments(2).appendSegment(""));
+		final Resource model = rset.getResource(modelURI, true);
+
+		// Give the dynamic model the dynamic Ecore that it expects
+		final URL ecoreURL = getResourceURL(EcorePackage.class, "/model/Ecore.ecore");
+		physicalURI = URI.createURI(ecoreURL.toExternalForm(), true);
+		final URI ecoreURI = URI.createPlatformPluginURI("org.eclipse.emf.ecore/model/Ecore.ecore", true);
+		converter.getURIMap().put(ecoreURI.trimSegments(2).appendSegment(""),
+			physicalURI.trimSegments(2).appendSegment(""));
+		rset.getResource(ecoreURI, true);
+
+		// Resolve cross-references to Ecore
+		EcoreUtil.resolveAll(model);
+
+		final EPackage package_ = (EPackage) EcoreUtil.getObjectByType(model.getContents(),
+			EcorePackage.Literals.EPACKAGE);
+		final EClass templateClass = (EClass) package_.getEClassifier("Template");
+		final EReference instance = (EReference) templateClass.getEStructuralFeature("instance");
+
+		try {
+			final EObject template = EcoreUtil.create(templateClass);
+			final EOperation operation = EcoreFactory.eINSTANCE.createEOperation();
+
+			// an EOperation is not an EObject in the Ecore model, but it is in the Java
+			// implementation
+			template.eSet(instance, operation);
+
+			assertThat("Template instance not correctly set", template.eGet(instance), is(operation));
+		} catch (final Exception e) {
+			e.printStackTrace();
+			fail("Failed to set template instance: " + e.getMessage());
+		}
+	}
+
+} // TemplateTest
diff --git a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
index dc0a94f84c..13b2ff587e 100644
--- a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataTemplate Tests
 Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.tooling.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.datatemplate.tooling;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.datatemplate.tooling;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.datatemplate.tooling.tests
diff --git a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
index 60f34ad099..2c260af8f4 100644
--- a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.datatemplate.tooling.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
index ba222d9cbb..adc526ea63 100644
--- a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
@@ -2,62 +2,62 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Ecore Editor Test
 Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)"
 Export-Package: org.eclipse.emfforms.spi.editor;version="0.0.0"
 Require-Bundle: org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.editor.ecore;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.editor.ecore;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.setup.base;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.setup.base;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.editor.ecore.test
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)";resolution:=optional,
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)";resolution:=optional,
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml b/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
index bc69fbe0e9..427a257482 100644
--- a/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
+++ b/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.editor.ecore.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
index fdb982623d..6c4e370fc9 100644
--- a/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Editor Tests
 Bundle-SymbolicName: org.eclipse.emfforms.editor.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.spi.editor;version="1.22.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.spi.editor;version="1.23.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.editor.tests
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emfforms.editor.test/pom.xml b/tests/org.eclipse.emfforms.editor.test/pom.xml
index b11aca6721..9c9bce927e 100644
--- a/tests/org.eclipse.emfforms.editor.test/pom.xml
+++ b/tests/org.eclipse.emfforms.editor.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.editor.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
index 5d674ed588..eace218d78 100644
--- a/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test plugin for EMFForms IDE Builder
 Bundle-SymbolicName: org.eclipse.emfforms.ide.builder.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.ide.builder;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.ide.builder.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.builder;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.ide.builder.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.13.0,3.0.0)",
  org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.builder.test
-Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emfforms.ide.builder.test/pom.xml b/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
index bd7f095c08..beb1645961 100644
--- a/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.builder.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
index 7cccc4637c..da01b51761 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Mapping Segment IDE Tooling Tests
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.mappingsegment.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.ide.view.mappingsegment;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.ide.view.mappingsegment;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.view.mappingsegment.test
 Import-Package: org.eclipse.swt;version="0.0.0",
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
index 4e95f8b6a1..6b6f3cbbc2 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.mappingsegment.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
index 868e897ecd..70a8646d9b 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Multi Segment IDE Tooling Tests (UI Thread)
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment.test.uithread
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.ide.view.multisegment.test.nouithread;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.ide.view.multisegment.test.nouithread;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.view.multisegment.test.nouiharness
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
index 4d72cc1a85..8a01ed661c 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.multisegment.test.uithread</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
index ecf4fae5e7..0139834bfa 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Multi Segment IDE Tooling Tests
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.ide.view.multisegment.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.ide.view.multisegment.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.view.multisegment.test
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
index 8d70d82d06..ae3db1ac6a 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.multisegment.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
index c023a4e448..d8a4405cdb 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Segments IDE Tooling TESTS
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.segments.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.ide.view.segments;bundle-version="[1.22.0,1.23.0)"
-Automatic-Module-Name: org.eclipse.emfforms.ide.view.segments.test
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Fragment-Host: org.eclipse.emfforms.ide.view.segments;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.21.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.21.0"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.emfforms.ide.view.segments.test
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
index f5e11befe7..5f8d0f8da6 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.segments.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
index 16b322c0cf..02666c356a 100644
--- a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Localization Tests
 Bundle-SymbolicName: org.eclipse.emfforms.localization.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
  org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.localization.tests/pom.xml b/tests/org.eclipse.emfforms.localization.tests/pom.xml
index 583bbc22ad..ee468fe16a 100644
--- a/tests/org.eclipse.emfforms.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.localization.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.localization.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
index f9d7a58c5b..c522720e6a 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rule Repository Tooling Test
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.rulerepository.tooling;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.rulerepository.tooling.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.rulerepository.tooling;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.rulerepository.tooling.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
index b613f6cbd3..fbaec74e0f 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emfforms.rulerepository.tooling.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<groupId>org.eclipse.emf.ecp</groupId>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
index b101202b9c..e6da0d7df2 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SDK Integration Test
 Bundle-SymbolicName: org.eclipse.emfforms.sdk.integration.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: EMFForms Cell Editor Tests
 Automatic-Module-Name: org.eclipse.emfforms.sdk.integration.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -10,4 +10,4 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.felix.scr;version="[1.3.0,2.0.0)",
  org.osgi.framework;version="[1.5.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.sdk.integration.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.sdk.integration.test;version="1.23.0";x-internal:=true
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
index 093214f8d2..f1d1aef9e2 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emfforms.sdk.integration.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<groupId>org.eclipse.emf.ecp</groupId>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
index ba4e85fb85..611c6864a4 100644
--- a/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Common Test Helper
 Bundle-SymbolicName: org.eclipse.emfforms.swt.common.test
-Bundle-Version: 1.22.0.qualifier
-Export-Package: org.eclipse.emfforms.swt.common.test;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Export-Package: org.eclipse.emfforms.swt.common.test;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.swt.common.test/pom.xml b/tests/org.eclipse.emfforms.swt.common.test/pom.xml
index b156bd4e7e..23f3750711 100644
--- a/tests/org.eclipse.emfforms.swt.common.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.common.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emfforms.swt.common.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
index bdf2dfd4c7..1469f0254c 100644
--- a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for EMFForms SWT Renderer for Multi EAttributes
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.multiattribute.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.spi.view.control.multiattribute;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.spi.view.control.multiattribute;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.hamcrest.library;bundle-version="1.3.0",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.control.multiattribute.tests
diff --git a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
index 849dd30f34..251a971df5 100644
--- a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.control.multiattribute.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
index 963e339974..37360baa22 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Text Control with Autocomplete Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.control.text.autocomplete.tests
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
index 60ba8c01a7..3e5acec139 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.control.text.autocomplete.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
index f05815a8e5..148d7b9cc0 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Control Grid SWT Renderer Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.controlgrid.test
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
index c4a8bccf11..3040515bd6 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.controlgrid.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
index 09aa3ed463..e9b4be5f62 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Core DI Extension Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)"
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
index d1a4f3a071..074d6855ba 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.di.extension.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
index 38940c1d7e..679157a22f 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core DI Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.22.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
- org.eclipse.emfforms.spi.swt.core.di;version="1.22.0"
-Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.23.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
+ org.eclipse.emfforms.spi.swt.core.di;version="1.23.0"
+Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/testControlSWTRendererServiceDI.xml
@@ -26,8 +26,8 @@ Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.e4.core.di;version="0.0.0",
  org.eclipse.e4.core.di.annotations;version="0.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.osgi.framework;version="1.8.0"
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
index f98a35ae72..38c3506667 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.di.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
index b7902daf42..af7cb0ccbf 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
@@ -2,21 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.22.0",
- org.eclipse.emfforms.swt.core.tests;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.ui;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.23.0",
+ org.eclipse.emfforms.swt.core.tests;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.core.tests
 Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.label.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.vertical.model;version="1.22.0",
- org.eclipse.emf.ecp.view.test.common.spi;version="1.22.0",
+ org.eclipse.emf.ecp.test.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.label.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.vertical.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
  org.osgi.framework;version="[1.6.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
index f987fd0714..bdf9532a7b 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
@@ -22,11 +22,38 @@
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
+					<includes>
+						<include>**/*_PTest.java</include>
+						<include>**/*_ITest.java</include>
+						<!-- Execute SWT-Related tests with tycho surefire -->
+						<include>**/SWTValidationUiServiceImpl_Test.java</include>
+					</includes>
 					<useUIHarness>false</useUIHarness>
 					<useUIThread>false</useUIThread>
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${mav-surefire-version}</version>
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>test</phase>
+						<configuration>
+							<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+							<excludes>
+								<!-- Executed with tycho surefire -->
+								<exclude>**/SWTValidationUiServiceImpl_Test.java</exclude>
+							</excludes>
+						</configuration>
+						<goals>
+							<goal>test</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<configuration>
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl_Test.java b/tests/org.eclipse.emfforms.swt.core.tests/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl_Test.java
new file mode 100644
index 0000000000..a8f087fb81
--- /dev/null
+++ b/tests/org.eclipse.emfforms.swt.core.tests/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl_Test.java
@@ -0,0 +1,344 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Lucas Koehler - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.swt.core.ui;
+
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link SWTValidationUiServiceImpl}.
+ *
+ * @author Lucas Koehler
+ *
+ */
+public class SWTValidationUiServiceImpl_Test {
+
+	private SWTValidationHelper validationHelper;
+	private SWTValidationUiServiceImpl fixture;
+	private VElement vElement;
+	private ViewModelContext viewContext;
+
+	@Before
+	public void setUp() {
+		validationHelper = mock(SWTValidationHelper.class);
+		fixture = new SWTValidationUiServiceImpl(validationHelper);
+		vElement = mock(VElement.class);
+		viewContext = mock(ViewModelContext.class);
+	}
+
+	/**
+	 * Test that getValidationIcon(VElement, ViewModelContext) correctly delegates to getValidationIcon(Diagnostic,
+	 * VElement, ViewModelContext) and that the latter correctly delegates to SWTValidationHelper.
+	 */
+	@Test
+	public void getValidationIcon() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+		final Diagnostic ok = mock(Diagnostic.class);
+		when(ok.getSeverity()).thenReturn(Diagnostic.OK);
+		final Diagnostic error = mock(Diagnostic.class);
+		when(error.getSeverity()).thenReturn(Diagnostic.ERROR);
+		vDiagnostic.getDiagnostics().add(ok);
+		vDiagnostic.getDiagnostics().add(error);
+		when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+		final Image expected = new Image(Display.getDefault(), 1, 1);
+		when(validationHelper.getValidationIcon(Diagnostic.ERROR, vElement, viewContext)).thenReturn(expected);
+
+		final Image result = spiedFixture.getValidationIcon(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationIcon(error, vElement, viewContext);
+	}
+
+	/** If the VElement doesn't have a VDiagnostic, it should be assumed that there is no validation error. */
+	@Test
+	public void getValidationIcon_nullVDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		when(vElement.getDiagnostic()).thenReturn(null);
+		final Image expected = new Image(Display.getDefault(), 1, 1);
+		when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Image result = spiedFixture.getValidationIcon(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationIcon(Diagnostic.OK_INSTANCE, vElement, viewContext);
+	}
+
+	/**
+	 * If the VElement's VDiagnostic doesn't have any Diagnostics, it should be assumed that there is no validation
+	 * error.
+	 */
+	@Test
+	public void getValidationIcon_emptyVDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+		when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+		final Image expected = new Image(Display.getDefault(), 1, 1);
+		when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Image result = spiedFixture.getValidationIcon(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationIcon(Diagnostic.OK_INSTANCE, vElement, viewContext);
+	}
+
+	/**
+	 * If the given Diagnostic is null, it should be assumed that there is no validation error.
+	 */
+	@Test
+	public void getValidationIcon_nullDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final Image expected = new Image(Display.getDefault(), 1, 1);
+		when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Image result = spiedFixture.getValidationIcon(null, vElement, viewContext);
+
+		assertSame(expected, result);
+	}
+
+	/** The service should cache icons by severity. */
+	@Test
+	public void getValidationIcon_caching() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final Image expected = new Image(Display.getDefault(), 1, 1);
+		when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+		final Diagnostic ok1 = mock(Diagnostic.class);
+		when(ok1.getSeverity()).thenReturn(Diagnostic.OK);
+		final Diagnostic ok2 = mock(Diagnostic.class);
+		when(ok2.getSeverity()).thenReturn(Diagnostic.OK);
+
+		final Image result1 = spiedFixture.getValidationIcon(ok1, vElement, viewContext);
+		final Image result2 = spiedFixture.getValidationIcon(ok2, vElement, viewContext);
+
+		assertSame(expected, result1);
+		assertSame(expected, result2);
+		// if caching is used, the validation helper only needs to be called once
+		verify(validationHelper, times(1)).getValidationIcon(Diagnostic.OK, vElement, viewContext);
+	}
+
+	/**
+	 * Test that getValidationForegroundColor(VElement, ViewModelContext) correctly delegates to
+	 * getValidationForegroundColor(Diagnostic, VElement, ViewModelContext) and that the latter correctly delegates to
+	 * SWTValidationHelper.
+	 */
+	@Test
+	public void getValidationForegroundColor() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+		final Diagnostic ok = mock(Diagnostic.class);
+		when(ok.getSeverity()).thenReturn(Diagnostic.OK);
+		final Diagnostic error = mock(Diagnostic.class);
+		when(error.getSeverity()).thenReturn(Diagnostic.ERROR);
+		vDiagnostic.getDiagnostics().add(ok);
+		vDiagnostic.getDiagnostics().add(error);
+		when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationForegroundColor(Diagnostic.ERROR, vElement, viewContext))
+			.thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationForegroundColor(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationForegroundColor(error, vElement, viewContext);
+	}
+
+	/** If the VElement doesn't have a VDiagnostic, it should be assumed that there is no validation error. */
+	@Test
+	public void getValidationForegroundColor_nullVDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		when(vElement.getDiagnostic()).thenReturn(null);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationForegroundColor(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationForegroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+	}
+
+	/**
+	 * If the VElement's VDiagnostic doesn't have any Diagnostics, it should be assumed that there is no validation
+	 * error.
+	 */
+	@Test
+	public void getValidationForegroundColor_emptyVDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+		when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationForegroundColor(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationForegroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+	}
+
+	/**
+	 * If the given Diagnostic is null, it should be assumed that there is no validation error.
+	 */
+	@Test
+	public void getValidationForegroundColor_nullDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationForegroundColor(null, vElement, viewContext);
+
+		assertSame(expected, result);
+	}
+
+	/** The service should cache icons by severity. */
+	@Test
+	public void getValidationForegroundColor_caching() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+		final Diagnostic ok1 = mock(Diagnostic.class);
+		when(ok1.getSeverity()).thenReturn(Diagnostic.OK);
+		final Diagnostic ok2 = mock(Diagnostic.class);
+		when(ok2.getSeverity()).thenReturn(Diagnostic.OK);
+
+		final Color result1 = spiedFixture.getValidationForegroundColor(ok1, vElement, viewContext);
+		final Color result2 = spiedFixture.getValidationForegroundColor(ok2, vElement, viewContext);
+
+		assertSame(expected, result1);
+		assertSame(expected, result2);
+		// if caching is used, the validation helper only needs to be called once
+		verify(validationHelper, times(1)).getValidationForegroundColor(Diagnostic.OK, vElement, viewContext);
+	}
+
+	/**
+	 * Test that getValidationBackgroundColor(VElement, ViewModelContext) correctly delegates to
+	 * getValidationBackgroundColor(Diagnostic, VElement, ViewModelContext) and that the latter correctly delegates to
+	 * SWTValidationHelper.
+	 */
+	@Test
+	public void getValidationBackgroundColor() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+		final Diagnostic ok = mock(Diagnostic.class);
+		when(ok.getSeverity()).thenReturn(Diagnostic.OK);
+		final Diagnostic error = mock(Diagnostic.class);
+		when(error.getSeverity()).thenReturn(Diagnostic.ERROR);
+		vDiagnostic.getDiagnostics().add(ok);
+		vDiagnostic.getDiagnostics().add(error);
+		when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationBackgroundColor(Diagnostic.ERROR, vElement, viewContext))
+			.thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationBackgroundColor(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationBackgroundColor(error, vElement, viewContext);
+	}
+
+	/** If the VElement doesn't have a VDiagnostic, it should be assumed that there is no validation error. */
+	@Test
+	public void getValidationBackgroundColor_nullVDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		when(vElement.getDiagnostic()).thenReturn(null);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationBackgroundColor(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationBackgroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+	}
+
+	/**
+	 * If the VElement's VDiagnostic doesn't have any Diagnostics, it should be assumed that there is no validation
+	 * error.
+	 */
+	@Test
+	public void getValidationBackgroundColor_emptyVDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+		when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationBackgroundColor(vElement, viewContext);
+
+		assertSame(expected, result);
+		verify(spiedFixture).getValidationBackgroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+	}
+
+	/**
+	 * If the given Diagnostic is null, it should be assumed that there is no validation error.
+	 */
+	@Test
+	public void getValidationBackgroundColor_nullDiagnostic() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+		final Color result = spiedFixture.getValidationBackgroundColor(null, vElement, viewContext);
+
+		assertSame(expected, result);
+	}
+
+	/** The service should cache icons by severity. */
+	@Test
+	public void getValidationBackgroundColor_caching() {
+		// Spy to be able to verify method calls
+		final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+		final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+		when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+		final Diagnostic ok1 = mock(Diagnostic.class);
+		when(ok1.getSeverity()).thenReturn(Diagnostic.OK);
+		final Diagnostic ok2 = mock(Diagnostic.class);
+		when(ok2.getSeverity()).thenReturn(Diagnostic.OK);
+
+		final Color result1 = spiedFixture.getValidationBackgroundColor(ok1, vElement, viewContext);
+		final Color result2 = spiedFixture.getValidationBackgroundColor(ok2, vElement, viewContext);
+
+		assertSame(expected, result1);
+		assertSame(expected, result2);
+		// if caching is used, the validation helper only needs to be called once
+		verify(validationHelper, times(1)).getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext);
+	}
+}
diff --git a/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
index cc483ae563..0c337aabf0 100644
--- a/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Reference Selection Composite Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.reference.table.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.reference.table;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.22.0",
- org.eclipse.emfforms.swt.reference.table.test;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.swt.reference.table;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.23.0",
+ org.eclipse.emfforms.swt.reference.table.test;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.swt;bundle-version="[3.107.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.reference.table.test
-Import-Package: org.eclipse.emf.ecp.spi.common.ui;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.spi.common.ui;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml b/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
index 30cdac7786..6f3b820632 100644
--- a/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.reference.table.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
index 83a1728334..a6e65181c0 100644
--- a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.table.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.table;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.table.action;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.22.0",
- org.eclipse.emfforms.spi.swt.table.action;version="1.22.0",
- org.eclipse.emfforms.swt.table.test;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.table.action;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.table.action;version="1.23.0",
+ org.eclipse.emfforms.swt.table.test;version="1.23.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.table.test
diff --git a/tests/org.eclipse.emfforms.swt.table.test/pom.xml b/tests/org.eclipse.emfforms.swt.table.test/pom.xml
index d416ec2e1d..e518abe47f 100644
--- a/tests/org.eclipse.emfforms.swt.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.table.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.table.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
index 1a47eb013b..dbb51eaa29 100644
--- a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TreeMasterDetail Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.swt.treemasterdetail.test;version="1.22.0"
+Export-Package: org.eclipse.emfforms.swt.treemasterdetail.test;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.treemasterdetail.test
 Import-Package: org.osgi.framework;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
index 7ebb6722e9..d5f104c6d0 100644
--- a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.treemasterdetail.test</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/src/org/eclipse/emfforms/swt/treemasterdetail/test/DiagnosticCache_Test.java b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/src/org/eclipse/emfforms/swt/treemasterdetail/test/DiagnosticCache_Test.java
new file mode 100644
index 0000000000..707e58e96e
--- /dev/null
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/src/org/eclipse/emfforms/swt/treemasterdetail/test/DiagnosticCache_Test.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * eugen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.swt.treemasterdetail.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * DiagnosticCache Test.
+ *
+ * @author Eugen Neufeld
+ *
+ */
+public class DiagnosticCache_Test {
+
+	@Before
+	public void setUp() throws Exception {
+
+	}
+
+	@Test
+	public void testNull() {
+		final EObject object = null;
+		final DiagnosticCache cache = new DiagnosticCache(object);
+		assertEquals(0, cache.getObjects().size());
+	}
+
+	@Test
+	public void testExternalReferences() {
+		final EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage();
+
+		final DiagnosticCache cache = new DiagnosticCache(ePackage);
+		assertEquals(2, cache.getObjects().size());
+		assertTrue(cache.getObjects().contains(ePackage));
+		assertTrue(cache.getObjects().contains(ePackage.getEFactoryInstance()));
+	}
+
+	@Test
+	public void testNoExternalReferences() {
+		final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+
+		final DiagnosticCache cache = new DiagnosticCache(eClass);
+		assertEquals(1, cache.getObjects().size());
+		assertTrue(cache.getObjects().contains(eClass));
+	}
+}
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
index a691485a76..fb1f739c80 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Model Localization Tests
 Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)"
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.view.model.localization.tests;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.view.model.localization.tests;version="1.23.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.view.model.localization.tests
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
index 7b3b483454..38daf233d2 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.22.0-SNAPSHOT</version>
+		<version>1.23.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.view.model.localization.tests</artifactId>
-	<version>1.22.0-SNAPSHOT</version>
+	<version>1.23.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
index dba3a894b7..6cfd1d4328 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Vendor: Eclipse Modeling Project
 Fragment-Host: org.eclipse.emfforms.spreadsheet.core.renderer.table;bundle-version="[1.0.0,1.1.0)"
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.table;version="1.0.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer.table.tests
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
index 1a94260e9c..349f0b8cd8 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Export-Package: org.eclipse.emfforms.internal.spreadsheet.core;version="1.0.0";x
  org.eclipse.emfforms.spreadsheet.core.tests;version="1.0.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
index f85a3a5559..0598aaa630 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
@@ -8,13 +8,13 @@ Export-Package: org.eclipse.emfforms.spreadsheet.integrationtest;version="1.0.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)",