diff --git a/rcpttTests/platform_tests/Contexts/DefaultContext/Edit/OpenDefaultContextFRomTestCase.test b/rcpttTests/platform_tests/Contexts/DefaultContext/Edit/OpenDefaultContextFRomTestCase.test
index 0b780b3..33a3a6c 100644
--- a/rcpttTests/platform_tests/Contexts/DefaultContext/Edit/OpenDefaultContextFRomTestCase.test
+++ b/rcpttTests/platform_tests/Contexts/DefaultContext/Edit/OpenDefaultContextFRomTestCase.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _ymiyse5IEeCU6db9MgIBkA,_18rr8K25EeCZfrGRg7GXDg
 Element-Name: OpenDefaultContextFromTestCase
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _dLrKoIozEeKGQoWjCaFDAw
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:04 PM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:40 AM
 Tags: Context, DefaultContext
 Testcase-Type: ecl
 
@@ -41,6 +40,8 @@
     click
     get-link "<a>Configure Project Default Contexts</a>" | click-link
 }
+//get-editor "q7project - Project Settings" | get-property active | equals true | verify-true
+//get-editor "simpleTest1" | get-property active | equals false | verify-true
 with [get-tab-folder -index 1] {
     get-property activePage | equals "q7project - Project Settings" | verify-true
     get-property tabCount | equals 2 | verify-true
diff --git a/rcpttTests/platform_tests/Contexts/Launch Context/Edit/EditTreeItems.test b/rcpttTests/platform_tests/Contexts/Launch Context/Edit/EditTreeItems.test
index 6c910a6..b555429 100644
--- a/rcpttTests/platform_tests/Contexts/Launch Context/Edit/EditTreeItems.test
+++ b/rcpttTests/platform_tests/Contexts/Launch Context/Edit/EditTreeItems.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _wFTf0KDsEeKGc-nsvHJqGA,_0_PAAKDoEeKGc-nsvHJqGA
 Element-Name: EditTreeItems
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _AFkykKD6EeKoB6XnDYclhw
-Q7-Runtime-Version: 1.5.0.qualifier
-Save-Time: 5/14/14 6:44 PM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:21 AM
 Tags: Context, LaunchContext
 Testcase-Type: ecl
 
@@ -46,9 +45,11 @@
         apply-cell-edit
     }
 }
-get-tab-folder -index 1 | get-property activePage | equals "*LaunchContextTest" | verify-true
+//get-tab-folder -index 1 | get-property activePage | equals "*LaunchContextTest" | verify-true
+get-editor "LaunchContextTest" | get-property dirty | equals true | verify-true
 get-eclipse-window | key-type "M1+s"
-get-tab-folder -index 1 | get-property activePage | equals "LaunchContextTest" | verify-true
+//get-tab-folder -index 1 | get-property activePage | equals "LaunchContextTest" | verify-true
+get-editor "LaunchContextTest" | get-property dirty | equals false | verify-true
 
 get-editor LaunchContextTest | get-section "Launch configurations" | get-tree 
     | get-item "Launch configurations/Java Application/Main/org.eclipse.jdt.launching.MAIN_TYPE" | get-property columns 
@@ -73,9 +74,9 @@
     get-item "Launch configurations/Java Application/Main/org.eclipse.debug.core.MAPPED_RESOURCE_TYPES" | get-item "" 
         -index 1 | get-property columns -index 1 | equals 4 | verify-true
 }
-get-tab-folder -index 1 | get-property activePage | equals "*LaunchContextTest" | verify-true
+get-editor "LaunchContextTest" | get-property dirty | equals true | verify-true
 get-eclipse-window | key-type "M1+s"
-get-tab-folder -index 1 | get-property activePage | equals "LaunchContextTest" | verify-true
+get-editor "LaunchContextTest" | get-property dirty | equals false | verify-true
 
 with [get-editor LaunchContextTest | get-section "Launch configurations" | get-tree] {
     select "Launches/Main/mode" | activate-cell-edit -column 1
@@ -91,8 +92,8 @@
 }
 get-editor LaunchContextTest | get-section "Launch configurations" | get-tree | get-item "Launches/Main/mode" 
     | get-property columns -index 1 | equals release | verify-true
-get-tab-folder -index 1 | get-property activePage | equals "*LaunchContextTest" | verify-true
+get-editor "LaunchContextTest" | get-property dirty | equals true | verify-true
 get-eclipse-window | key-type "M1+s"
-get-tab-folder -index 1 | get-property activePage | equals "LaunchContextTest" | verify-true
+get-editor "LaunchContextTest" | get-property dirty | equals false | verify-true
     
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/Editing/Context/Workspace Context/Create/NotSaveChangesInContext.test b/rcpttTests/platform_tests/Editing/Context/Workspace Context/Create/NotSaveChangesInContext.test
index 3b63143..d5c3a89 100644
--- a/rcpttTests/platform_tests/Editing/Context/Workspace Context/Create/NotSaveChangesInContext.test
+++ b/rcpttTests/platform_tests/Editing/Context/Workspace Context/Create/NotSaveChangesInContext.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _4zI9AWpgEeCzId1Gnkds9A,_BIzmMMyzEeCKjp0mPLHiEg
 Element-Name: NotSaveChangesInContext
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _9iKfQM4pEeCw4ppgsBRMGg
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:04 PM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:49 AM
 Tags: Context, WorkspaceContext, Create
 Testcase-Type: ecl
 
@@ -66,22 +65,15 @@
         }
     }
 }
-with [get-tab-folder -index 1] {
-    get-property pages -index 0 | equals "*context1" | verify-true
-    get-property activePage | equals "*context1" | verify-true
-    get-property tabCount | equals 1 | verify-true
-}
+get-editor context1 | get-property dirty | equals true | verify-true
+
 get-editor context1 | close
 get-window "Save Resource" | get-label "\'context1\' has been modified. Save changes?" | get-property caption 
     | equals "\'context1\' has been modified. Save changes?" | verify-true
 get-window "Save Resource" | get-button No | click
 get-view "Test Explorer" | click -nowait
 get-view "Test Explorer" | get-tree | select "Q7Project/context1" | double-click -nowait
-with [get-tab-folder -index 1] {
-    get-property pages -index 0 | equals context1 | verify-true
-    get-property activePage | equals context1 | verify-true
-    get-property tabCount | equals 1 | verify-true
-}
+get-editor context1 | get-property dirty | equals false | verify-true
 with [get-editor context1] {
     get-editbox -after [get-label "Tags:"] | get-property value | equals "" | verify-true
     with [get-section "Workspace Options"] {
diff --git a/rcpttTests/platform_tests/Editing/TestSuite/Create/CreateTestSuiteByFileMenu.test b/rcpttTests/platform_tests/Editing/TestSuite/Create/CreateTestSuiteByFileMenu.test
index 20236cb..1490129 100644
--- a/rcpttTests/platform_tests/Editing/TestSuite/Create/CreateTestSuiteByFileMenu.test
+++ b/rcpttTests/platform_tests/Editing/TestSuite/Create/CreateTestSuiteByFileMenu.test
@@ -1,14 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
 Contexts: _ymiyse5IEeCU6db9MgIBkA,_tlWZcGphEeCzId1Gnkds9A
 Element-Name: CreateTestSuiteByFileMenu
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _fkrMQILdEeGVWel_bIqsJQ
-Q7-Runtime-Version: 1.5.0.201406131029
-Save-Time: 6/13/14 7:10 PM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:41 AM
 Tags: TestSuite, Create
 Testcase-Type: ecl
 
@@ -57,11 +56,12 @@
     get-editbox -after [get-label "Name:"] | set-text TestSuite
     get-button Finish | click
 }
-with [get-tab-folder -index 1] {
+get-editor "TestSuite" | get-property active -raw | equals true | verify-true
+/*with [get-tab-folder -index 1] {
     get-property pages -index 0 | equals TestSuite | verify-true
     get-property activePage | equals TestSuite | verify-true
     get-property tabCount | equals 1 | verify-true
-}
+}*/
 get-view "Test Explorer" | get-tree | get-item TestQ7Prj | get-property childCount | equals 2 | verify-true
 get-editor TestSuite | close
 get-view "Test Explorer" | click
diff --git a/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCaseAlways.test b/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCaseAlways.test
index 03ce323..10c17e0 100644
--- a/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCaseAlways.test
+++ b/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCaseAlways.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: http://jira4.xored.com/browse/QS-3090
 Id: _RHjBYGJ_EeOG77tsPvjNlQ
-Runtime-Version: 1.5.0.201407211318
-Save-Time: 7/25/14 2:40 PM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:43 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -36,12 +36,12 @@
 
 get-editor "Delete Test" | get-button Replay | click
 try{get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals false | verify-true
 open-modified-context
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | double-click
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | get-menu "Run As/1 Test Cases" | click
 try{get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals false | verify-true
 with [get-editor "Delete Test" | get-section Contexts] {
     click
     get-table | select "Create New Project \\(Q7Project\\)" | get-menu Remove | click
@@ -51,10 +51,10 @@
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | double-click
 get-editor "Delete Test" | get-button Replay | click
 try{get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "*Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals true | verify-true
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | get-menu "Run As/\\d+ Test Cases" | click
 try{get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "*Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals true | verify-true
 
 
 with [get-editor "Create New Project"] {
@@ -62,5 +62,5 @@
     get-button Apply | click
 }
 try{get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder -index 1 | get-property activePage | equals "Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals false | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCasePrompt.test b/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCasePrompt.test
index fb507f4..5480d5e 100644
--- a/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCasePrompt.test
+++ b/rcpttTests/platform_tests/Saving/Context/SaveContextBeforeLaunchTestCasePrompt.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: http://jira4.xored.com/browse/QS-3090
 Id: _fvKSYGJ8EeOG77tsPvjNlQ
-Runtime-Version: 1.5.0.201407281253
-Save-Time: 7/29/14 7:24 AM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:26 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -40,23 +40,24 @@
 get-editor "Delete Test" | get-button Replay | click
 get-window "Save Resource" | get-button No | click
 try {get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "*Create New Project" | verify-true
+//get-tab-folder | get-property "pages[0]" | equals "*Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals true | verify-true
 get-editor "Delete Test" | get-button Replay | click
 get-window "Save Resource" | get-button Yes | click
 try {get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals false | verify-true
 open-modified-context
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | get-menu "Run As/1 Test Cases" | click
 get-window "Save Resource" | get-button Cancel | click
-get-tab-folder -index 1 | get-property "pages[0]" | equals "*Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals true | verify-true
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | get-menu "Run As/\\d+ Test Cases" | click
 get-window "Save Resource" | get-button No | click
 try {get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder  -index 1| get-property "pages[0]" | equals "*Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals true | verify-true
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | get-menu "Run As/\\d+ Test Cases" | click
 get-window "Save Resource" | get-button Yes | click
 try {get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder  -index 1| get-property "pages[0]" | equals "Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals false | verify-true
 with [get-editor "Delete Test" | get-section Contexts] {
     click
     get-table | select "Create New Project \\(Q7Project\\)" | get-menu Remove | click
@@ -65,8 +66,8 @@
 open-modified-context
 get-editor "Delete Test" | get-button Replay | click
 try {get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "*Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals true | verify-true
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | get-menu "Run As/\\d+ Test Cases" | click
 try {get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property "pages[0]" | equals "*Create New Project" | verify-true
+get-editor "Create New Project" | get-property dirty | equals true | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/Saving/TestCase/SaveBeforeLaunchTestCaseAlways.test b/rcpttTests/platform_tests/Saving/TestCase/SaveBeforeLaunchTestCaseAlways.test
index d1d596f..c04dc9d 100644
--- a/rcpttTests/platform_tests/Saving/TestCase/SaveBeforeLaunchTestCaseAlways.test
+++ b/rcpttTests/platform_tests/Saving/TestCase/SaveBeforeLaunchTestCaseAlways.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: http://jira4.xored.com/browse/QS-3090
 Id: _Abk6sGJ8EeOG77tsPvjNlQ
-Runtime-Version: 1.5.0.201407211318
-Save-Time: 7/25/14 2:44 PM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:54 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -34,11 +34,12 @@
 open-modified-testcase
 get-editor "Delete Test" | get-button Replay | click
 try{get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property activePage | equals "Delete Test" | verify-true
+get-editor "Delete Test" | get-property dirty | equals false | verify-true
+//get-tab-folder | get-property activePage | equals "Delete Test" | verify-true
 
 open-modified-testcase
 
 get-view "Test Explorer" | get-tree | select "Q7Project/Delete Test" | get-menu "Run As/1 Test Cases" | click
 try{get-window "Select an Application Under Test" | get-button Cancel | click}-catch{}
-get-tab-folder | get-property activePage | equals "Delete Test" | verify-true
+get-editor "Delete Test" | get-property dirty | equals false | verify-true
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/rcpttTests/platform_tests/toolbar/OpenTestFromToolbar.test b/rcpttTests/platform_tests/toolbar/OpenTestFromToolbar.test
index eafb30c..3574740 100644
--- a/rcpttTests/platform_tests/toolbar/OpenTestFromToolbar.test
+++ b/rcpttTests/platform_tests/toolbar/OpenTestFromToolbar.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _4sy4QM7YEeCw4ppgsBRMGg
-Runtime-Version: 1.5.0.qualifier
-Save-Time: 6/15/14 5:39 PM
+Runtime-Version: 1.5.3.201409120955
+Save-Time: 9/22/14 10:47 AM
 Tags: Toolbar, Dialog
 Testcase-Type: ecl
 
@@ -50,18 +50,12 @@
     get-table | select "scenario2 \\(p2\/scenario2.scenario\\)"
     get-button OK | click
 }
-with [get-tab-folder] {
-    get-property pages -index 0 | equals scenario2 | verify-true
-    get-property tabCount | equals 1 | verify-true
-}
+get-editor scenario2
 get-button "Open Test Case (RCPTT)" | click
 get-window "Select Test Case" | get-table | select "scenario3 \\(p3\/scenario3.scenario\\)" | click -nowait -default
 get-editor scenario3 | get-section Contexts | mouse-release 70 23 button1 524288
-with [get-tab-folder] {
-    get-property pages -index 0 | equals scenario2 | verify-true
-    get-property pages -index 1 | equals scenario3 | verify-true
-    get-property tabCount | equals 2 | verify-true
-}
+get-editor scenario2
+get-editor scenario3
 get-button "Open Test Case (RCPTT)" | click
 get-window "Select Test Case" | get-table | select "scenario1 \\(p1\/scenario1.scenario\\)"
 get-window "Select Test Case" | get-table | get-property itemCount | equals 3 | verify-true