diff --git a/pom.xml b/pom.xml
index 7d886ba..a3f0de6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,9 @@
 		<eclipse.targetrelease>oxygen</eclipse.targetrelease>
 		<target.version>${project.version}</target.version>
 		<sonar.exclusions>**/src-gen/**</sonar.exclusions>
+		
+		<!-- Override Components properties -->
+		<rcptt-runner-version>2.2.0</rcptt-runner-version>
 	</properties>
 
 	<mailingLists>
diff --git a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
index 37be2be..c029492 100644
--- a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
@@ -38,7 +38,6 @@
    <launcher name="papyrusSysML">
       <linux icon="../org.eclipse.papyrus.sysml14.rcp/icons/icon.xpm"/>
       <macosx icon="../org.eclipse.papyrus.sysml14.rcp/icons/papyrus.icns"/>
-      <solaris/>
       <win useIco="true">
          <ico path="../org.eclipse.papyrus.sysml14.rcp/icons/papyrus.ico"/>
          <bmp/>
@@ -198,9 +197,9 @@
       <feature id="org.eclipse.equinox.p2.extras.feature"/>
       <feature id="org.eclipse.ecf.core.feature"/>
       <feature id="org.eclipse.e4.rcp"/>
-      <feature id="org.eclipse.papyrus.sdk.feature" installMode="root"/>
       <feature id="org.eclipse.papyrus.sysml14.feature"/>
       <feature id="org.eclipse.papyrus.sysml14.rcp.feature"/>
+      <feature id="org.eclipse.papyrus.sdk.feature" />
    </features>
 
    <configurations>
diff --git a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/contexts/workspaces/SampleBddContext.ctx b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/contexts/workspaces/SampleBddContext.ctx
index 36c801e..8075e17 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/contexts/workspaces/SampleBddContext.ctx
+++ b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/contexts/workspaces/SampleBddContext.ctx
@@ -5,73 +5,74 @@
 Element-Type: context
 Element-Version: 2.0
 Id: _NgU18FuEEeW-3_YCbqET-w
-Runtime-Version: 2.0.0.201506120617
-Save-Time: 9/22/16 11:29 AM
+Runtime-Version: 2.2.0.201706062317
+Save-Time: 7/10/17 11:10 AM
 
 ------=_contents/BDDProject/.project-8ee1237c-8ffb-3ee3-8228-1959cb5516e0
 Content-Type: q7/binary
 Entry-Name: contents/BDDProject/.project
 
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSzsa/IzVEoSy0qzszPs1Uy1DNQUkjN
-S85PycxLt1UKDXHTtVCyt+OyKSjKz0pNLnFJLU4uyiwoASq24+K0yUvMTbVzcnEJgMja6IMFgBLJ+bm5
-qXkldjb6MBZQEGpGMYitj8xJKs3MSQkuSE0Gy6Dw8hJLSotSIVrgbLhuFOcAAFBLBwgilXCPgAAAAMsA
-AABQSwECFAAUAAgICAAAACEAIpVwj4AAAADLAAAACAAAAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQSwUG
-AAAAAAEAAQA2AAAAtgAAAAAA
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACzsa/IzVEoSy0qzszP
+s1Uy1DNQUkjNS85PycxLt1UKDXHTtVCyt+OyKSjKz0pNLnFJLU4uyiwoASq24+K0yUvMTbVzcnEJgMja
+6IMFgBLJ+bm5qXkldjb6MBZQEGpGMYitj8xJKs3MSQkuSE0Gy6Dw8hJLSotSIVrgbLhuFOcAAFBLBwgi
+lXCPgAAAAMsAAABQSwECFAAUAAgICAAAACEAIpVwj4AAAADLAAAACAAJAAAAAAAAAAAAAAAAAAAALmNv
+bnRlbnRVVAUAAQAAAABQSwUGAAAAAAEAAQA/AAAAvwAAAAAA
 ------=_contents/BDDProject/.project-8ee1237c-8ffb-3ee3-8228-1959cb5516e0--
 ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
 Content-Type: q7/binary
 Entry-Name: .q7.content
 
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSVkc1OwzAQhO9IvIO199i0XKoooVLb
-IHEoQgJUOFWp7QYX/5FsSB4fp03CBSni5l1/M7tjJ8vWaPIty0o5m8KM3gCRljuhbJFCjcdoAcu766vE
-lQWVXCtfSVpyj0g5trRx5Wflcy7j3XBaO4uyRdIaFY++8843TLJVHPopfCD6mLGmaagzBQ3m7G37MCAT
-s0b5wHTyM8cCx0YOiM1NoJ9z47VcCdGvBkSJFPaPxetscV9nmdxFt/v39eEre4kaCGEJSXiHWjwXofSl
-O0mOVe+42myeLh3oicAclZYDQHsBsL/vD0JsnZCaCjWJWIc5hlecBGujRyZhw8qXPOw3UML++5dB9ANQ
-SwcIT1juTwUBAAAoAgAAUEsBAhQAFAAICAgAAAAhAE9Y7k8FAQAAKAIAAAgAAAAAAAAAAAAAAAAAAAAA
-AC5jb250ZW50UEsFBgAAAAABAAEANgAAADsBAAAAAA==
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkc1OwzAQhO9IvIO1
+99i0XKoooVLbIHEoQgJUOFWp7QYX/5FsSB4fp03CBSni5l1/M7tjJ8vWaPIty0o5m8KM3gCRljuhbJFC
+jcdoAcu766vElQWVXCtfSVpyj0g5trRx5Wflcy7j3XBaO4uyRdIaFY++8843TLJVHPopfCD6mLGmaagz
+BQ3m7G37MCATs0b5wHTyM8cCx0YOiM1NoJ9z47VcCdGvBkSJFPaPxetscV9nmdxFt/v39eEre4kaCGEJ
+SXiHWjwXofSlO0mOVe+42myeLh3oicAclZYDQHsBsL/vD0JsnZCaCjWJWIc5hlecBGujRyZhw8qXPOw3
+UML++5dB9ANQSwcIT1juTwUBAAAoAgAAUEsBAhQAFAAICAgAAAAhAE9Y7k8FAQAAKAIAAAgACQAAAAAA
+AAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAEQBAAAAAA==
 ------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
 ------=_contents/BDDProject/bddModel.notation-3b497921-edeb-3469-aafb-c37347b24f90
 Content-Type: q7/binary
 Entry-Name: contents/BDDProject/bddModel.notation
 
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnStk9uO2jAQhu8r9R0s73VjoFRFEXRV
-ylbLalNVSlmh3iCTTIJVHyLbIeTt1ziHhWVRVamXHs98/mfm9/T2IDjagzZMyRkeBgOMQCYqZTKf4dWv
-7x8m+PbL+3dTqSy1LidcMJprKtBBsLCvGx3rHEma0MVneGdtERJSVVWgRB4onZN1tOxSEiUzlpfaA8+S
-IeGsMOALClrUujSEyUxTsmdQFYpJa8hZecfs9F3F5SIjupSWCSCuzWBEupIOYWzN4d/lFIqzpCa+ukOV
-gl8FubsR+eQUDMgqesR+kCyd4c2qjm10P7m/Azr8bHeRXMqH9VeMbF04WT+b913JN06NadeAkaTC3ca1
-iR7RMBijOVfJH7SAjEnWdCeAmlKDAGlXLuZQ7AAcu60iNPWyjRfRvNMvOrbameCJ8hLirrdTpetLpY2W
-tJG2SZQoHGrLOLP1pvUKRuaFezTc0Trkb1rabt/UIS90XMP5QNgO8slt8E3exwuexzmgqiToE57bZBip
-1M0S7TRkM7xNU38O3M3NZjWv1PJyn6TDnfn4BHsW7+T2+25eKji1mdIiJAUvcyaJc1bvstaqgamN4MNx
-0C4k2B6tkfbOIBqMKnUCr74U8XkvDmqfDs6Sbja/9TwbP9D5HcQT+LGPq8WA5/3wm/9gmgNw777/Mrop
-ee0KF3wGUEsHCH9556b8AQAAxwQAAFBLAQIUABQACAgIAAAAIQB/eeem/AEAAMcEAAAIAAAAAAAAAAAA
-AAAAAAAAAAAuY29udGVudFBLBQYAAAAAAQABADYAAAAyAgAAAAA=
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACtkk1z0zAQhu/M8B80
+4lypTgIUT0yH0kBd6pkywSW3jBIrjqb6MJKM43/PRrbTQshw4ajV7rvP7rvTy52S6Ce3Thid4IicY8T1
+2hRClwnOv306u8CX71++mGrjmYec+Fqw0jKFdkrEh7rRvg6UtIshnuCt91VMadM0xKiSGFvSRZYOKYPW
+b3l8LUXleMgt1YbaWnuhOAUkMqJDySDhfCv5yfqKVa2tHRV6Y9lerQBoGmoGgVrJk+XwN6Kvoe85zbM7
+HEYVRYKXeTv32c3FzYyz6K3fZjrVt4sPGPm2Apj7riuUfJTMuX5RGGmm4HfeuuwORWSCrqRZP6JrvhFa
+dDMpzlxtueLa5xADKbHjEsPeEZoGbBcguj4HK+begk0PTNZ8Psz2nHRxTNqxFB3acm1UBVIrIYVvl72b
+GLkn3f1JjMFc+i+Wftq/cugjjlNyIRD3izwh+Xj7YzL7/HA/4/x7+m48bs7Ym+grRv1QX4QuUsgDIw+m
+9vdAXOuUjCakTyWrvRPFkxGBCrhMo7l9hgUHEWemAEvQ1vJNgldFEd4Efl4t86vGpMdn0Q/Z3Z3rHlwG
+l/+L9pT+uX0I/gJQSwcIb675trwBAADRAwAAUEsBAhQAFAAICAgAAAAhAG+u+ba8AQAA0QMAAAgACQAA
+AAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAPsBAAAAAA==
 ------=_contents/BDDProject/bddModel.notation-3b497921-edeb-3469-aafb-c37347b24f90--
 ------=_contents/BDDProject/bddModel.uml-39f20c5b-41fc-310d-91d8-c0a436d3dd5c
 Content-Type: q7/binary
 Entry-Name: contents/BDDProject/bddModel.uml
 
-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
+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
 ------=_contents/BDDProject/bddModel.uml-39f20c5b-41fc-310d-91d8-c0a436d3dd5c--
 ------=_contents/BDDProject/bddModel.di-afbf25d1-1ecd-3d1a-9490-3cc701109318
 Content-Type: q7/binary
 Entry-Name: contents/BDDProject/bddModel.di
 
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnSzsa/IzVEoSy0qzszPs1Uy1DNQUkjN
-S85PycxLt1UKDXHTtVCyt+PlsqnIzbSK8PVUANFw5UYg5UAD8oqtgOK2ShklJQVW+vrl5eV6+bnpevlF
-6fpAPUr6QAMAUEsHCLCug3xbAAAAaQAAAFBLAQIUABQACAgIAAAAIQCwroN8WwAAAGkAAAAIAAAAAAAA
-AAAAAAAAAAAAAAAuY29udGVudFBLBQYAAAAAAQABADYAAACRAAAAAAA=
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAABVj80KwjAQBu+C71By
+N7HiQUJjEUQo2JMKXku6toHmhyS17dsbRUs87sfMwGb5KLvkCdYJrRhK8RoloLiuhWoYul1Pqx3K98tF
+VlneCg/c9xboITqO4LgVxgc/GaWgc2vzboW6cjTsDLXeG0rIMAxYywZr25B7WfyQuP/HAu+EcfDhTWUm
+2zsi1MNWhGsLJPZQwrXyMPqiZijws/v1sJuc7HCs4MvkynO6RSQ8+QJQSwcIVoTH6K4AAAANAQAAUEsB
+AhQAFAAICAgAAAAhAFaEx+iuAAAADQEAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAA
+UEsFBgAAAAABAAEAPwAAAO0AAAAAAA==
 ------=_contents/BDDProject/bddModel.di-afbf25d1-1ecd-3d1a-9490-3cc701109318--
diff --git a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AA-Init.test b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AA-Init.test
index c3e8a99..6e89129 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AA-Init.test
+++ b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AA-Init.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _nt9tcAIKEea4jcKDc5XCuA
-Runtime-Version: 2.0.0.201507292316
-Save-Time: 4/14/16 8:32 AM
+Runtime-Version: 2.2.0.201704250859
+Save-Time: 7/7/17 4:31 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -35,16 +35,20 @@
     get-tree | select "Papyrus/Papyrus Project"
     get-button "Next >" | click
 }
+
 with [get-window "New Papyrus Project"] {
-    get-group "Diagram Language:" | get-button "SysML 1.4" | click
+    with [get-tree] {
+        select "Systems Engineering"
+        get-item -path "Systems Engineering" | check
+        select "Systems Engineering"
+    }
     get-button "Next >" | click
     get-editbox -after [get-label "Project name:"] | set-text Z
     get-button "Next >" | click
 }
-
-with [get-window "New Papyrus Project" | get-group "Select a Diagram Kind:" | get-table] {
-    select "SysML 1.4 Internal Block" -column "Diagram name"
-    get-cell 1 0 | check
+with [get-window "New Papyrus Project" | get-group "Select a Representation Kind:" | get-table] {
+    select "SysML 1.4 Internal Block" -column "Representation name"
+    get-cell 10 0 | check
 }
 get-window "New Papyrus Project" | get-button Finish | click
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AProjectCreation.test b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AProjectCreation.test
index a9d54a5..577dc9f 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AProjectCreation.test
+++ b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/TC-AProjectCreation.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: http://www.omg.org/spec/SysML/1.4/Beta/
 Id: _o7wVwPcTEeWxocwBxVlvGA
-Runtime-Version: 2.1.0.201605101848
-Save-Time: 5/12/16 2:21 PM
+Runtime-Version: 2.2.0.201706062317
+Save-Time: 7/10/17 11:03 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -32,8 +32,10 @@
 
 get-window "New Project" | get-button "Next >" | click
 with [get-window "New Papyrus Project"] {
-    with [get-group "Diagram Language:"] {
-        get-button "SysML 1.4" | click
+    with [get-tree] {
+        select "Systems Engineering"
+        get-item -path "Systems Engineering" | check
+        select "Systems Engineering"
     }
 
     get-object | save-screenshot [full-path "projectcreation-selectsysml14project"]
@@ -46,21 +48,27 @@
     get-button "Next >" | click
 }
 
-with [get-window "New Papyrus Project" | maximize | get-group "Select a Diagram Kind:"]{
+with [get-window "New Papyrus Project" | maximize | get-group "Select a Representation Kind:"]{
 	get-object | save-screenshot [full-path "projectcreation-diagrams"]
 }
 
-with [get-window "New Papyrus Project" | get-group "Select a Diagram Kind:" | get-table] {
-    select "SysML 1.4 Block Definition" -column "Diagram name"
-    get-cell 0 0 | check
+with [get-window "New Papyrus Project" | get-group "Select a Representation Kind:" | get-table] {
+    select "SysML 1.4 Block Definition" -column "Representation name" | activate-cell-edit -column 3 
+        -type MouseClickSelection
+    get-editbox | set-text 1
+    apply-cell-edit -deactivate      
 }
-with [get-window "New Papyrus Project" | get-group "Select a Diagram Kind:" | get-table] {
-    select "SysML 1.4 Internal Block" -column "Diagram name"
-    get-cell 1 0 | check
+with [get-window "New Papyrus Project" | get-group "Select a Representation Kind:" | get-table] {
+    select "SysML 1.4 Internal Block" -column "Representation name" | activate-cell-edit -column 3 
+        -type MouseClickSelection
+    get-editbox | set-text 1
+    apply-cell-edit -deactivate  
 }
-with [get-window "New Papyrus Project" | get-group "Select a Diagram Kind:" | get-table] {
-    select "SysML 1.4 Requirement Table" -column "Diagram name"
-    get-cell 5 0 | check
+with [get-window "New Papyrus Project" | get-group "Select a Representation Kind:" | get-table] {
+    select "SysML 1.4 Requirement Table" -column "Representation name" | activate-cell-edit -column 3 
+        -type MouseClickSelection
+    get-editbox | set-text 1
+    apply-cell-edit -deactivate      
 }
 get-window "New Papyrus Project" | get-button Finish | click
 
@@ -72,32 +80,32 @@
 with [get-window "Open Perspective"] {
 	get-object | save-screenshot [full-path "projectcreation-papyrusperspective"]
     get-table | select "Papyrus \\(default\\)"
-    get-button OK | click
+    get-button Open | click
 }
 
 
-with [get-editor "mymodel.di"] {
+with [get-editor "mymodel..di"] {
     get-tab-folder | get-tab-item "SysML 1.4 Block Definition" | click
-    get-diagram -index 1 | get-edit-part -name RootElement | mouse-move 655 185 -height 342 -width 656
+    get-diagram -index 1 | get-edit-part -name mymodel | mouse-move 655 185 -height 342 -width 656
    with [get-palette | get-palette-entry Block] {
         mouse-move 66 1 button1 -height 24 -width 125
         mouse-press 66 1 button1 -height 24 -width 125
         mouse-release 66 1 button1 524288 -height 24 -width 125
     }
-    with [get-diagram -index 1 | get-edit-part -name RootElement] {
+    with [get-diagram -index 1 | get-edit-part -name mymodel] {
         mouse-move 165 103 button1 -height 342 -width 656
         mouse-press 165 103 button1 -height 342 -width 656
         mouse-release 165 103 button1 524288 -height 342 -width 656
     }
     with [get-diagram -index 1] {
-        with [get-edit-part -name RootElement] {
+        with [get-edit-part -name mymodel] {
             get-edit-part -name Block2 | get-edit-part -text "Block2" | activate-direct-edit
             mouse-move 388 166 button1 -height 342 -width 656
             mouse-press 388 166 button1 -height 342 -width 656
         }
         commit-direct-edit
         get-figure "1/21" | mouse-release 42 30 button1 524288 -height 40 -width 310
-        get-edit-part -name RootElement | mouse-move 644 195 -height 342 -width 656
+        get-edit-part -name mymodel | mouse-move 644 195 -height 342 -width 656
     }
     get-palette | get-palette-entry Allocate | mouse-move 113 21 -height 24 -width 125
 }
@@ -105,14 +113,16 @@
 //SCREENSHOTS
 
 //create a screenshot with only the whiteboard
-with [get-editor "mymodel.di" | get-diagram -index 1 ] {
+/*
+with [get-editor "mymodel..di" | get-diagram -index 1 ] {
 	get-object | save-screenshot [full-path "projectcreation-papyrus-bdd"]
 }
+
 //create a screenshot of the di tab and the palette
 find-tab-folder "SysML 1.4 Block Definition" | get-object | save-screenshot [full-path "projectcreation-diwithpalette"]
-
+*/
 //Creation of Part typed by a Block
-with [get-editor "mymodel.di"] {
+with [get-editor "mymodel..di"] {
     with [get-palette] {
         with [get-palette-entry Part] {
             mouse-move 45 12 button1 -height 24 -width 125
@@ -122,7 +132,7 @@
             mouse-move 9 18 -height 24 -width 125
         }
     }
-    with [get-diagram -index 1 | get-edit-part -name RootElement | get-edit-part -name Block2 | get-edit-part 
+    with [get-diagram -index 1 | get-edit-part -name mymodel | get-edit-part -name Block2 | get-edit-part 
         -className ClassAttributeCompartmentEditPart] {
         mouse-move 13 9 button1 -height 25 -width 117
         mouse-press 13 9 button1 -height 25 -width 117
@@ -131,33 +141,34 @@
     }
 }
 with [get-window -class CreateOrSelectBlockPropertyTypeDialog] {
-    get-section "Create a new type" | get-editbox -after [get-label "Select new type name"] | set-text Block3
+    get-section "Create a new type" | get-editbox -after [get-label "Select new type name"] | set-text Attribute1
     get-button OK | click
 }
-
-with [get-editor "mymodel.di" | get-diagram -index 1 ] {
+/*
+with [get-editor "mymodel..di" | get-diagram -index 1 ] {
 	get-object | save-screenshot [full-path "projectcreation-papyrus-bdd2"]
 }
 //create a screenshot of the di tab and the palette
 find-tab-folder "Model Explorer" | get-object | save-screenshot [full-path "projectcreation-modelexplorer"]
-
+*/
 //open the model explorer
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block2" | click
-get-editor "mymodel.di" | get-diagram -index 1 | get-edit-part -name RootElement | mouse-move 103 19 -height 342 
+get-view "Model Explorer" | get-tree | get-item "mymodel/«Block» Block2" | click
+get-editor "mymodel..di" | get-diagram -index 1 | get-edit-part -name mymodel | mouse-move 103 19 -height 342 
     -width 656
-    
+ 
+/*    
 //create a screenshot of ModelExplorer
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block2/Attribute1 : Block3" | click
+get-view "Model Explorer" | get-tree | get-item "mymodel/«Block» Block2/Attribute1 : Attribute1" | click
 find-tab-folder "Model Explorer" | get-object | save-screenshot [full-path "projectcreation-modelexplorer2"]
     
 //create a screenshot of Outline
 find-tab-folder "Outline" | get-object | save-screenshot [full-path "projectcreation-outline"]
-  
+ */ 
 //ok up
 
 
-with [get-editor "mymodel.di"] {
-    get-diagram -index 1 | get-edit-part -name RootElement | mouse-move 60 339 -height 342 -width 656
+with [get-editor "mymodel..di"] {
+    get-diagram -index 1 | get-edit-part -name mymodel | mouse-move 60 339 -height 342 -width 656
     get-tab-folder | get-tab-item "SysML 1.4 Internal Block" | click
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         mouse-move 81 291 -height 342 -width 656
@@ -169,20 +180,20 @@
 }
 
 //create a screenshot of the di tab and the palette
-find-tab-folder "SysML 1.4 Internal Block" | get-object | save-screenshot [full-path "projectcreation-ibd-diwithpalette"]
+//find-tab-folder "SysML 1.4 Internal Block" | get-object | save-screenshot [full-path "projectcreation-ibd-diwithpalette"]
 
 
 
-with [get-editor "mymodel.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "mymodel..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     mouse-move 338 305 -height 342 -width 656
     mouse-move 2 167 -height 342 -width 656
     mouse-move 4 453 -height 486 -width 656
 }
 with [get-view "Model Explorer" | get-tree] {
-    get-item "RootElement/«Block» Block3" | click
-    get-item "RootElement/«Block» Block3" | drag-start 10 12
+    get-item "mymodel/«Block» Attribute1" | click
+    get-item "mymodel/«Block» Attribute1" | drag-start 10 12
 }
-with [get-editor "mymodel.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "mymodel..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     drag-enter 3 306 -detail move
     with [get-edit-part -name Block1] {
         drag-over 7 224 -detail copy
@@ -193,10 +204,10 @@
         | drag-accept 84 75 -detail copy
 }
 get-view "Model Explorer" | get-tree | drag-set-data
-get-editor "mymodel.di" | get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 
+get-editor "mymodel..di" | get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 
     | get-edit-part -className ClassCompositeCompartmentEditPart | get-figure "1/0" | drop 84 75 -detail copy
 get-view "Model Explorer" | get-tree | drag-end -detail copy
-with [get-editor "mymodel.di"] {
+with [get-editor "mymodel..di"] {
     get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 653 258 -height 486 -width 656
     with [get-palette] {
         with [get-palette-entry Part] {
@@ -213,7 +224,7 @@
     }
 }
 get-window -class CreateOrSelectBlockPropertyTypeDialog | get-button OK | click
-with [get-editor "mymodel.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "mymodel..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     mouse-move 300 366 button1 -height 486 -width 656
     mouse-press 300 366 button1 -height 486 -width 656
     mouse-release 300 366 button1 524288 -height 486 -width 656
@@ -225,10 +236,10 @@
 }
 
 //create a screenshot of the di tab and the palette
-find-tab-folder "SysML 1.4 Internal Block" | get-object | save-screenshot [full-path "projectcreation-ibd-2"]
+//find-tab-folder "SysML 1.4 Internal Block" | get-object | save-screenshot [full-path "projectcreation-ibd-2"]
 
 
-with [get-editor "mymodel.di"] {
+with [get-editor "mymodel..di"] {
     get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 616 130 -height 342 -width 662
     with [get-palette] {
         with [get-palette-entry Port] {
@@ -241,7 +252,7 @@
     with [get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 | get-edit-part 
         -className ClassCompositeCompartmentEditPart] {
         mouse-move 196 93 -height 215 -width 500
-        with [get-edit-part -name "block3" ] {
+        with [get-edit-part -name "Attribute1" ] {
             mouse-move 146 13 button1 -height 40 -width 149
             mouse-press 146 13 button1 -height 40 -width 149
             mouse-hover 146 13 -mask 524288 -height 40 -width 149
@@ -250,7 +261,7 @@
     }
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         with [get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart] {
-            with [get-edit-part -name "block3" | get-edit-part -name Port1] {
+            with [get-edit-part -name "Attribute1" | get-edit-part -name Port1] {
                 mouse-move 9 10 button1 -height 20 -width 20
                 mouse-press 9 10 button1 -height 20 -width 20
                 mouse-move 9 11 -mask 524288 -height 20 -width 20
@@ -291,7 +302,7 @@
                 mouse-press 290 53 button1 -height 215 -width 500
                 mouse-release 290 53 button1 524288 -height 215 -width 500
                 mouse-move 200 84 -height 215 -width 500
-                with [get-edit-part -name "block3"] {
+                with [get-edit-part -name "Attribute1"] {
                     mouse-move 56 4 button1 -height 40 -width 149
                     mouse-press 56 4 button1 -height 40 -width 149
                     mouse-hover 54 4 -height 40 -width 149
@@ -305,7 +316,7 @@
                 mouse-release 65 31 button1 524288 -height 215 -width 500
                 mouse-move 70 33 -height 215 -width 500
                 mouse-hover 70 33 -height 215 -width 500
-                with [get-edit-part -name "block3"] {
+                with [get-edit-part -name "Attribute1"] {
                     mouse-move 24 9 button1 -height 40 -width 149
                     mouse-press 24 9 button1 -height 40 -width 149
                 }
@@ -313,7 +324,7 @@
             }
             mouse-drag 35 54 button1 524288 -height 250 -width 500
             mouse-release 35 54 button1 524288 -height 250 -width 500
-            get-edit-part -className ClassCompositeCompartmentEditPart | get-edit-part -name "block3" | mouse-hover 24 9 
+            get-edit-part -className ClassCompositeCompartmentEditPart | get-edit-part -name "Attribute1" | mouse-hover 24 9 
                 -height 40 -width 149
         }
         mouse-move 5 123 -height 342 -width 656
@@ -331,7 +342,7 @@
     with [get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 | get-edit-part 
         -className ClassCompositeCompartmentEditPart] {
         mouse-move 170 31 -height 215 -width 500
-        with [get-edit-part -name "block3"] {
+        with [get-edit-part -name "Attribute1"] {
             get-edit-part -name Port1 | mouse-move 13 6 -height 20 -width 20
             with [get-handle ResizeHandle -index 1] {
                 mouse-move 2 5 button1 -height 7 -width 7
@@ -346,6 +357,7 @@
             mouse-press 10 12 button1 -height 20 -width 20
         }
     }
+    /*
     with [get-diagram -index 1] {
         with [get-edit-part -name Block1 | get-edit-part -name Block1 | get-edit-part 
             -className ClassCompositeCompartmentEditPart] {
@@ -369,14 +381,15 @@
             mouse-move 13 176 -height 342 -width 656
         }
     }
+    */
 }
 
 //create a screenshot of the di tab and the palette
-find-tab-folder "SysML 1.4 Internal Block" | get-object | save-screenshot [full-path "projectcreation-ibd-3"]
+//find-tab-folder "SysML 1.4 Internal Block" | get-object | save-screenshot [full-path "projectcreation-ibd-3"]
 
 
 //Add a requirement
-with [get-editor "mymodel.di"] {
+with [get-editor "mymodel..di"] {
     with [get-palette] {
         get-palette-entry ParticipantProperty | mouse-move 86 2 -height 24 -width 160
         get-palette-entry Part | mouse-move 67 11 -height 24 -width 160
@@ -397,8 +410,8 @@
     get-tab-folder | get-tab-item "SysML 1.4 Requirement Table" | click
 }
 with [get-view "Model Explorer" | get-tree] {
-    get-item RootElement | click
-    select RootElement | get-menu "SysML 1.4 Child/Requirement" | click
+    get-item mymodel | click
+    select mymodel | get-menu "SysML 1.4 Child/Requirement" | click
 }
 with [get-view Properties] {
     get-editbox -after [get-label Name] | click-text 13
@@ -412,8 +425,8 @@
 get-view Properties | get-editbox -after [get-label Id] | set-focus
 
 //create a screenshot of the properties
-find-tab-folder "Properties" | get-object | save-screenshot [full-path "projectcreation-req-properties"]
+//find-tab-folder "Properties" | get-object | save-screenshot [full-path "projectcreation-req-properties"]
 //create a screenshot of the di tab and the palette
-find-tab-folder "SysML 1.4 Requirement Table" | get-object | save-screenshot [full-path "projectcreation-req"]
+//find-tab-folder "SysML 1.4 Requirement Table" | get-object | save-screenshot [full-path "projectcreation-req"]
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/diagBDD/TC-BDD-DataType.test b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/diagBDD/TC-BDD-DataType.test
index 332cd18..1036c5f 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/diagBDD/TC-BDD-DataType.test
+++ b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/diagBDD/TC-BDD-DataType.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: @pap.req org.eclipse.papyrus.sysml.14.diagram.blockdefinition#Req004.003
 Id: _0orXwMAcEeW0gtwz0jrrzQ
-Runtime-Version: 2.0.0.201506120617
-Save-Time: 1/21/16 9:56 AM
+Runtime-Version: 2.2.0.201706062317
+Save-Time: 7/10/17 11:15 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -25,9 +25,9 @@
 
 //Creation from the model explorer
 with [get-view "Model Explorer" | get-tree] {
-    get-item "BddRoot/Diagram SysML 1.4 Block Definition" | click
-    select "BddRoot/Diagram SysML 1.4 Block Definition" | double-click
-    get-item "BddRoot/Diagram SysML 1.4 Block Definition" | click
+    get-item "BddRoot/SysML 1.4 Block Definition" | click
+    select "BddRoot/SysML 1.4 Block Definition" | double-click
+    get-item "BddRoot/SysML 1.4 Block Definition" | click
     get-item BddRoot | click
     select BddRoot | get-menu "SysML 1.4 Child/ValueType" | click
     get-item "BddRoot/«ValueType» ValueType1" | drag-start 24 13
@@ -73,6 +73,7 @@
 }
 //End Of Creation of the Palette
 
+/*
 //Test rendering
 with [get-editor "bddModel.di" | get-diagram -index 1 | get-edit-part -name BddRoot | get-edit-part -name ValueType1] {
     get-property text | equals "«DataType»«ValueType»ValueType1" | verify-true
@@ -80,7 +81,7 @@
     get-property "getChildren().DataTypeOperationCompartmentEditPart[3].getCompartmentName()" | equals operations 
         | verify-true
 }
-
+*/
 with [get-editor "bddModel.di" | get-diagram -index 1 | get-edit-part -name BddRoot | get-edit-part -name ValueType2] {
     get-property text | equals "«DataType»«ValueType»ValueType2" | verify-true
     get-property className | equals "org.eclipse.papyrus.uml.diagram.clazz.edit.parts.DataTypeEditPart" | verify-true
diff --git a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test
index 3769e80..e5092ae 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test
+++ b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _wkc48JNcEeWdrOtbW826CQ
-Runtime-Version: 2.0.0.201506120617
-Save-Time: 5/10/16 9:23 AM
+Runtime-Version: 2.2.0.201706062317
+Save-Time: 7/10/17 10:37 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -38,31 +38,37 @@
     get-button "Next >" | click
 }
 with [get-window "New Papyrus Project"] {
-    get-group "Diagram Language:" | get-button "SysML 1.4" | click
+    with [get-tree] {
+        select "Systems Engineering"
+        get-item -path "Systems Engineering" | check
+        select "Systems Engineering"
+    }
     get-button "Next >" | click
     get-editbox -after [get-label "Project name:"] | set-text AAA
     get-button "Next >" | click
 }
 
-with [get-window "New Papyrus Project" | get-group "Select a Diagram Kind:" | get-table] {
-    select "SysML 1.4 Internal Block" -column "Diagram name"
-    get-cell 1 0 | check
+with [get-window "New Papyrus Project" | get-group "Select a Representation Kind:" | get-table] {
+    select "SysML 1.4 Internal Block" -column "Representation name" | activate-cell-edit -column 3 
+        -type MouseClickSelection
+    get-editbox | set-text 1
+    apply-cell-edit -deactivate    
 }
 get-window "New Papyrus Project" | get-button Finish | click
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     mouse-move 308 305 -height 318 -width 595
     mouse-move 188 "-87" -height 318 -width 595
 }
 get-menu "Window/Perspective/Open Perspective/Other..." | click
 get-window "Open Perspective" | get-table | select "Papyrus \\(default\\)" | double-click
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart 
         | mouse-release 157 0 button1 524288 -height 215 -width 500
     mouse-move 0 254 -height 342 -width 656
 }
-get-view "Model Explorer" | get-tree | get-item RootElement | click
+get-view "Model Explorer" | get-tree | get-item AAA | click
 
-with [get-editor "model.di"] {
+with [get-editor "AAA..di"] {
     with [get-palette] {
         get-palette-entry ChangeStructuralFeatureEvent | mouse-move 101 4 -height 24 -width 125
         get-palette-entry ActorPart | mouse-move 45 2 -height 24 -width 125
@@ -71,34 +77,34 @@
 }
 get-menu "Window/Perspective/Open Perspective/Other..." | click
 get-window "Open Perspective" | get-table | select "Papyrus \\(default\\)" | double-click
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart 
         | mouse-release 166 10 button1 524288 -height 215 -width 500
     mouse-move 13 257 -height 345 -width 659
 }
 with [get-view "Model Explorer" | get-tree] {
-    get-item RootElement | click
-    select RootElement | get-menu "SysML 1.4 Child/Block" | click
+    get-item AAA | click
+    select AAA | get-menu "SysML 1.4 Child/Block" | click
 }
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 8 312 -height 345 -width 659
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 8 312 -height 345 -width 659
 with [get-view "Model Explorer" | get-tree] {
-    get-item RootElement | click
-    select RootElement | get-menu "SysML 1.4 Child/Block" | click
+    get-item AAA | click
+    select AAA | get-menu "SysML 1.4 Child/Block" | click
 }
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 3 294 -height 345 -width 659
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 3 294 -height 345 -width 659
 with [get-view "Model Explorer" | get-tree] {
-    get-item "RootElement/«Block» Block2" | click
-    select "RootElement/«Block» Block2" | get-menu "SysML 1.4 Child/FullPort" | click
-    get-item "RootElement/«Block» Block3" | click
-    select "RootElement/«Block» Block3" | get-menu "New Child/Property" | click
-    get-item "RootElement/«Block» Block2" | click
-    get-item "RootElement/«Block» Block2" | drag-start 27 19
-    get-item "RootElement/«Block» Block2" | drag-enter 58 10 -detail move
-    get-item "RootElement/«Block» Block2" | drag-over 94 1 -detail move
-    get-item "RootElement/«Block» Block1" | drag-over 113 16 -detail move
-    get-item "RootElement/«Block» Block2" | drag-exit
+    get-item "AAA/«Block» Block2" | click
+    select "AAA/«Block» Block2" | get-menu "SysML 1.4 Child/FullPort" | click
+    get-item "AAA/«Block» Block3" | click
+    select "AAA/«Block» Block3" | get-menu "New Child/Property" | click
+    get-item "AAA/«Block» Block2" | click
+    get-item "AAA/«Block» Block2" | drag-start 27 19
+    get-item "AAA/«Block» Block2" | drag-enter 58 10 -detail move
+    get-item "AAA/«Block» Block2" | drag-over 94 1 -detail move
+    get-item "AAA/«Block» Block1" | drag-over 113 16 -detail move
+    get-item "AAA/«Block» Block2" | drag-exit
 }
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     drag-enter 9 287 -detail move
     with [get-edit-part -name Block1] {
         drag-over 7 226
@@ -109,10 +115,10 @@
         | drag-accept 166 79 -detail copy
 }
 get-view "Model Explorer" | get-tree | drag-set-data
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 | get-edit-part 
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 | get-edit-part 
     -className ClassCompositeCompartmentEditPart | get-figure "1/0" | drop 166 79 -detail copy
 get-view "Model Explorer" | get-tree | drag-end -detail copy
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     with [get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart] {
         mouse-move 143 98 -height 215 -width 500
         mouse-hover 143 98 -height 215 -width 500
@@ -120,18 +126,18 @@
     mouse-move 0 297 -height 345 -width 659
 }
 
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     mouse-move 200 32 -height 342 -width 656
     mouse-move 114 302 -height 342 -width 656
 }
 with [get-view "Model Explorer" | get-tree] {
-    get-item "RootElement/«Block» Block3" | click
-    get-item "RootElement/«Block» Block3" | drag-start 31 11
-    get-item "RootElement/«Block» Block3" | drag-enter 98 17 -detail move
-    get-item "RootElement/«Block» Block3" | drag-over 117 15 -detail move
-    get-item "RootElement/«Block» Block3" | drag-exit
+    get-item "AAA/«Block» Block3" | click
+    get-item "AAA/«Block» Block3" | drag-start 31 11
+    get-item "AAA/«Block» Block3" | drag-enter 98 17 -detail move
+    get-item "AAA/«Block» Block3" | drag-over 117 15 -detail move
+    get-item "AAA/«Block» Block3" | drag-exit
 }
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     drag-enter 8 286 -detail move
     drag-over 37 281
     get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart | get-figure "1/0" 
@@ -141,20 +147,20 @@
         | drag-accept 369 61 -detail copy
 }
 get-view "Model Explorer" | get-tree | drag-set-data
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 | get-edit-part 
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | get-edit-part -name Block1 | get-edit-part 
     -className ClassCompositeCompartmentEditPart | get-figure "1/0" | drop 369 61 -detail copy
 get-view "Model Explorer" | get-tree | drag-end -detail copy
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 8 284 -height 342 -width 656
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block3/Attribute1" | click
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 8 284 -height 342 -width 656
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block3/Attribute1" | click
 get-view Properties | get-button "Edit the reference value" | click
 with [get-window Type] {
-    get-editbox -after [get-label "Filter:"] | set-focus
-    get-tree | select "RootElement/«Block» Block1"
+    get-editbox | set-focus
+    get-tree | select "AAA/«Block» Block1"
     get-button OK | click
 }
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 0 305 -height 342 -width 656
-get-view "Model Explorer" | get-tree | get-item RootElement | click
-with [get-editor "model.di"] {
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 0 305 -height 342 -width 656
+get-view "Model Explorer" | get-tree | get-item AAA | click
+with [get-editor "AAA..di"] {
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         with [get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart] {
             mouse-move 233 135 -height 215 -width 500
@@ -166,8 +172,8 @@
 }
 
 //tsting with 4 elements, 3 blocks and the diagram
-get-view "Model Explorer" | get-tree | get-item RootElement | get-property childCount | equals 6 | verify-true
-with [get-editor "model.di"] {
+get-view "Model Explorer" | get-tree | get-item AAA | get-property childCount | equals 6 | verify-true
+with [get-editor "AAA..di"] {
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         mouse-move 583 29 -height 342 -width 656
         mouse-move 646 84 -height 342 -width 656
@@ -176,9 +182,9 @@
 }
 
 //testing the block1 is composed only with 2 children
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1" | get-property childCount | equals 2 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1" | get-property childCount | equals 2 
     | verify-true
-with [get-editor "model.di"] {
+with [get-editor "AAA..di"] {
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         mouse-move 566 37 -height 342 -width 656
         get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart | mouse-move 343 82 
@@ -187,12 +193,12 @@
     }
     get-palette | get-palette-entry "Zoom Out" | mouse-move 5 8 -height 19 -width 19
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block2 : Block2" | get-property childCount 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block2 : Block2" | get-property childCount 
     | equals 0 | verify-true
 
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block2" | get-property childCount | equals 1 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block2" | get-property childCount | equals 1 
     | verify-true
-with [get-editor "model.di"] {
+with [get-editor "AAA..di"] {
     get-palette | get-palette-entry Conform | mouse-move 41 19 -height 24 -width 125
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         mouse-move 256 302 -height 342 -width 656
@@ -200,9 +206,9 @@
     }
     get-palette | get-palette-entry ActorPart | mouse-move 66 4 -height 24 -width 234
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block3" | get-property childCount | equals 1 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block3" | get-property childCount | equals 1 
     | verify-true
-with [get-editor "model.di"] {
+with [get-editor "AAA..di"] {
     with [get-palette] {
         get-palette-entry "Zoom In" | mouse-move 8 3 -height 19 -width 19
         get-palette-entry Select | mouse-move 1 10 -height 19 -width 19
@@ -219,9 +225,9 @@
 }
 
 //Testing in the ui we could see parts displayed as tree, so with children
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 0 341 -height 342 -width 656
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1" | click
-with [get-editor "model.di"] {
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 0 341 -height 342 -width 656
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1" | click
+with [get-editor "AAA..di"] {
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart | mouse-move 288 129 
             -height 215 -width 500
@@ -229,23 +235,23 @@
     }
     get-palette | get-palette-entry ActorPart | mouse-move 51 6 -height 24 -width 234
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1" | get-property childCount | equals 2 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1" | get-property childCount | equals 2 
     | verify-true
-with [get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1] {
+with [get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1] {
     mouse-move 566 155 -height 342 -width 656
     mouse-move 16 319 -height 342 -width 656
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block2 : Block2" | click
-with [get-editor "model.di"] {
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block2 : Block2" | click
+with [get-editor "AAA..di"] {
     get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 633 129 -height 342 -width 656
     with [get-palette] {
         get-palette-entry AdjunctProperty | mouse-move 92 2 -height 24 -width 234
         get-palette-entry ActorPart | mouse-move 121 11 -height 24 -width 234
     }
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block2 : Block2" | get-property childCount 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block2 : Block2" | get-property childCount 
     | equals 1 | verify-true
-with [get-editor "model.di"] {
+with [get-editor "AAA..di"] {
     with [get-palette] {
         get-palette-entry BoundReference | mouse-move 36 3 -height 24 -width 234
         get-palette-entry ChangeStructuralFeatureEvent | mouse-move 9 2 -height 24 -width 234
@@ -257,17 +263,17 @@
 }
 
 
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block3 : Block3" | click
-get-editor "model.di" | get-palette | get-palette-entry BoundReference | mouse-move 98 11 -height 24 -width 234
-with [get-editor "model.di"] {
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block3 : Block3" | click
+get-editor "AAA..di" | get-palette | get-palette-entry BoundReference | mouse-move 98 11 -height 24 -width 234
+with [get-editor "AAA..di"] {
     get-palette | get-palette-entry BoundReference | mouse-move 14 3 -height 24 -width 234
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         mouse-move 572 169 -height 342 -width 656
         mouse-move 5 280 -height 342 -width 656
     }
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block3 : Block3" | click
-with [get-editor "model.di"] {
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block3 : Block3" | click
+with [get-editor "AAA..di"] {
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         get-edit-part -name Block1 | get-edit-part -className ClassCompositeCompartmentEditPart | mouse-move 198 127 
             -height 215 -width 500
@@ -278,11 +284,11 @@
         get-palette-entry "Standard Marquee Selection" | mouse-move 12 2 -height 19 -width 19
     }
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block3 : Block3" | get-property childCount 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block3 : Block3" | get-property childCount 
     | equals 1 | verify-true
-get-editor "model.di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 390 340 -height 342 -width 656
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block3 : Block3/Attribute1 : Block1" | click
-with [get-editor "model.di"] {
+get-editor "AAA..di" | get-diagram -index 1 | get-edit-part -name Block1 | mouse-move 390 340 -height 342 -width 656
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block3 : Block3/Attribute1 : Block1" | click
+with [get-editor "AAA..di"] {
     with [get-diagram -index 1 | get-edit-part -name Block1] {
         mouse-move 67 295 -height 342 -width 656
         mouse-move 653 133 -height 342 -width 656
@@ -292,6 +298,6 @@
         get-palette-entry ActorPart | mouse-move 101 15 -height 24 -width 234
     }
 }
-get-view "Model Explorer" | get-tree | get-item "RootElement/«Block» Block1/block3 : Block3/Attribute1 : Block1" 
+get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block1/block3 : Block3/Attribute1 : Block1" 
     | get-property childCount | equals 2 | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/releng/pom.xml b/releng/pom.xml
index 057a88c..3c2d3e7 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -26,7 +26,7 @@
 				<module>org.eclipse.papyrus.sysml14.rcp</module>
 				<module>org.eclipse.papyrus.sysml14.rcp.feature</module>
 				<module>org.eclipse.papyrus.sysml14.product</module>
-			<!-- FIXME : reenable tests before any release 	<module>org.eclipse.papyrus.sysml14.rcptt.tests</module>-->
+				<module>org.eclipse.papyrus.sysml14.rcptt.tests</module>
 			</modules>
 		</profile>
 	</profiles>