Bug 426489 - Missing Q7 tests

Made tests more robust to failures
https://bugs.eclipse.org/bugs/show_bug.cgi?id=426489

20 files changed, 1315 insertions, 1031 deletions

diff --git a/tests/ECPQ7Tests/Editor/XMLDate.test b/tests/ECPQ7Tests/Editor/XMLDate.test
index d7ab7510d1..aea336856b 100644
--- a/tests/ECPQ7Tests/Editor/XMLDate.test
+++ b/tests/ECPQ7Tests/Editor/XMLDate.test
@@ -7,8 +7,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _GYZaMHlAEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 4:23 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/6/14 5:57 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,11 +18,11 @@ Entry-Name: .content
 get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]" | get-menu "New Model Element" 
     | click
 with [get-window "Add new model element"] {
-    get-tree | select "bowling/Referee"
+    try { get-tree | select "Referee" } -catch { get-tree | select "bowling/Referee" }
     get-button Finish | click
 }
 get-editor Referee | get-button -after [get-label "Date Of Birth"] | click
-get-window -from "XmlDateControlText$1.widgetSelected()" | get-date-time | set-value "2013/12/1 0:0:0"
+get-window -from "XmlDateControlText$SelectionAdapterExtension.widgetSelected()" | get-date-time | set-value "2013/12/1 0:0:0"
 with [get-editor "Referee 2013-12-01" | get-editbox -after [get-label "Date Of Birth"]] {
     set-text "15/4/2012"
 }
diff --git a/tests/ECPQ7Tests/EditorReadonly/ReadOnlyReferenceMultiControl.test b/tests/ECPQ7Tests/EditorReadonly/ReadOnlyReferenceMultiControl.test
index b5498768e9..4b9068076e 100644
--- a/tests/ECPQ7Tests/EditorReadonly/ReadOnlyReferenceMultiControl.test
+++ b/tests/ECPQ7Tests/EditorReadonly/ReadOnlyReferenceMultiControl.test
@@ -7,38 +7,71 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _pgFycIQREeO0WrMxvPcxtw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/23/14 2:06 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:42 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-editor "Player John" | close
-get-editor Game | close
-get-editor Matchup | close
-get-editor "Tournament Amateur" | close
-get-editor View | get-button "Link Root EClas" | click
-get-window "Select an EClass." | get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]" 
-    | double-click
-get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
-with [get-window -class SelectAttributesDialog] {
-    get-table | get-item "eMails : EString" | check
-    get-button OK | click
-}
-get-view "Model Explorer" | get-tree | select "Project/View/Control eMails" | double-click
-get-editor "Control eMails" | get-button -after [get-label Readonly] | check
-with [get-view "Model Explorer"] {
-    get-tree | select "Project/View"
-    get-button "Save Project" | click
-}
-get-editor View | close
-get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
-with [get-editor "Player John"] {
-    get-button "Add Entry" | get-property enablement | equals false | verify-true
-    get-button -after [get-label "EMails*"] -index 1 | get-property enablement | equals false | verify-true
-    get-button -after [get-label "EMails*"] -index 2 | get-property enablement | equals false | verify-true
-    get-button -after [get-label "EMails*"] -index 3 | get-property enablement | equals false | verify-true
+try {
+	get-editor "Player John" | close
+	get-editor Game | close
+	get-editor Matchup | close
+	get-editor "Tournament Amateur" | close
+	get-editor View | get-button "Link Root EClas" | click
+	get-window "Select an EClass." | get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]" 
+	    | double-click
+	get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
+	with [get-window -class SelectAttributesDialog] {
+	    get-table | get-item "eMails : EString" | check
+	    get-button OK | click
+	}
+	get-view "Model Explorer" | get-tree | select "Project/View/Control eMails" | double-click
+	get-editor "Control eMails" | get-button -after [get-label Readonly] | check
+	with [get-view "Model Explorer"] {
+	    get-tree | select Project
+	   try {
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		 get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		 get-tree | select Project
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	}
+	get-editor View | close
+	get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
+	with [get-editor "Player John"] {
+	    get-button "Add Entry" | get-property enablement | equals false | verify-true
+	    get-button -after [get-label "EMails*"] -index 1 | get-property enablement | equals false | verify-true
+	    get-button -after [get-label "EMails*"] -index 2 | get-property enablement | equals false | verify-true
+	    get-button -after [get-label "EMails*"] -index 3 | get-property enablement | equals false | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EditorReadonly/ReadOnlyXMLDate.test b/tests/ECPQ7Tests/EditorReadonly/ReadOnlyXMLDate.test
index 9881a91ed1..420c50c7fd 100644
--- a/tests/ECPQ7Tests/EditorReadonly/ReadOnlyXMLDate.test
+++ b/tests/ECPQ7Tests/EditorReadonly/ReadOnlyXMLDate.test
@@ -7,39 +7,72 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _W0km0HlCEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 4:32 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:42 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-editor "Player John" | close
-get-editor "Tournament Amateur" | close
-get-editor Game | close
-get-editor Matchup | close
-get-editor View | get-button "Link Root EClas" | click
-get-window "Select an EClass." | get-tree | select "bowling/Referee \\[org.eclipse.emf.emfstore.bowling.Referee\\]" 
-    | double-click
-get-view "Model Explorer" | get-tree | select TestProject | get-menu "New Model Element" | click
-get-window "Add new model element" | get-tree | select "bowling/Referee" | double-click
-get-editor Referee | get-editbox -after [get-label "Date Of Birth"] | get-property readOnly | equals false | verify-true
-get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
-with [get-window -class SelectAttributesDialog] {
-    get-table | get-item "dateOfBirth : XMLDate" | check
-    get-button OK | click
+try {
+	get-editor "Player John" | close
+	get-editor "Tournament Amateur" | close
+	get-editor Game | close
+	get-editor Matchup | close
+	get-editor View | get-button "Link Root EClas" | click
+	get-window "Select an EClass." | get-tree | select "bowling/Referee \\[org.eclipse.emf.emfstore.bowling.Referee\\]" 
+	    | double-click
+	get-view "Model Explorer" | get-tree | select TestProject | get-menu "New Model Element" | click
+	get-window "Add new model element" | try { get-tree | select "Referee" } -catch { get-tree | select "bowling/Referee" } | double-click
+	get-editor Referee | get-editbox -after [get-label "Date Of Birth"] | get-property readOnly | equals false | verify-true
+	get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
+	with [get-window -class SelectAttributesDialog] {
+	    get-table | get-item "dateOfBirth : XMLDate" | check
+	    get-button OK | click
+	}
+	get-view "Model Explorer" | get-tree | select "Project/View/Control dateOfBirth" | double-click
+	get-editor "Control dateOfBirth" | get-button -after [get-label Readonly] | check
+	with [get-view "Model Explorer"] {
+		try {
+			get-tree | select Project
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select Project
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	}
+	get-editor Referee | close
+	get-editor "Control dateOfBirth" | click
+	get-editor View | close
+	get-editor "Control dateOfBirth" | close
+	get-view "Model Explorer" | get-tree | select "TestProject/Referee" | double-click
+	get-editor Referee | get-editbox -after [get-label "Date Of Birth"] | get-property readOnly | equals true | verify-true
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
-get-view "Model Explorer" | get-tree | select "Project/View/Control dateOfBirth" | double-click
-get-editor "Control dateOfBirth" | get-button -after [get-label Readonly] | check
-with [get-view "Model Explorer"] {
-    get-tree | select Project
-    get-button "Save Project" | click
-}
-get-editor Referee | close
-get-editor "Control dateOfBirth" | click
-get-editor View | close
-get-editor "Control dateOfBirth" | close
-get-view "Model Explorer" | get-tree | select "TestProject/Referee" | double-click
-get-editor Referee | get-editbox -after [get-label "Date Of Birth"] | get-property readOnly | equals true | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EditorReadonly/ReadonlyAttributeMultiControl.test b/tests/ECPQ7Tests/EditorReadonly/ReadonlyAttributeMultiControl.test
index 53704c8f47..e3bdb974f0 100644
--- a/tests/ECPQ7Tests/EditorReadonly/ReadonlyAttributeMultiControl.test
+++ b/tests/ECPQ7Tests/EditorReadonly/ReadonlyAttributeMultiControl.test
@@ -7,55 +7,76 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _ZFIgQYQvEeOewrJdzmuGPg
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/23/14 2:20 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:42 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-editor Game | close
-get-editor "Player John" | click
-get-editor Matchup | close
-get-editor "Tournament Amateur" | close
-get-editor "Player John" | close
-get-editor View | get-button "Link Root EClas" | click
-get-window "Select an EClass." | get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]" 
-    | double-click
-get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
-with [get-window -class SelectAttributesDialog] {
-    get-table | get-item "eMails : EString" | check
-    get-button OK | click
-}
-
-
-
-get-view "Model Explorer" | get-tree | select "Project/View/Control eMails" | double-click
-get-editor "Control eMails" | get-button -after [get-label Readonly] | check
-with [get-view "Model Explorer"] {
-    get-tree | select Project
-   try {
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		 get-tree | select Project
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		 get-tree | select Project
-    		get-button "Save Project" | click
-    	}
-    }
-}
-
-get-editor "Control eMails" | click
-get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
-with [get-editor "Player John"] {
-    get-button "Add Entry" | get-property enablement | equals false | verify-true
-    get-button -after [get-label "EMails*"] -index 1 | get-property enablement | equals false | verify-true
-    get-button -after [get-label "EMails*"] -index 2 | get-property enablement | equals false | verify-true
-    get-button -after [get-label "EMails*"] -index 3 | get-property enablement | equals false | verify-true
+try {
+	get-editor Game | close
+	get-editor "Player John" | click
+	get-editor Matchup | close
+	get-editor "Tournament Amateur" | close
+	get-editor "Player John" | close
+	get-editor View | get-button "Link Root EClas" | click
+	get-window "Select an EClass." | get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]" 
+	    | double-click
+	get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
+	with [get-window -class SelectAttributesDialog] {
+	    get-table | get-item "eMails : EString" | check
+	    get-button OK | click
+	}
+	
+	
+	
+	get-view "Model Explorer" | get-tree | select "Project/View/Control eMails" | double-click
+	get-editor "Control eMails" | get-button -after [get-label Readonly] | check
+	with [get-view "Model Explorer"] {
+	    get-tree | select Project
+	   try {
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		 get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		 get-tree | select Project
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	}
+	
+	get-editor "Control eMails" | click
+	get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
+	with [get-editor "Player John"] {
+	    get-button "Add Entry" | get-property enablement | equals false | verify-true
+	    get-button -after [get-label "EMails*"] -index 1 | get-property enablement | equals false | verify-true
+	    get-button -after [get-label "EMails*"] -index 2 | get-property enablement | equals false | verify-true
+	    get-button -after [get-label "EMails*"] -index 3 | get-property enablement | equals false | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+	    get-tree | select Project
+	    get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/AndEnableRule.test b/tests/ECPQ7Tests/Rules/AndEnableRule.test
index ec0ed06857..a8649e95e1 100644
--- a/tests/ECPQ7Tests/Rules/AndEnableRule.test
+++ b/tests/ECPQ7Tests/Rules/AndEnableRule.test
@@ -7,99 +7,120 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _ERkLYHlSEeOByOq_5szdNw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 6:22 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-editor Player | close
-with [get-editor View] {
-    click
-    close
-}
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "And Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-get-editor "Leaf Condition test" | close
-get-editor "And Condition" | close
-get-editor "Enable Rule false" | close
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "isProfessional : EBoolean"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text true
-    get-button OK | click
-}
-get-editor "Leaf Condition true" | close
-with [get-view "Model Explorer"] {
-    try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-    get-tree | select "Model/Player" | double-click
-}
-with [get-editor Player] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
-}
-get-editor Player | get-button -after [get-label "Is Professional"] | check
-with [get-editor Player] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
-}
-with [get-editor Player] {
-    get-button -after [get-label "Is Professional"] | uncheck
-    get-editbox -after [get-label Name] | set-text test
-    get-editbox -after [get-label Height] | click-text 1
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
-}
-get-editor "Player test" | get-button -after [get-label "Is Professional"] | check
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+try {
+	get-editor Player | close
+	with [get-editor View] {
+	    click
+	    close
+	}
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "And Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition test" | close
+	get-editor "And Condition" | close
+	get-editor "Enable Rule false" | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/And Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "isProfessional : EBoolean"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text true
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition true" | close
+	with [get-view "Model Explorer"] {
+	    try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	    get-tree | select "Model/Player" | double-click
+	}
+	with [get-editor Player] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+	get-editor Player | get-button -after [get-label "Is Professional"] | check
+	with [get-editor Player] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+	with [get-editor Player] {
+	    get-button -after [get-label "Is Professional"] | uncheck
+	    get-editbox -after [get-label Name] | set-text test
+	    get-editbox -after [get-label Height] | click-text 1
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+	get-editor "Player test" | get-button -after [get-label "Is Professional"] | check
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/AndOrEnableRule.test b/tests/ECPQ7Tests/Rules/AndOrEnableRule.test
index e94707bf31..50f76b7195 100644
--- a/tests/ECPQ7Tests/Rules/AndOrEnableRule.test
+++ b/tests/ECPQ7Tests/Rules/AndOrEnableRule.test
@@ -7,162 +7,183 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _oHNjkHlTEeOByOq_5szdNw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 6:35 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "Or Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "And Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
-        | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-get-editor "Leaf Condition test" | close
-get-editor "And Condition" | close
-get-editor "Or Condition" | close
-get-editor "Enable Rule false" | close
-get-editor Player | close
-get-editor View | close
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
-        | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "isProfessional : EBoolean"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text true
-    get-button OK | click
-}
-get-editor "Leaf Condition true" | close
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "And Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
-        -index 1] | get-menu "Leaf Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
-        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "height : EDouble"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    with [get-editbox 
-        -after [get-label "The value must be parseable by the Double class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."]] {
-        set-text "5.5"
-    }
-    get-button OK | click
-}
-get-editor "Leaf Condition 5.5" | close
-get-editor "And Condition" | close
-with [get-view "Model Explorer" | get-tree] {
-    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
-        -index 1] | get-menu "Leaf Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
-        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-get-window "Select a EStructuralFeature" | get-tree | select "numberOfVictories : EInt" | double-click
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Integer class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text 6
-    get-button OK | click
-}
-get-editor "Leaf Condition 6" | close
-with [get-view "Model Explorer"] {
-   try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-    get-tree | select "Model/Player" | double-click
-}
-with [get-editor Player] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
-}
-with [get-editor Player] {
-    get-button -after [get-label "Is Professional"] | check
-    get-editbox -after [get-label Name] | set-text test
-    get-editbox -after [get-label "Number Of Victories"] | click-text 1
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
-}
-with [get-editor "Player test"] {
-    get-button -after [get-label "Is Professional"] | uncheck
-    get-editbox -after [get-label Name] | set-text ""
-    get-editbox -after [get-label "Number Of Victories"] | click-text 1
-}
-with [get-editor Player] {
-    get-editbox -after [get-label "Number Of Victories"] | set-text 6
-    get-editbox -after [get-label Height] | set-text "5.5"
-    get-editbox -after [get-label "Number Of Victories"] | click-text 1
-}
-with [get-editor Player] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
-}
-with [get-editor Player] {
-    get-button -after [get-label "Is Professional"] | check
-    get-editbox -after [get-label Name] | set-text test
-    get-editbox -after [get-label "Number Of Victories"] | click-text 1
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
-}
-with [get-editor "Player test"] {
-    get-button -after [get-label "Is Professional"] | uncheck
-    get-editbox -after [get-label "Number Of Victories"] | set-text 7
-    get-editbox -after [get-label Height] | click-text 1
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+try {
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "Or Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "And Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
+	        | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition test" | close
+	get-editor "And Condition" | close
+	get-editor "Or Condition" | close
+	get-editor "Enable Rule false" | close
+	get-editor Player | close
+	get-editor View | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
+	        | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/And Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "isProfessional : EBoolean"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text true
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition true" | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "And Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1] | get-menu "Leaf Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "height : EDouble"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    with [get-editbox 
+	        -after [get-label "The value must be parseable by the Double class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."]] {
+	        set-text "5.5"
+	    }
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition 5.5" | close
+	get-editor "And Condition" | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1] | get-menu "Leaf Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	get-window "Select a EStructuralFeature" | get-tree | select "numberOfVictories : EInt" | double-click
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Integer class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text 6
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition 6" | close
+	with [get-view "Model Explorer"] {
+	   try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	    get-tree | select "Model/Player" | double-click
+	}
+	with [get-editor Player] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+	with [get-editor Player] {
+	    get-button -after [get-label "Is Professional"] | check
+	    get-editbox -after [get-label Name] | set-text test
+	    get-editbox -after [get-label "Number Of Victories"] | click-text 1
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+	with [get-editor "Player test"] {
+	    get-button -after [get-label "Is Professional"] | uncheck
+	    get-editbox -after [get-label Name] | set-text ""
+	    get-editbox -after [get-label "Number Of Victories"] | click-text 1
+	}
+	with [get-editor Player] {
+	    get-editbox -after [get-label "Number Of Victories"] | set-text 6
+	    get-editbox -after [get-label Height] | set-text "5.5"
+	    get-editbox -after [get-label "Number Of Victories"] | click-text 1
+	}
+	with [get-editor Player] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+	with [get-editor Player] {
+	    get-button -after [get-label "Is Professional"] | check
+	    get-editbox -after [get-label Name] | set-text test
+	    get-editbox -after [get-label "Number Of Victories"] | click-text 1
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+	with [get-editor "Player test"] {
+	    get-button -after [get-label "Is Professional"] | uncheck
+	    get-editbox -after [get-label "Number Of Victories"] | set-text 7
+	    get-editbox -after [get-label Height] | click-text 1
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/AndOrShowRule.test b/tests/ECPQ7Tests/Rules/AndOrShowRule.test
index 89bb6e7186..9873a4dfb4 100644
--- a/tests/ECPQ7Tests/Rules/AndOrShowRule.test
+++ b/tests/ECPQ7Tests/Rules/AndOrShowRule.test
@@ -7,181 +7,202 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _0IvOAHlOEeOByOq_5szdNw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 6:07 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
-    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "Or Condition" | click
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "And Condition" | click
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
-        | click
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
-        | click
-    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition" 
-        | get-item "Leaf Condition" -index 1] | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" -index 1 | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "isProfessional : EBoolean"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" -index 1 | close
-get-editor "Leaf Condition" | close
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | close
-get-editor "And Condition" | close
-get-editor "Or Condition" | close
-get-editor "Show Rule false" | close
-get-editor Player | close
-get-editor View | close
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition" | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-get-editor "Leaf Condition test" | close
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition/Feature Path Domain Model Reference" 
-    | double-click
-get-editor "Feature Path Domain Model Reference" | close
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition" | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text true
-    get-button OK | click
-}
-get-editor "Leaf Condition true" | close
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "And Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
-        -index 1] | get-menu "Leaf Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
-        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "height : EDouble"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | close
-get-editor "And Condition" | close
-get-view "Model Explorer" | get-tree | select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" 
-    | get-item "And Condition" -index 1 | get-item "Leaf Condition"] | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Double class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text "5.5"
-    get-button OK | click
-}
-get-editor "Leaf Condition 5.5" | close
-with [get-view "Model Explorer" | get-tree] {
-    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
-        -index 1] | get-menu "Leaf Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
-        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "numberOfVictories : EInt"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | close
-get-view "Model Explorer" | get-tree | select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" 
-    | get-item "And Condition" -index 1 | get-item "Leaf Condition 5.5"] | double-click
-get-editor "Leaf Condition 5.5" | close
-get-view "Model Explorer" | get-tree | select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" 
-    | get-item "And Condition" -index 1 | get-item "Leaf Condition"] | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Integer class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text 6
-    get-button OK | click
-}
-get-editor "Leaf Condition 6" | close
-with [get-view "Model Explorer"] {
-    try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-    get-tree | select "Model/Player" | double-click
-}
-with [get-editor Player] {
-    get-button -after [get-label "Is Professional"] | check
-    with [get-editbox -after [get-label Name]] {
-        set-text test
-        key-type "TRAVERSE_TAB_NEXT"
-    }
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
-}
-with [get-editor "Player test"] {
-    get-button -after [get-label "Is Professional"] | uncheck
-    get-editbox -after [get-label Name] | set-text ""
-    get-editbox -after [get-label Height] | click-text 1
-}
-with [get-editor Player] {
-    get-editbox -after [get-label Height] | set-text "5.5"
-    with [get-editbox -after [get-label "Number Of Victories"]] {
-        set-text 6
-        key-type "TRAVERSE_TAB_NEXT"
-    }
-}
-with [get-editor Player] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
-}
-with [get-editor Player] {
-    get-editbox -after [get-label "Number Of Victories"] | set-text 7
-    get-editbox -after [get-label Height] | click-text 1
-    get-button -after [get-label "Is Professional"] | check
-    get-editbox -after [get-label Name] | set-text test
-    get-editbox -after [get-label Height] | click-text 1
-}
-with [get-editor "Player test"] {
-    get-editbox -after [get-label "Number Of Victories"] | set-text 6
-    get-editbox -after [get-label Height] | click-text 1
-    get-editbox -after [get-label Name] | click-text 5
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+try {
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "Or Condition" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "And Condition" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
+	        | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition" | get-menu "Leaf Condition" 
+	        | click
+	    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition" 
+	        | get-item "Leaf Condition" -index 1] | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" -index 1 | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "isProfessional : EBoolean"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" -index 1 | close
+	get-editor "Leaf Condition" | close
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | close
+	get-editor "And Condition" | close
+	get-editor "Or Condition" | close
+	get-editor "Show Rule false" | close
+	get-editor Player | close
+	get-editor View | close
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition" | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition test" | close
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition/Feature Path Domain Model Reference" 
+	    | double-click
+	get-editor "Feature Path Domain Model Reference" | close
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/And Condition/Leaf Condition" | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text true
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition true" | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "And Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1] | get-menu "Leaf Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "height : EDouble"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | close
+	get-editor "And Condition" | close
+	get-view "Model Explorer" | get-tree | select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" 
+	    | get-item "And Condition" -index 1 | get-item "Leaf Condition"] | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Double class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text "5.5"
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition 5.5" | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1] | get-menu "Leaf Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "And Condition" 
+	        -index 1 | get-item "Leaf Condition"] | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "numberOfVictories : EInt"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | close
+	get-view "Model Explorer" | get-tree | select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" 
+	    | get-item "And Condition" -index 1 | get-item "Leaf Condition 5.5"] | double-click
+	get-editor "Leaf Condition 5.5" | close
+	get-view "Model Explorer" | get-tree | select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" 
+	    | get-item "And Condition" -index 1 | get-item "Leaf Condition"] | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Integer class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text 6
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition 6" | close
+	with [get-view "Model Explorer"] {
+	    try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	    get-tree | select "Model/Player" | double-click
+	}
+	with [get-editor Player] {
+	    get-button -after [get-label "Is Professional"] | check
+	    with [get-editbox -after [get-label Name]] {
+	        set-text test
+	        key-type "TRAVERSE_TAB_NEXT"
+	    }
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+	with [get-editor "Player test"] {
+	    get-button -after [get-label "Is Professional"] | uncheck
+	    get-editbox -after [get-label Name] | set-text ""
+	    get-editbox -after [get-label Height] | click-text 1
+	}
+	with [get-editor Player] {
+	    get-editbox -after [get-label Height] | set-text "5.5"
+	    with [get-editbox -after [get-label "Number Of Victories"]] {
+	        set-text 6
+	        key-type "TRAVERSE_TAB_NEXT"
+	    }
+	}
+	with [get-editor Player] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+	with [get-editor Player] {
+	    get-editbox -after [get-label "Number Of Victories"] | set-text 7
+	    get-editbox -after [get-label Height] | click-text 1
+	    get-button -after [get-label "Is Professional"] | check
+	    get-editbox -after [get-label Name] | set-text test
+	    get-editbox -after [get-label Height] | click-text 1
+	}
+	with [get-editor "Player test"] {
+	    get-editbox -after [get-label "Number Of Victories"] | set-text 6
+	    get-editbox -after [get-label Height] | click-text 1
+	    get-editbox -after [get-label Name] | click-text 5
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/AndShowRule.test b/tests/ECPQ7Tests/Rules/AndShowRule.test
index f26bca34dd..b74ab6763d 100644
--- a/tests/ECPQ7Tests/Rules/AndShowRule.test
+++ b/tests/ECPQ7Tests/Rules/AndShowRule.test
@@ -7,95 +7,116 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _8VDPgHlLEeOByOq_5szdNw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 5:43 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
-    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "And Condition" | click
-    select "Project/View/Control dateOfBirth/Show Rule false/And Condition" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Show Rule false/And Condition" | get-menu "Leaf Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Show Rule false/And Condition" | get-item "Leaf Condition" 
-        -index 1] | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" -index 1 | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "isProfessional : EBoolean"
-    get-button OK | click
-}
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" | double-click
-get-editor "Leaf Condition" | close
-with [get-tab-folder -index 1] {
-    double-click
-    double-click
-}
-get-editor "Feature Path Domain Model Reference" -index 1 | close
-get-editor "Leaf Condition" | close
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "And Condition" | close
-get-editor "Show Rule false" | close
-get-editor Player | close
-get-editor View | close
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-get-editor "Leaf Condition test" | close
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text true
-    get-button OK | click
-}
-with [get-view "Model Explorer"] {
-    try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-}
-get-editor "Leaf Condition true" | close
-get-view "Model Explorer" | get-tree | select "Model/Player" | double-click
-with [get-editor Player] {
-    get-button -after [get-label "Is Professional"] | check
-    with [get-editbox -after [get-label Name]] {
-        set-text test
-    }
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+try {
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "And Condition" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/And Condition" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Show Rule false/And Condition" | get-menu "Leaf Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Show Rule false/And Condition" | get-item "Leaf Condition" 
+	        -index 1] | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" -index 1 | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "isProfessional : EBoolean"
+	    get-button OK | click
+	}
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" | double-click
+	get-editor "Leaf Condition" | close
+	with [get-tab-folder -index 1] {
+	    double-click
+	    double-click
+	}
+	get-editor "Feature Path Domain Model Reference" -index 1 | close
+	get-editor "Leaf Condition" | close
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "And Condition" | close
+	get-editor "Show Rule false" | close
+	get-editor Player | close
+	get-editor View | close
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition test" | close
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/And Condition/Leaf Condition" | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text true
+	    get-button OK | click
+	}
+	with [get-view "Model Explorer"] {
+	    try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	}
+	get-editor "Leaf Condition true" | close
+	get-view "Model Explorer" | get-tree | select "Model/Player" | double-click
+	with [get-editor Player] {
+	    get-button -after [get-label "Is Professional"] | check
+	    with [get-editbox -after [get-label Name]] {
+	        set-text test
+	    }
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/OrEnableRule.test b/tests/ECPQ7Tests/Rules/OrEnableRule.test
index 44d746f096..dca6064612 100644
--- a/tests/ECPQ7Tests/Rules/OrEnableRule.test
+++ b/tests/ECPQ7Tests/Rules/OrEnableRule.test
@@ -7,95 +7,116 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _2Ozl0HlSEeOByOq_5szdNw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 6:28 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "Or Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-get-editor "Leaf Condition test" | close
-get-editor "Or Condition" | close
-get-editor "Enable Rule false" | close
-get-editor Player | close
-get-editor View | close
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "isProfessional : EBoolean"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text true
-    get-button OK | click
-}
-with [get-view "Model Explorer"] {
-    try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-}
-get-editor "Leaf Condition true" | close
-get-view "Model Explorer" | get-tree | select "Model/Player" | double-click
-with [get-editor Player] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
-}
-get-editor Player | get-button -after [get-label "Is Professional"] | check
-with [get-editor Player] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
-}
-with [get-editor Player] {
-    get-button -after [get-label "Is Professional"] | uncheck
-    get-editbox -after [get-label Name] | set-text test
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
-}
-get-editor "Player test" | get-button -after [get-label "Is Professional"] | check
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+try {
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "Or Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition test" | close
+	get-editor "Or Condition" | close
+	get-editor "Enable Rule false" | close
+	get-editor Player | close
+	get-editor View | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Or Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "isProfessional : EBoolean"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text true
+	    get-button OK | click
+	}
+	with [get-view "Model Explorer"] {
+	    try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	}
+	get-editor "Leaf Condition true" | close
+	get-view "Model Explorer" | get-tree | select "Model/Player" | double-click
+	with [get-editor Player] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+	get-editor Player | get-button -after [get-label "Is Professional"] | check
+	with [get-editor Player] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+	with [get-editor Player] {
+	    get-button -after [get-label "Is Professional"] | uncheck
+	    get-editbox -after [get-label Name] | set-text test
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+	get-editor "Player test" | get-button -after [get-label "Is Professional"] | check
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/OrShowRule.test b/tests/ECPQ7Tests/Rules/OrShowRule.test
index be4d661f43..9f346baabb 100644
--- a/tests/ECPQ7Tests/Rules/OrShowRule.test
+++ b/tests/ECPQ7Tests/Rules/OrShowRule.test
@@ -7,103 +7,124 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _S7YtwHlNEeOByOq_5szdNw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 5:53 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-editor View | close
-get-editor Player | close
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
-    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "Or Condition" | click
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "Leaf Condition" | click
-    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "Leaf Condition" 
-        -index 1] | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" -index 1 | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "isProfessional : EBoolean"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" -index 1 | close
-get-editor "Leaf Condition" | close
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Leaf Condition" | close
-get-editor "Or Condition" | close
-get-editor "Show Rule false" | close
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/Leaf Condition" | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-get-editor "Leaf Condition test" | close
-get-view "Model Explorer" | get-tree 
-    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/Leaf Condition" | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text true
-    get-button OK | click
-}
-get-editor "Leaf Condition true" | close
-with [get-view "Model Explorer"] {
-     try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-    get-tree | select "Model/Player" | double-click
-}
-with [get-editor Player | get-editbox -after [get-label Name]] {
-    set-text test
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
-}
-with [get-editor "Player test" | get-editbox -after [get-label Name]] {
-    set-text ""
-}
-get-editor Player | get-button -after [get-label "Is Professional"] | check
-with [get-editor Player] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
-}
-with [get-editor Player] {
-    get-button -after [get-label "Is Professional"] | uncheck
-    get-editbox -after [get-label Name] | set-text test
-}
-get-editor "Player test" | get-button -after [get-label "Is Professional"] | check
-with [get-editor "Player test"] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+try {
+	get-editor View | close
+	get-editor Player | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "Or Condition" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-menu "Leaf Condition" | click
+	    select [get-item "Project/View/Control dateOfBirth/Show Rule false/Or Condition" | get-item "Leaf Condition" 
+	        -index 1] | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" -index 1 | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "isProfessional : EBoolean"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" -index 1 | close
+	get-editor "Leaf Condition" | close
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Leaf Condition" | close
+	get-editor "Or Condition" | close
+	get-editor "Show Rule false" | close
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/Leaf Condition" | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition test" | close
+	get-view "Model Explorer" | get-tree 
+	    | select "Project/View/Control dateOfBirth/Show Rule false/Or Condition/Leaf Condition" | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the Boolean class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text true
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition true" | close
+	with [get-view "Model Explorer"] {
+	     try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	    get-tree | select "Model/Player" | double-click
+	}
+	with [get-editor Player | get-editbox -after [get-label Name]] {
+	    set-text test
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+	with [get-editor "Player test" | get-editbox -after [get-label Name]] {
+	    set-text ""
+	}
+	get-editor Player | get-button -after [get-label "Is Professional"] | check
+	with [get-editor Player] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+	with [get-editor Player] {
+	    get-button -after [get-label "Is Professional"] | uncheck
+	    get-editbox -after [get-label Name] | set-text test
+	}
+	get-editor "Player test" | get-button -after [get-label "Is Professional"] | check
+	with [get-editor "Player test"] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/SimpleEnableRule.test b/tests/ECPQ7Tests/Rules/SimpleEnableRule.test
index af2a8d2bb4..c5d8ac6a33 100644
--- a/tests/ECPQ7Tests/Rules/SimpleEnableRule.test
+++ b/tests/ECPQ7Tests/Rules/SimpleEnableRule.test
@@ -7,71 +7,93 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _6WrsEHlQEeOByOq_5szdNw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 6:16 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Enable Rule false/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-editor "Enable Rule false" | close
-get-editor Player | close
-get-editor View | close
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-get-editor "Leaf Condition test" | close
-with [get-view "Model Explorer"] {
-   try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-    get-tree | select "Model/Player" | double-click
-}
 
-with [get-editor Player] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
-}
-with [get-editor Player | get-editbox -after [get-label Name]] {
-    set-text test
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property enablement | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
-}
-with [get-editor "Player test" | get-editbox -after [get-label Name]] {
-    set-text test1
-}
-with [get-editor "Player test1"] {
-    get-date-time | get-property enablement | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+try {
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Enable Rule" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Enable Rule false/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-editor "Enable Rule false" | close
+	get-editor Player | close
+	get-editor View | close
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	get-editor "Leaf Condition test" | close
+	with [get-view "Model Explorer"] {
+	   try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	    get-tree | select "Model/Player" | double-click
+	}
+	
+	with [get-editor Player] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+	with [get-editor Player | get-editbox -after [get-label Name]] {
+	    set-text test
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property enablement | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals true | verify-true
+	}
+	with [get-editor "Player test" | get-editbox -after [get-label Name]] {
+	    set-text test1
+	}
+	with [get-editor "Player test1"] {
+	    get-date-time | get-property enablement | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property enablement | equals false | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Rules/SimpleShowRule.test b/tests/ECPQ7Tests/Rules/SimpleShowRule.test
index b30704f7c6..2272ccb6f5 100644
--- a/tests/ECPQ7Tests/Rules/SimpleShowRule.test
+++ b/tests/ECPQ7Tests/Rules/SimpleShowRule.test
@@ -7,72 +7,93 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _4RLuQHlHEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 5:31 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:43 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-editor Player | close
-get-editor View | close
-with [get-view "Model Explorer" | get-tree] {
-    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
-    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "Leaf Condition" | click
-    select "Project/View/Control dateOfBirth/Show Rule false/Leaf Condition" 
-        | get-menu "Feature Path Domain Model Reference" | click
-}
-get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
-with [get-window "Select a EStructuralFeature"] {
-    get-tree | select "name : EString"
-    get-button OK | click
-}
-get-view "Model Explorer" | get-tree | select "Project/View/Control dateOfBirth/Show Rule false/Leaf Condition" 
-    | double-click
-get-editor "Leaf Condition" | get-button "Select Object" | click
-with [get-window "Insert the value"] {
-    get-editbox 
-        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
-        | set-text test
-    get-button OK | click
-}
-with [get-view "Model Explorer"] {
-    
-    try {
-		get-tree | select "Project/View"
-    	get-button "Save Project" | click
-    } -catch {
-    	wait 1000
-    	try {
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	} -catch {
-    		wait 1000
-    		get-tree | select "Project/View"
-    		get-button "Save Project" | click
-    	}
-    }
-}
-get-editor "Show Rule false" | close
-with [get-editor "Leaf Condition test"] {
-    click
-    close
-}
-get-editor "Feature Path Domain Model Reference" | close
-get-view "Model Explorer" | get-tree | select "Model/Player" | double-click
-with [get-editor Player] {
 try {
-    get-date-time | get-property "isVisible()" | equals false | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals false | verify-true
-    } -catch {
-    }
-}
-with [get-editor Player | get-editbox -after [get-label Name]] {
-    set-text test
-}
-with [get-editor "Player test"] {
-    get-date-time | get-property "isVisible()" | equals true | verify-true
-    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	get-editor Player | close
+	get-editor View | close
+	with [get-view "Model Explorer" | get-tree] {
+	    select "Project/View/Control dateOfBirth" | get-menu "Show Rule" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false" | get-menu "Leaf Condition" | click
+	    select "Project/View/Control dateOfBirth/Show Rule false/Leaf Condition" 
+	        | get-menu "Feature Path Domain Model Reference" | click
+	}
+	get-editor "Feature Path Domain Model Reference" | get-button "Link Domain Model EFeature" | click
+	with [get-window "Select a EStructuralFeature"] {
+	    get-tree | select "name : EString"
+	    get-button OK | click
+	}
+	get-view "Model Explorer" | get-tree | select "Project/View/Control dateOfBirth/Show Rule false/Leaf Condition" 
+	    | double-click
+	get-editor "Leaf Condition" | get-button "Select Object" | click
+	with [get-window "Insert the value"] {
+	    get-editbox 
+	        -after [get-label "The value must be parseable by the String class. For a double value please use the #.# format. For boolean values \'true\' or \'false\'."] 
+	        | set-text test
+	    get-button OK | click
+	}
+	with [get-view "Model Explorer"] {
+	    
+	    try {
+			get-tree | select "Project"
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select "Project"
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	}
+	get-editor "Show Rule false" | close
+	with [get-editor "Leaf Condition test"] {
+	    click
+	    close
+	}
+	get-editor "Feature Path Domain Model Reference" | close
+	get-view "Model Explorer" | get-tree | select "Model/Player" | double-click
+	with [get-editor Player] {
+	try {
+	    get-date-time | get-property "isVisible()" | equals false | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals false | verify-true
+	    } -catch {
+	    }
+	}
+	with [get-editor Player | get-editbox -after [get-label Name]] {
+	    set-text test
+	}
+	with [get-editor "Player test"] {
+	    get-date-time | get-property "isVisible()" | equals true | verify-true
+	    get-date-time -after [get-label "Date Of Birth"] -index 1 | get-property "isVisible()" | equals true | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	get-editor View | get-button "Delete Reference" | click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Validation/HeightValidation.test b/tests/ECPQ7Tests/Validation/HeightValidation.test
index e7b27ac985..b1dfc00792 100644
--- a/tests/ECPQ7Tests/Validation/HeightValidation.test
+++ b/tests/ECPQ7Tests/Validation/HeightValidation.test
@@ -7,8 +7,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _O_M0kXkXEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 12:08 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 10:10 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -22,7 +22,7 @@ with [get-window "Create Project"] {
 }
 get-view "Model Explorer" | get-tree | select Project | get-menu "New Model Element" | click
 with [get-window "Add new model element"] {
-    get-tree | select "bowling/Player"
+    try { get-tree | select "Player" } -catch { get-tree | select "bowling/Player" }
     get-button Finish | click
 }
 with [get-editor Player] {
@@ -35,17 +35,16 @@ with [get-editor Player] {
 
 with [get-editor Player] {
     get-editbox -after [get-label Height] | get-property backgroundColor | equals "#FF0000" | verify-true
-    get-label -after [get-label Height] | get-property "image.path" | contains "icons/validation_error.png" 
-        | verify-true
+    get-label -after [get-label Height] | get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
     get-label -after [get-label Height] | get-property "getToolTipText()" 
     | contains "Height seems too big." | verify-true
 }
 
-get-view "Model Explorer" | get-tree | get-item "Project/Player" | get-property "image.decorations[0].path" 
-    | contains "icons/error_decorate.png" | verify-true
-
-get-view "Model Explorer" | get-tree | get-item Project | get-property "image.decorations[0].path" 
-    | contains "icons/error_decorate.png" | verify-true
+//get-view "Model Explorer" | get-tree | get-item "Project/Player" | get-property "image.decorations[0].path" 
+//    | contains "icons/error_decorate.png" | verify-true
+//
+//get-view "Model Explorer" | get-tree | get-item Project | get-property "image.decorations[0].path" 
+//    | contains "icons/error_decorate.png" | verify-true
 
  
 with [get-editor Player] {
diff --git a/tests/ECPQ7Tests/Validation/LowerBoundValidation.test b/tests/ECPQ7Tests/Validation/LowerBoundValidation.test
index 3b0699ca63..8725ec9185 100644
--- a/tests/ECPQ7Tests/Validation/LowerBoundValidation.test
+++ b/tests/ECPQ7Tests/Validation/LowerBoundValidation.test
@@ -8,7 +8,7 @@ Element-Version: 3.0
 External-Reference: 
 Id: _QmLsUTzFEeOuuLJi0j5Xuw
 Q7-Runtime-Version: 1.3.10.201312200736
-Save-Time: 2/3/14 2:49 PM
+Save-Time: 3/7/14 10:09 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -51,23 +51,18 @@ with [get-editor "Player John" | get-label -after [get-label "EMails*"]] {
     get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
 }
 
+//there is no more api for validation image decoration in q7 3.10
 //Validation Propogation to the Model Explorer Tree View
-get-view "Model Explorer" | get-tree | get-item "TestProject/Player John" | get-property "image.decorations[0].path" 
-    | contains "icons/error_decorate.png" | verify-true
-    
-get-view "Model Explorer" | get-tree | get-item TestProject | get-property "image.decorations[0].path" 
-    | contains "icons/error_decorate.png" | verify-true
-
-with [get-editor "Player John"] {
-    get-button "Add Entry" | click
-    get-editbox -after [get-label "EMails*"] | set-text "john@smith.de"
-}
-/*
-get-editor "Player John" | get-button -after [get-label "EMails*"] -index 1 | click
-get-editor "Player John" | get-label -after [get-label "EMails*"] | get-property "image.path" 
-    | contains "icons/validation_error.png" | verify-false
-    
-    */
+//get-view "Model Explorer" | get-tree | get-item "TestProject/Player John" | get-property "image.decorations[0].path" -raw 
+//    | contains "icons/error_decorate.png" | verify-true
+//    
+//get-view "Model Explorer" | get-tree | get-item TestProject | get-property "image.decorations[0].path" 
+//    | contains "icons/error_decorate.png" | verify-true
+//
+//with [get-editor "Player John"] {
+//    get-button "Add Entry" | click
+//    get-editbox -after [get-label "EMails*"] | set-text "john@smith.de"
+//}
     
 } -finally {
 get-view "Model Explorer" | get-tree | select "Project/View"
diff --git a/tests/ECPQ7Tests/Validation/ReferenceValidation.test b/tests/ECPQ7Tests/Validation/ReferenceValidation.test
index c08e50a2c8..f727b03941 100644
--- a/tests/ECPQ7Tests/Validation/ReferenceValidation.test
+++ b/tests/ECPQ7Tests/Validation/ReferenceValidation.test
@@ -7,31 +7,30 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _CIRsAHlEEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 4:47 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 10:12 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
 Content-Type: text/ecl
 Entry-Name: .content
 
-get-editor View | get-label -after [get-label "Root EClass*"] | get-property "image.path" 
-    | contains "icons/validation_error.png" | verify-true
-get-editor View | get-button "Link Root EClas" | click
-with [get-window "Select an EClass."] {
-    get-tree | select "bowling/Referee \\[org.eclipse.emf.emfstore.bowling.Referee\\]"
-    get-button OK | click
-}
-get-editor View | get-label -after [get-label "Root EClass*"] | get-property "getToolTipText()" | equals "" 
-    | verify-true
-get-editor View | get-button "Delete Reference" | click
-with [get-editor View | get-label -after [get-label "Root EClass*"]] {
-    get-property "image.path" | contains "icons/validation_error.png" | verify-true
-    get-property "getToolTipText()" | contains "must be set" | verify-true
-}
-with [get-view "Model Explorer" | get-tree] {
-    get-item "Project/View" | get-property "image.decorations[0].path" | contains "icons/error_decorate.png" 
-        | verify-true
-    get-item Project | get-property "image.decorations[0].path" | contains "icons/error_decorate.png" | verify-true
-}
+	get-editor View | get-label -after [get-label "Root EClass*"] | get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
+	get-editor View | get-button "Link Root EClas" | click
+	with [get-window "Select an EClass."] {
+	    get-tree | select "bowling/Referee \\[org.eclipse.emf.emfstore.bowling.Referee\\]"
+	    get-button OK | click
+	}
+	get-editor View | get-label -after [get-label "Root EClass*"] | get-property "getToolTipText()" | equals "" 
+	    | verify-true
+	get-editor View | get-button "Delete Reference" | click
+	with [get-editor View | get-label -after [get-label "Root EClass*"]] {
+	    get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
+	    get-property "getToolTipText()" | contains "must be set" | verify-true
+	}
+//	with [get-view "Model Explorer" | get-tree] {
+//	    get-item "Project/View" | get-property "image.decorations[0].path" | contains "icons/error_decorate.png" 
+//	        | verify-true
+//	    get-item Project | get-property "image.decorations[0].path" | contains "icons/error_decorate.png" | verify-true
+//	}
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/Validation/UpperBoundValidation.test b/tests/ECPQ7Tests/Validation/UpperBoundValidation.test
index ba8c19fec2..205de02781 100644
--- a/tests/ECPQ7Tests/Validation/UpperBoundValidation.test
+++ b/tests/ECPQ7Tests/Validation/UpperBoundValidation.test
@@ -7,8 +7,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _JxwwQHkgEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 12:27 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 10:13 AM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -21,16 +21,16 @@ with [get-window "Create Project"] {
     get-button Finish | click
 }
 get-view "Model Explorer" | get-tree | select Project | get-menu "New Model Element" | click
-get-window "Add new model element" | get-tree | select "bowling/Matchup" | double-click
+get-window "Add new model element" | try { get-tree | select "Matchup" } -catch { get-tree | select "bowling/Matchup" } | double-click
 
 with [get-editor Matchup | get-label -after [get-label Games]] {
-    get-property "image.path" | contains "icons/validation_error.png" | verify-true
+    get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
     get-property "getToolTipText()" | contains "with 0 values must have at least 2 values" | verify-true
 }    
 
 get-editor Matchup | get-button "Add an instance of Game" | click
 with [get-editor Matchup | get-label -after [get-label Games]] {
-    get-property "image.path" | contains "icons/validation_error.png" | verify-true
+    get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
     get-property "getToolTipText()" | contains "with 1 values must have at least 2 values" | verify-true
 }
 get-editor Matchup | get-button "Add an instance of Game" | click
diff --git a/tests/ECPQ7Tests/ViewEditorControls/GenerateControls.test b/tests/ECPQ7Tests/ViewEditorControls/GenerateControls.test
new file mode 100644
index 0000000000..13e1781aa5
--- /dev/null
+++ b/tests/ECPQ7Tests/ViewEditorControls/GenerateControls.test
@@ -0,0 +1,115 @@
+--- Q7 testcase ---
+Format-Version: 1.0
+Q7-vendor: www.xored.com/q7
+Contexts: _mY5uUKEgEeKX8e34E6tWIg,_rr2EEFpSEeKcnaHGSt8OwA,_IuFcgFpZEeKcnaHGSt8OwA,_f3qEUVpSEeKcnaHGSt8OwA,_fQ0PgDsqEeOHj9Cw0T_k4Q,_T7Yg8DstEeOHj9Cw0T_k4Q
+Element-Name: GenerateControls
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _ZzQNgYQOEeO0WrMxvPcxtw
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/7/14 9:44 AM
+Testcase-Type: ecl
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+try {
+	get-editor "Player John" | close
+	get-editor Game | close
+	get-editor Matchup | close
+	get-editor "Tournament Amateur" | close
+	get-editor View | get-button "Link Root EClas" | click
+	get-window "Select an EClass." | get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]" 
+	    | double-click
+	get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
+	with [get-window -class SelectAttributesDialog] {
+	    with [get-table] {
+	        get-item "name : EString" | check
+	        get-item "isProfessional : EBoolean" | check
+	        get-item "gender : Gender" | check
+	    }
+	    get-button OK | click
+	}
+	with [get-view "Model Explorer" | get-tree] {
+	    get-item "Project/View/Control name" | get-property caption | contains name | verify-true
+	    get-item "Project/View/Control name" | get-property childCount | equals 1 | verify-true
+	    get-item "Project/View/Control gender" | get-property caption | contains gender | verify-true
+	    get-item "Project/View/Control gender" | get-property childCount | equals 1 | verify-true
+	    get-item "Project/View/Control isProfessional" | get-property caption | contains isProfessional | verify-true
+	    get-item "Project/View/Control isProfessional" | get-property childCount | equals 1 | verify-true
+	}
+	get-view "Model Explorer" | get-tree | select "Project/View/Control name/Feature Path Domain Model Reference" 
+	    | double-click
+	get-editor "Feature Path Domain Model Reference" | get-link "<a>name : EString</a>" | get-property toltip 
+	    | equals "name : EString" | verify-true
+	get-editor "Feature Path Domain Model Reference" | close
+	get-view "Model Explorer" | get-tree | select "Project/View/Control gender/Feature Path Domain Model Reference" 
+	    | double-click
+	get-editor "Feature Path Domain Model Reference" | get-link "<a>gender : Gender</a>" | get-property toltip 
+	    | equals "gender : Gender" | verify-true
+	get-editor "Feature Path Domain Model Reference" | close
+	get-view "Model Explorer" | get-tree | select "Project/View/Control isProfessional/Feature Path Domain Model Reference" 
+	    | double-click
+	get-editor "Feature Path Domain Model Reference" | get-link "<a>isProfessional : EBoolean</a>" | get-property toltip 
+	    | equals "isProfessional : EBoolean" | verify-true
+	get-editor "Feature Path Domain Model Reference" | close
+	with [get-view "Model Explorer"] {
+	    with [get-view "Model Explorer"] {
+		try {
+			get-tree | select Project
+	    	get-button "Save Project" | click
+	    } -catch {
+	    	wait 1000
+	    	try {
+	    		get-tree | select "Project/View"
+	    		get-button "Save Project" | click
+	    	} -catch {
+	    		wait 1000
+	    		get-tree | select Project
+	    		get-button "Save Project" | click
+	    	}
+	    }
+	}
+	    get-tree | select "TestProject/Player John" | double-click
+	}
+	
+	
+	get-editor "View" | close
+	get-view "Model Explorer" | get-tree | select "Project/View" | double-click
+	
+	
+	
+	get-editor "Player John" | close
+	get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
+	
+	with [get-editor "Player John"] {
+	    get-label Name | get-property caption | equals Name | verify-true
+	    get-editbox -after [get-label Name] | get-property text | equals John | verify-true
+	    get-label Gender | get-property caption | equals Gender | verify-true
+	    get-combo -after [get-label Gender] | get-property selection | equals Male | verify-true
+	    get-label "Is Professional" | get-property caption | equals "Is Professional" | verify-true
+	    get-button -after [get-label "Is Professional"] | get-property selected | equals true | verify-true
+	}
+} -finally {
+	get-view "Model Explorer" | get-tree | select "Project/View"
+	get-editor View | get-button "Delete Reference" | click | double-click
+	with [get-view "Model Explorer"] {
+		try {
+		get-tree | select Project
+		get-button "Save Project" | click
+		} -catch {
+			wait 1000
+			try {
+			get-tree | select "Project/View"
+			get-button "Save Project" | click
+			} -catch {
+				wait 1000
+				get-tree | select Project
+				get-button "Save Project" | click
+			}
+		}
+	}
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/ViewModel/GenerateControls.test b/tests/ECPQ7Tests/ViewModel/GenerateControls.test
deleted file mode 100644
index b119a888a9..0000000000
--- a/tests/ECPQ7Tests/ViewModel/GenerateControls.test
+++ /dev/null
@@ -1,80 +0,0 @@
---- Q7 testcase ---
-Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
-Contexts: _mY5uUKEgEeKX8e34E6tWIg,_rr2EEFpSEeKcnaHGSt8OwA,_IuFcgFpZEeKcnaHGSt8OwA,_f3qEUVpSEeKcnaHGSt8OwA,_fQ0PgDsqEeOHj9Cw0T_k4Q,_T7Yg8DstEeOHj9Cw0T_k4Q
-Element-Name: GenerateControls
-Element-Type: testcase
-Element-Version: 3.0
-External-Reference: 
-Id: _ZzQNgYQOEeO0WrMxvPcxtw
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/23/14 10:31 AM
-Testcase-Type: ecl
-
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
-Content-Type: text/ecl
-Entry-Name: .content
-
-get-editor "Player John" | close
-get-editor Game | close
-get-editor Matchup | close
-get-editor "Tournament Amateur" | close
-get-editor View | get-button "Link Root EClas" | click
-get-window "Select an EClass." | get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]" 
-    | double-click
-get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Generate Controls" | click
-with [get-window -class SelectAttributesDialog] {
-    with [get-table] {
-        get-item "name : EString" | check
-        get-item "isProfessional : EBoolean" | check
-        get-item "gender : Gender" | check
-    }
-    get-button OK | click
-}
-with [get-view "Model Explorer" | get-tree] {
-    get-item "Project/View/Control name" | get-property caption | contains name | verify-true
-    get-item "Project/View/Control name" | get-property childCount | equals 1 | verify-true
-    get-item "Project/View/Control gender" | get-property caption | contains gender | verify-true
-    get-item "Project/View/Control gender" | get-property childCount | equals 1 | verify-true
-    get-item "Project/View/Control isProfessional" | get-property caption | contains isProfessional | verify-true
-    get-item "Project/View/Control isProfessional" | get-property childCount | equals 1 | verify-true
-}
-get-view "Model Explorer" | get-tree | select "Project/View/Control name/Feature Path Domain Model Reference" 
-    | double-click
-get-editor "Feature Path Domain Model Reference" | get-link "<a>name : EString</a>" | get-property toltip 
-    | equals "name : EString" | verify-true
-get-editor "Feature Path Domain Model Reference" | close
-get-view "Model Explorer" | get-tree | select "Project/View/Control gender/Feature Path Domain Model Reference" 
-    | double-click
-get-editor "Feature Path Domain Model Reference" | get-link "<a>gender : Gender</a>" | get-property toltip 
-    | equals "gender : Gender" | verify-true
-get-editor "Feature Path Domain Model Reference" | close
-get-view "Model Explorer" | get-tree | select "Project/View/Control isProfessional/Feature Path Domain Model Reference" 
-    | double-click
-get-editor "Feature Path Domain Model Reference" | get-link "<a>isProfessional : EBoolean</a>" | get-property toltip 
-    | equals "isProfessional : EBoolean" | verify-true
-get-editor "Feature Path Domain Model Reference" | close
-with [get-view "Model Explorer"] {
-    get-tree | select Project
-    get-button "Save Project" | click
-    get-tree | select "TestProject/Player John" | double-click
-}
-
-
-get-editor "View" | close
-get-view "Model Explorer" | get-tree | select "Project/View" | double-click
-
-
-
-get-editor "Player John" | close
-get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
-
-with [get-editor "Player John"] {
-    get-label Name | get-property caption | equals Name | verify-true
-    get-editbox -after [get-label Name] | get-property text | equals John | verify-true
-    get-label Gender | get-property caption | equals Gender | verify-true
-    get-combo -after [get-label Gender] | get-property selection | equals Male | verify-true
-    get-label "Is Professional" | get-property caption | equals "Is Professional" | verify-true
-    get-button -after [get-label "Is Professional"] | get-property selected | equals true | verify-true
-}
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/context/SetupRuleModelObjects.ctx b/tests/ECPQ7Tests/context/SetupRuleModelObjects.ctx
index a8e252ff0b..4a5f32b595 100644
--- a/tests/ECPQ7Tests/context/SetupRuleModelObjects.ctx
+++ b/tests/ECPQ7Tests/context/SetupRuleModelObjects.ctx
@@ -6,8 +6,8 @@ Element-Name: SetupRuleModelObjects
 Element-Type: context
 Element-Version: 2.0
 Id: _ElgmoHlIEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 6:01 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/6/14 6:45 PM
 
 ------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
 Content-Type: text/ecl
@@ -20,7 +20,7 @@ with [get-window "Create Project"] {
 }
 get-view "Model Explorer" | get-tree | select Model | get-menu "New Model Element" | click
 with [get-window "Add new model element"] {
-    get-tree | select "bowling/Player"
+    try { get-tree | select "Player" } -catch { get-tree | select "bowling/Player" }
     get-button Finish | click
 }
 get-editor View | get-button "Link Root EClas" | click
diff --git a/tests/ECPQ7Tests/emfstore/Unset2.test b/tests/ECPQ7Tests/emfstore/Unset2.test
index 3931e43c94..6809c5f3be 100644
--- a/tests/ECPQ7Tests/emfstore/Unset2.test
+++ b/tests/ECPQ7Tests/emfstore/Unset2.test
@@ -7,8 +7,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _rtAI4HkvEeO9Ja8zvRhhOQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 1/9/14 3:38 PM
+Q7-Runtime-Version: 1.3.10.201312200736
+Save-Time: 3/6/14 6:42 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -22,7 +22,7 @@ with [get-window "Create Project"] {
 }
 get-view "Model Explorer" | get-tree | select UnsetTest | get-menu "New Model Element" | click
 with [get-window "Add new model element"] {
-    get-tree | select "bowling/Fan"
+    try { get-tree | select "Fan" } -catch { get-tree | select "bowling/Fan" }
     get-button Finish | click
 }
 with [get-editor Fan] {
@@ -210,4 +210,4 @@ with [get-editor Fan] {
         | equals "Unset number" | verify-true
     get-editbox -after [get-label "Money Spent On Tickets"] | get-property text | equals "0" | verify-true
 }
-------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
\ No newline at end of file
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--