Ported all tests from Selenium1 (RC) to Selenium2 (WebDriver) using a compatibility layer

43 files changed, 617 insertions, 621 deletions

diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php
index 03861440..dce8f144 100755
--- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php
@@ -1,36 +1,36 @@
 <?php
 //$Id: ActiveButtonTestCase.php 3187 2012-07-12 11:21:01Z ctrlaltca $
-class QuickstartActiveButtonTestCase extends PradoGenericSeleniumTest
+class QuickstartActiveButtonTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveButton.Home&amp;notheme=true&amp;lang=en");
+		$this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveButton.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		$this->assertTextPresent('TActiveButton Samples (AJAX)');
 
 		// a click button
-		$this->verifyElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
+		$this->assertElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
 		$this->click("//input[@type='submit' and @value='click me']", "");
 		$this->pause(800);
-		$this->verifyElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
+		$this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
 
 		// a command button
-		$this->verifyElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]");
+		$this->assertElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]");
 		$this->click("//input[@type='submit' and @value='click me']", "");
 		$this->pause(800);
-		$this->verifyElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]");
+		$this->assertElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value using callback\"]");
 
 		// a button causing validation
-		$this->verifyNotVisible('ctl0_body_ctl2');
+		$this->assertNotVisible('ctl0_body_ctl2');
 		$this->click("//input[@type='submit' and @value='submit']", "");
 		$this->pause(800);
-		$this->verifyVisible('ctl0_body_ctl2');
+		$this->assertVisible('ctl0_body_ctl2');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->click("//input[@type='submit' and @value='submit']", "");
 		$this->pause(800);
-		$this->verifyNotVisible('ctl0_body_ctl2');
-		$this->verifyElementPresent("//input[@type='submit' and @value=\"I'm clicked using callback\"]", "");
+		$this->assertNotVisible('ctl0_body_ctl2');
+		$this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked using callback\"]", "");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php
index 257917ec..64643d9d 100755
--- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php
@@ -1,12 +1,11 @@
 <?php
 
 //$Id: ActiveCheckBoxTestCase.php 3187 2012-07-12 11:21:01Z ctrlaltca $
-class QuickstartActiveCheckBoxTestCase extends PradoGenericSeleniumTest
+class QuickstartActiveCheckBoxTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->setSpeed(500);
-		$this->open("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCheckBox.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCheckBox.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
@@ -14,45 +13,45 @@ class QuickstartActiveCheckBoxTestCase extends PradoGenericSeleniumTest
 
 
 		// an auto postback checkbox
-		$this->verifyTextNotPresent("ctl0_body_ctl0 clicked using callback");
+		$this->assertTextNotPresent("ctl0_body_ctl0 clicked using callback");
 		$this->click("//input[@name='ctl0\$body\$ctl0']");
 		$this->pause(800);
 		$this->assertChecked("//input[@name='ctl0\$body\$ctl0']");
-		$this->verifyTextPresent("ctl0_body_ctl0 clicked using callback");
+		$this->assertTextPresent("ctl0_body_ctl0 clicked using callback");
 		$this->click("//input[@name='ctl0\$body\$ctl0']");
 		$this->pause(800);
-		$this->verifyTextPresent("ctl0_body_ctl0 clicked using callback");
+		$this->assertTextPresent("ctl0_body_ctl0 clicked using callback");
 		$this->assertNotChecked("//input[@name='ctl0\$body\$ctl0']");
 
 		// a checkbox causing validation on a textbox
-		$this->verifyNotVisible('ctl0_body_ctl1');
+		$this->assertNotVisible('ctl0_body_ctl1');
 		$this->click("//input[@name='ctl0\$body\$ctl2']");
-		$this->verifyVisible('ctl0_body_ctl1');
+		$this->assertVisible('ctl0_body_ctl1');
 		$this->click("//input[@name='ctl0\$body\$ctl2']", "");
-		$this->verifyVisible('ctl0_body_ctl3');
+		$this->assertVisible('ctl0_body_ctl3');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->click("//input[@name='ctl0\$body\$ctl2']", "");
 		$this->pause(800);
-		$this->verifyNotVisible('ctl0_body_ctl1');
+		$this->assertNotVisible('ctl0_body_ctl1');
 		$this->assertTextPresent("ctl0_body_ctl2 clicked using callback");
 
 		// a checkbox validated by a required field validator
 		$this->assertNotChecked("//input[@name='ctl0\$body\$CheckBox']");
-		$this->verifyNotVisible('ctl0_body_ctl4');
+		$this->assertNotVisible('ctl0_body_ctl4');
 		$this->click("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyVisible('ctl0_body_ctl4');
+		$this->assertVisible('ctl0_body_ctl4');
 		$this->click("//input[@name='ctl0\$body\$CheckBox']", "");
 		$this->assertChecked("//input[@name='ctl0\$body\$CheckBox']");
 		$this->click("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyNotVisible('ctl0_body_ctl4');
+		$this->pause(800);
+		$this->assertNotVisible('ctl0_body_ctl4');
 		$this->assertTextPresent("ctl0_body_CheckBox clicked");
 
 		// a checkbox validated by a required field validator using AutoPostBack
 		$this->assertChecked("//input[@name='ctl0\$body\$CheckBox2']");
-		$this->verifyNotVisible('ctl0_body_ctl5');
+		$this->assertNotVisible('ctl0_body_ctl5');
 		$this->click("//input[@name='ctl0\$body\$CheckBox2']", "");
-		$this->verifyVisible('ctl0_body_ctl5');
+		$this->assertVisible('ctl0_body_ctl5');
 		$this->assertChecked("//input[@name='ctl0\$body\$CheckBox2']");
-		$this->setSpeed(0);
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php
index 967842b0..dba29133 100755
--- a/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php
+++ b/tests/FunctionalTests/quickstart/ActiveControls/ActiveCustomValidatorTestCase.php
@@ -1,10 +1,10 @@
 <?php
 //$Id: ActiveButtonTestCase.php 1405 2006-09-10 01:03:56Z wei $
-class QuickstartActiveCustomValidatorTestCase extends PradoGenericSeleniumTest
+class QuickstartActiveCustomValidatorTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCustomValidator.Home&amp;notheme=true&amp;lang=en");
+		$this->url("../../demos/quickstart/index.php?page=ActiveControls.Samples.TActiveCustomValidator.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
diff --git a/tests/FunctionalTests/quickstart/Advanced/I18N.php b/tests/FunctionalTests/quickstart/Advanced/I18N.php
index 726501ce..51df9503 100755
--- a/tests/FunctionalTests/quickstart/Advanced/I18N.php
+++ b/tests/FunctionalTests/quickstart/Advanced/I18N.php
@@ -1,52 +1,52 @@
 <?php
 
 //New Test
-class QuickstartI18NTestCase extends PradoGenericSeleniumTest
+class QuickstartI18NTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?notheme=true&page=Advanced.Samples.I18N.Home&amp;lang=en&amp;notheme=true", "");
-		$this->verifyTextPresent("Internationlization in PRADO", "");
-		$this->verifyTextPresent("46.412,42 €", "");
-		$this->verifyTextPresent("$12.40", "");
-		$this->verifyTextPresent("€100.00", "");
-		$this->verifyTextPresent("December 6, 2004", "");
-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=zh&amp;notheme=true", "");
-		$this->verifyTextPresent("PRADO 国际化", "");
-		$this->verifyTextPresent("2004 十二月", "");
-		$this->verifyTextPresent("US$ 12.40", "");
-		$this->verifyTextPresent("46.412,42 €", "");
-		$this->verifyTextPresent("€100.00 ", "");
-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=zh_TW&amp;notheme=true", "");
-		$this->verifyTextPresent("PRADO 國際化", "");
-		$this->verifyTextPresent("2004年12月6日", "");
-		$this->verifyTextPresent("US$12.40", "");
-		$this->verifyTextPresent("46.412,42 €", "");
-		$this->verifyTextPresent("€100.00", "");
-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=de&amp;notheme=true", "");
-		$this->verifyTextPresent("Internationalisierung in PRADO", "");
-		$this->verifyTextPresent("6. Dezember 2004 ", "");
-		$this->verifyTextPresent("$ 12,40", "");
-		$this->verifyTextPresent("46.412,42 €", "");
-		$this->verifyTextPresent("€100.00", "");
-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=es&amp;notheme=true", "");
-		$this->verifyTextPresent("Internationlization en PRADO", "");
-		$this->verifyTextPresent("6 de diciembre de 2004", "");
-		$this->verifyTextPresent("US$12.40", "");
-		$this->verifyTextPresent("46.412,42 €", "");
-		$this->verifyTextPresent("€100.00", "");
-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=fr&amp;notheme=true", "");
-		$this->verifyTextPresent("Internationalisation avec PRADO", "");
-		$this->verifyTextPresent("6 décembre 2004", "");
-		$this->verifyTextPresent("12,40 $", "");
-		$this->verifyTextPresent("46.412,42 €", "");
-		$this->verifyTextPresent("€100.00", "");
-		$this->open("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=pl&amp;notheme=true", "");
-		$this->verifyTextPresent("Internacjonalizacja w PRADO", "");
-		$this->verifyTextPresent("6 grudnia 2004", "");
-		$this->verifyTextPresent("US$ 12,40", "");
-		$this->verifyTextPresent("46.412,42 €", "");
-		$this->verifyTextPresent("€100.00", "");
+		$this->url("../../demos/quickstart/index.php?notheme=true&page=Advanced.Samples.I18N.Home&amp;lang=en&amp;notheme=true");
+		$this->assertTextPresent("Internationlization in PRADO", "");
+		$this->assertTextPresent("46.412,42 €", "");
+		$this->assertTextPresent("$12.40", "");
+		$this->assertTextPresent("€100.00", "");
+		$this->assertTextPresent("December 6, 2004", "");
+		$this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=zh&amp;notheme=true");
+		$this->assertTextPresent("PRADO 国际化", "");
+		$this->assertTextPresent("2004 十二月", "");
+		$this->assertTextPresent("US$ 12.40", "");
+		$this->assertTextPresent("46.412,42 €", "");
+		$this->assertTextPresent("€100.00 ", "");
+		$this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=zh_TW&amp;notheme=true");
+		$this->assertTextPresent("PRADO 國際化", "");
+		$this->assertTextPresent("2004年12月6日", "");
+		$this->assertTextPresent("US$12.40", "");
+		$this->assertTextPresent("46.412,42 €", "");
+		$this->assertTextPresent("€100.00", "");
+		$this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=de&amp;notheme=true");
+		$this->assertTextPresent("Internationalisierung in PRADO", "");
+		$this->assertTextPresent("6. Dezember 2004 ", "");
+		$this->assertTextPresent("$ 12,40", "");
+		$this->assertTextPresent("46.412,42 €", "");
+		$this->assertTextPresent("€100.00", "");
+		$this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=es&amp;notheme=true");
+		$this->assertTextPresent("Internationlization en PRADO", "");
+		$this->assertTextPresent("6 de diciembre de 2004", "");
+		$this->assertTextPresent("US$12.40", "");
+		$this->assertTextPresent("46.412,42 €", "");
+		$this->assertTextPresent("€100.00", "");
+		$this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=fr&amp;notheme=true");
+		$this->assertTextPresent("Internationalisation avec PRADO", "");
+		$this->assertTextPresent("6 décembre 2004", "");
+		$this->assertTextPresent("12,40 $", "");
+		$this->assertTextPresent("46.412,42 €", "");
+		$this->assertTextPresent("€100.00", "");
+		$this->url("../../demos/quickstart/index.php?page=Advanced.Samples.I18N.Home&amp;lang=pl&amp;notheme=true");
+		$this->assertTextPresent("Internacjonalizacja w PRADO", "");
+		$this->assertTextPresent("6 grudnia 2004", "");
+		$this->assertTextPresent("US$ 12,40", "");
+		$this->assertTextPresent("46.412,42 €", "");
+		$this->assertTextPresent("€100.00", "");
 
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php b/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php
index 0b272428..f5b58b48 100755
--- a/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/BulletedListTestCase.php
@@ -1,36 +1,36 @@
 <?php
 
-class QuickstartBulletedListTestCase extends PradoGenericSeleniumTest
+class QuickstartBulletedListTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TBulletedList.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TBulletedList.Home&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('item 1','');
-		$this->verifyTextPresent('item 2','');
-		$this->verifyTextPresent('item 3','');
-		$this->verifyTextPresent('item 4','');
-		$this->verifyTextPresent('google','');
-		$this->verifyTextPresent('yahoo','');
-		$this->verifyTextPresent('amazon','');
+		$this->assertTextPresent('item 1','');
+		$this->assertTextPresent('item 2','');
+		$this->assertTextPresent('item 3','');
+		$this->assertTextPresent('item 4','');
+		$this->assertTextPresent('google','');
+		$this->assertTextPresent('yahoo','');
+		$this->assertTextPresent('amazon','');
 
 		// verify order list starting from 5
-		$this->verifyElementPresent("//ol[@start='5']");
+		$this->assertElementPresent("//ol[@start='5']");
 
 		// unable to verify styles
 
 		// verify hyperlink list
-		$this->verifyElementPresent("//a[@href='http://www.google.com/']");
-		$this->verifyElementPresent("//a[@href='http://www.yahoo.com/']");
-		$this->verifyElementPresent("//a[@href='http://www.amazon.com/']");
+		$this->assertElementPresent("//a[@href='http://www.google.com/']");
+		$this->assertElementPresent("//a[@href='http://www.yahoo.com/']");
+		$this->assertElementPresent("//a[@href='http://www.amazon.com/']");
 
 		// verify linkbutton list
 		$this->clickAndWait("id=ctl0_body_ctl40", "");
-		$this->verifyTextPresent("You clicked google : http://www.google.com/.", "");
+		$this->assertTextPresent("You clicked google : http://www.google.com/.", "");
 		$this->clickAndWait("id=ctl0_body_ctl41", "");
-		$this->verifyTextPresent("You clicked yahoo : http://www.yahoo.com/.", "");
+		$this->assertTextPresent("You clicked yahoo : http://www.yahoo.com/.", "");
 		$this->clickAndWait("id=ctl0_body_ctl42", "");
-		$this->verifyTextPresent("You clicked amazon : http://www.amazon.com/.", "");
+		$this->assertTextPresent("You clicked amazon : http://www.amazon.com/.", "");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php
index ad84e1d0..f228de83 100755
--- a/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ButtonTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class QuickstartButtonTestCase extends PradoGenericSeleniumTest
+class QuickstartButtonTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TButton.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TButton.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
@@ -12,22 +12,22 @@ class QuickstartButtonTestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait("//input[@type='submit' and @value='text']", "");
 
 		// a click button
-		$this->verifyElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
+		$this->assertElementNotPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
 		$this->clickAndWait("//input[@type='submit' and @value='click me']", "");
-		$this->verifyElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
+		$this->assertElementPresent("//input[@type='submit' and @value=\"I'm clicked\"]");
 
 		// a command button
-		$this->verifyElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]");
+		$this->assertElementNotPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]");
 		$this->clickAndWait("//input[@type='submit' and @value='click me']", "");
-		$this->verifyElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]");
+		$this->assertElementPresent("//input[@type='submit' and @value=\"Name: test, Param: value\"]");
 
 		// a button causing validation
-		$this->verifyNotVisible('ctl0_body_ctl3');
+		$this->assertNotVisible('ctl0_body_ctl3');
 		$this->click("//input[@type='submit' and @value='submit']", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl3');
+		$this->assertVisible('ctl0_body_ctl3');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->clickAndWait("//input[@type='submit' and @value='submit']", "");
-		$this->verifyNotVisible('ctl0_body_ctl3');
+		$this->assertNotVisible('ctl0_body_ctl3');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
index 242bc815..6ab6329b 100755
--- a/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/CheckBoxListTestCase.php
@@ -1,11 +1,11 @@
 <?php
 
 //New Test
-class QuickstartCheckBoxListTestCase extends PradoGenericSeleniumTest
+class QuickstartCheckBoxListTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBoxList.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBoxList.Home&amp;notheme=true&amp;lang=en");
 
 		// Check box list with default settings:
 		$this->click("//input[@name='ctl0\$body\$ctl0\$c0' and @value='value 1']", "");
@@ -22,31 +22,31 @@ class QuickstartCheckBoxListTestCase extends PradoGenericSeleniumTest
 		// Check box list's behavior upon postback
 		$this->click("//input[@name='ctl0\$body\$CheckBoxList\$c2' and @value='value 3']", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 4, Value: value 5, Text: item 5)", "");
+		$this->assertTextPresent("Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 4, Value: value 5, Text: item 5)", "");
 
 		// Auto postback check box list
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl7\$c1' and @value='value 2']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", "");
+		$this->assertTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", "");
 
 		// Databind to an integer-indexed array
 		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList1\$c1' and @value='1']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 1, Value: 1, Text: item 2)", "");
+		$this->assertTextPresent("Your selection is: (Index: 1, Value: 1, Text: item 2)", "");
 
 		// Databind to an associative array:
 		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList2\$c1' and @value='key 2']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
+		$this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
 
 		// Databind with DataTextField and DataValueField specified
 		$this->clickAndWait("//input[@name='ctl0\$body\$DBCheckBoxList3\$c2' and @value='003']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
 
 		// CheckBox list causing validation
-		$this->verifyNotVisible('ctl0_body_ctl8');
+		$this->assertNotVisible('ctl0_body_ctl8');
 		$this->click("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl8');
+		$this->assertVisible('ctl0_body_ctl8');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl9\$c0' and @value='Agree']", "");
-		$this->verifyNotVisible('ctl0_body_ctl8');
+		$this->assertNotVisible('ctl0_body_ctl8');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php
index 57b50dd9..1bacecb0 100755
--- a/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/CheckBoxTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class QuickstartCheckBoxTestCase extends PradoGenericSeleniumTest
+class QuickstartCheckBoxTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBox.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TCheckBox.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
@@ -15,39 +15,39 @@ class QuickstartCheckBoxTestCase extends PradoGenericSeleniumTest
 		$this->click("//input[@name='ctl0\$body\$ctl1' and @value='value']", "");
 
 		// an auto postback checkbox
-		$this->verifyTextNotPresent("I'm clicked");
+		$this->assertTextNotPresent("I'm clicked");
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2']", "");
-		$this->verifyTextPresent("I'm clicked");
+		$this->assertTextPresent("I'm clicked");
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2']", "");
-		$this->verifyTextPresent("I'm clicked");
+		$this->assertTextPresent("I'm clicked");
 
 		// a checkbox causing validation on a textbox
-		$this->verifyNotVisible('ctl0_body_ctl3');
+		$this->assertNotVisible('ctl0_body_ctl3');
 		$this->click("//input[@name='ctl0\$body\$ctl4']", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl3');
+		$this->assertVisible('ctl0_body_ctl3');
 		$this->click("//input[@name='ctl0\$body\$ctl4']", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl3');
+		$this->assertVisible('ctl0_body_ctl3');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl4']", "");
-		$this->verifyNotVisible('ctl0_body_ctl3');
+		$this->assertNotVisible('ctl0_body_ctl3');
 
 		// a checkbox validated by a required field validator
-		$this->verifyNotVisible('ctl0_body_ctl6');
+		$this->assertNotVisible('ctl0_body_ctl6');
 		$this->click("//input[@type='submit' and @value='Submit']", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl6');
+		$this->assertVisible('ctl0_body_ctl6');
 		$this->click("//input[@name='ctl0\$body\$CheckBox']", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyNotVisible('ctl0_body_ctl6');
+		$this->assertNotVisible('ctl0_body_ctl6');
 
 		// a checkbox validated by a required field validator using AutoPostBack
-		$this->verifyNotVisible('ctl0_body_ctl7');
+		$this->assertNotVisible('ctl0_body_ctl7');
 		$this->click("//input[@name='ctl0\$body\$CheckBox2']", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl7');
+		$this->assertVisible('ctl0_body_ctl7');
 //		$this->clickAndWait("//input[@name='ctl0\$body\$CheckBox2' and @value='ctl0\$body\$CheckBox2']", "");
-//		$this->verifyNotVisible('ctl0_body_ctl7');
+//		$this->assertNotVisible('ctl0_body_ctl7');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
index 57ee92ae..efe2829d 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid1TestCase.php
@@ -1,29 +1,29 @@
 <?php
 
-class QuickstartDataGrid1TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid1TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample1&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample1&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('id','');
-		$this->verifyTextPresent('name','');
-		$this->verifyTextPresent('quantity','');
-		$this->verifyTextPresent('price','');
-		$this->verifyTextPresent('imported','');
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('Motherboard','');
-		$this->verifyTextPresent('100','');
-		$this->verifyTextPresent('true','');
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextPresent('Speaker','');
-		$this->verifyTextPresent('35','');
-		$this->verifyTextPresent('65','');
-		$this->verifyTextPresent('false','');
+		$this->assertTextPresent('id','');
+		$this->assertTextPresent('name','');
+		$this->assertTextPresent('quantity','');
+		$this->assertTextPresent('price','');
+		$this->assertTextPresent('imported','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('Motherboard','');
+		$this->assertTextPresent('100','');
+		$this->assertTextPresent('true','');
+		$this->assertTextPresent('ITN019','');
+		$this->assertTextPresent('Speaker','');
+		$this->assertTextPresent('35','');
+		$this->assertTextPresent('65','');
+		$this->assertTextPresent('false','');
 
 		// verify specific table tags
-		$this->verifyElementPresent("ctl0_body_DataGrid");
+		$this->assertElementPresent("ctl0_body_DataGrid");
 		$this->verifyAttribute("ctl0_body_DataGrid@cellpadding","2");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php
index 7efd69cc..15a4c510 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid2TestCase.php
@@ -1,49 +1,49 @@
 <?php
 
-class QuickstartDataGrid2TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid2TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample2&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample2&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('Book Title','');
-		$this->verifyTextPresent('Publisher','');
-		$this->verifyTextPresent('Price','');
-		$this->verifyTextPresent('In-stock','');
-		$this->verifyTextPresent('Rating','');
+		$this->assertTextPresent('Book Title','');
+		$this->assertTextPresent('Publisher','');
+		$this->assertTextPresent('Price','');
+		$this->assertTextPresent('In-stock','');
+		$this->assertTextPresent('Rating','');
 
 		// verify book titles
-		$this->verifyElementPresent("//a[@href='http://www.amazon.com/gp/product/0596007124' and text()='Head First Design Patterns']",'');
-		$this->verifyElementPresent("//a[@href='http://www.amazon.com/gp/product/0321278658' and text()='Extreme Programming Explained : Embrace Change']",'');
+		$this->assertElementPresent("//a[@href='http://www.amazon.com/gp/product/0596007124' and text()='Head First Design Patterns']",'');
+		$this->assertElementPresent("//a[@href='http://www.amazon.com/gp/product/0321278658' and text()='Extreme Programming Explained : Embrace Change']",'');
 
 		// verify publishers
-		$this->verifyTextPresent("O'Reilly Media, Inc.",'');
-		$this->verifyTextPresent("Addison-Wesley Professional",'');
+		$this->assertTextPresent("O'Reilly Media, Inc.",'');
+		$this->assertTextPresent("Addison-Wesley Professional",'');
 
 		// verify prices
-		$this->verifyTextPresent("\$37.49",'');
-		$this->verifyTextPresent("\$38.49",'');
+		$this->assertTextPresent("\$37.49",'');
+		$this->assertTextPresent("\$38.49",'');
 
 		// verify in-stock
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked','regexp:true|checked');
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@disabled','regexp:true|disabled');
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked');
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl6_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked',null);
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@disabled','regexp:true|disabled');
 
 		// verify ratings
-		//$this->verifyElementPresent("//img[@src='images/star5.gif']",'');
-		//$this->verifyElementPresent("//img[@src='images/star2.gif']",'');
+		//$this->assertElementPresent("//img[@src='images/star5.gif']",'');
+		//$this->assertElementPresent("//img[@src='images/star2.gif']",'');
 
 		// verify toggle column visibility
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']", "");
-		$this->verifyTextNotPresent('Head First Design Patterns','');
+		$this->assertTextNotPresent('Head First Design Patterns','');
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']", "");
-		$this->verifyElementNotPresent('ctl0_body_DataGrid_ctl1_ctl5','');
+		$this->assertElementNotPresent('ctl0_body_DataGrid_ctl1_ctl5','');
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c3' and @value='In-stock']", "");
-		$this->verifyElementPresent('ctl0_body_DataGrid_ctl1_ctl5','');
+		$this->assertElementPresent('ctl0_body_DataGrid_ctl1_ctl5','');
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Book Title']", "");
-		$this->verifyTextPresent('Head First Design Patterns','');
+		$this->assertTextPresent('Head First Design Patterns','');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
index 2cdace20..0b24e2f5 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid3TestCase.php
@@ -1,18 +1,18 @@
 <?php
 
-class QuickstartDataGrid3TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid3TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample3&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample3&amp;notheme=true&amp;lang=en");
 
 		// verify the 2nd row of data
-		$this->verifyTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");
-		$this->verifyTextPresent("Addison-Wesley Professional", "");
-		$this->verifyTextPresent("$47.04", "");
+		$this->assertTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");
+		$this->assertTextPresent("Addison-Wesley Professional", "");
+		$this->assertTextPresent("$47.04", "");
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@checked','regexp:true|checked');
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled');
-		//$this->verifyElementPresent("//img[@src='images/star5.gif']",'');
+		//$this->assertElementPresent("//img[@src='images/star5.gif']",'');
 
 		// edit the 2nd row
 		$this->clickAndWait("id=ctl0_body_DataGrid_ctl2_ctl7", "");
@@ -24,27 +24,26 @@ class QuickstartDataGrid3TestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait("link=Save", "");
 
 		// verify the 2nd row is saved
-		$this->verifyTextPresent("Design Pattern: Elements of Reusable Object-Oriented Software", "");
-		$this->verifyTextPresent("Addison Wesley Professional", "");
-		$this->verifyTextPresent("$57.04", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl2_ctl4").hasAttribute("checked")'), 'false');
+		$this->assertTextPresent("Design Pattern: Elements of Reusable Object-Oriented Software", "");
+		$this->assertTextPresent("Addison Wesley Professional", "");
+		$this->assertTextPresent("$57.04", "");
+		$this->verifyAttribute("ctl0_body_DataGrid_ctl2_ctl4@checked", null);
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl4@disabled','regexp:true|disabled');
-		//$this->verifyElementPresent("//img[@src='images/star1.gif']",'');
+		//$this->assertElementPresent("//img[@src='images/star1.gif']",'');
 
 		// verify cancel editting the 3rd row
 		$this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl7", "");
 		$this->clickAndWait("link=Cancel", "");
-		$this->verifyTextPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", "");
+		$this->assertTextPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", "");
 
 		// verify deleting
 		$this->clickAndWait("id=ctl0_body_DataGrid_ctl3_ctl9", "");
 		$this->verifyConfirmation("Are you sure?");
-		$this->verifyTextNotPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", "");
+		$this->assertTextNotPresent("Design Patterns Explained : A New Perspective on Object-Oriented Design", "");
 
-		$this->verifyTextPresent("Extreme Programming Explained : Embrace Change",'');
-		$this->chooseCancelOnNextConfirmation();
+		$this->assertTextPresent("Extreme Programming Explained : Embrace Change",'');
 		$this->click("id=ctl0_body_DataGrid_ctl6_ctl9", "");
-		$this->verifyConfirmation("Are you sure?");
-		$this->verifyTextPresent("Extreme Programming Explained : Embrace Change",'');
+		$this->verifyConfirmationDismiss("Are you sure?");
+		$this->assertTextPresent("Extreme Programming Explained : Embrace Change",'');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
index 702b997e..f78e52c4 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid4TestCase.php
@@ -1,28 +1,28 @@
 <?php
 
-class QuickstartDataGrid4TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid4TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample4&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample4&amp;notheme=true&amp;lang=en");
 
 		// verify the 2nd row of data
-		$this->verifyTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");
-		$this->verifyTextPresent("Addison-Wesley Professional", "");
-		$this->verifyTextPresent("$47.04", "");
+		$this->assertTextPresent("Design Patterns: Elements of Reusable Object-Oriented Software", "");
+		$this->assertTextPresent("Addison-Wesley Professional", "");
+		$this->assertTextPresent("$47.04", "");
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked','regexp:true|checked');
 		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@disabled','regexp:true|disabled');
 
 		// verify sorting
 		$this->clickAndWait("link=Book Title", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl1_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
 		$this->clickAndWait("link=Publisher", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl6_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl6_ctl5@checked', null);
 		$this->clickAndWait("link=Price", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl2_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl2_ctl5@checked', null);
 		$this->clickAndWait("link=In-stock", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl1_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl1_ctl5@checked', null);
 		$this->clickAndWait("link=Rating", "");
-		$this->assertEquals($this->getEval('this.browserbot.findElement("ctl0_body_DataGrid_ctl4_ctl5").hasAttribute("checked")'), 'false');
+		$this->verifyAttribute('ctl0_body_DataGrid_ctl4_ctl5@checked', null);
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php
index f854d44c..4ff65a64 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid5TestCase.php
@@ -1,50 +1,50 @@
 <?php
 
-class QuickstartDataGrid5TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid5TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample5&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample5&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
 		// verify column headers
-		$this->verifyTextPresent('id','');
-		$this->verifyTextPresent('name','');
-		$this->verifyTextPresent('quantity','');
-		$this->verifyTextPresent('price','');
-		$this->verifyTextPresent('imported','');
+		$this->assertTextPresent('id','');
+		$this->assertTextPresent('name','');
+		$this->assertTextPresent('quantity','');
+		$this->assertTextPresent('price','');
+		$this->assertTextPresent('imported','');
 
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('ITN002','');
-		$this->verifyTextPresent('ITN003','');
-		$this->verifyTextPresent('ITN004','');
-		$this->verifyTextPresent('ITN005','');
-		$this->verifyTextNotPresent('ITN006','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('ITN002','');
+		$this->assertTextPresent('ITN003','');
+		$this->assertTextPresent('ITN004','');
+		$this->assertTextPresent('ITN005','');
+		$this->assertTextNotPresent('ITN006','');
 
 		// verify paging
 		$this->clickAndWait("link=2", "");
-		$this->verifyTextPresent('ITN006','');
-		$this->verifyTextPresent('ITN007','');
-		$this->verifyTextPresent('ITN008','');
-		$this->verifyTextPresent('ITN009','');
-		$this->verifyTextPresent('ITN010','');
-		$this->verifyTextNotPresent('ITN011','');
-		$this->verifyTextNotPresent('ITN005','');
+		$this->assertTextPresent('ITN006','');
+		$this->assertTextPresent('ITN007','');
+		$this->assertTextPresent('ITN008','');
+		$this->assertTextPresent('ITN009','');
+		$this->assertTextPresent('ITN010','');
+		$this->assertTextNotPresent('ITN011','');
+		$this->assertTextNotPresent('ITN005','');
 
 		$this->clickAndWait("link=4", "");
-		$this->verifyTextPresent('ITN016','');
-		$this->verifyTextPresent('ITN017','');
-		$this->verifyTextPresent('ITN018','');
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextNotPresent('ITN015','');
+		$this->assertTextPresent('ITN016','');
+		$this->assertTextPresent('ITN017','');
+		$this->assertTextPresent('ITN018','');
+		$this->assertTextPresent('ITN019','');
+		$this->assertTextNotPresent('ITN015','');
 
 		$this->clickAndWait("link=1", "");
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('ITN002','');
-		$this->verifyTextPresent('ITN003','');
-		$this->verifyTextPresent('ITN004','');
-		$this->verifyTextPresent('ITN005','');
-		$this->verifyTextNotPresent('ITN006','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('ITN002','');
+		$this->assertTextPresent('ITN003','');
+		$this->assertTextPresent('ITN004','');
+		$this->assertTextPresent('ITN005','');
+		$this->assertTextNotPresent('ITN006','');
 
 		// show top pager
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl1\$c0' and @value='Top']", "");
@@ -59,55 +59,55 @@ class QuickstartDataGrid5TestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
 
 		// verify next prev paging
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextNotPresent('ITN006','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextNotPresent('ITN006','');
 		$this->clickAndWait("link=Next Page", "");
-		$this->verifyTextNotPresent('ITN005','');
-		$this->verifyTextPresent('ITN006','');
-		$this->verifyTextNotPresent('ITN011','');
+		$this->assertTextNotPresent('ITN005','');
+		$this->assertTextPresent('ITN006','');
+		$this->assertTextNotPresent('ITN011','');
 		$this->clickAndWait("link=Next Page", "");
-		$this->verifyTextNotPresent('ITN010','');
-		$this->verifyTextPresent('ITN011','');
-		$this->verifyTextNotPresent('ITN016','');
+		$this->assertTextNotPresent('ITN010','');
+		$this->assertTextPresent('ITN011','');
+		$this->assertTextNotPresent('ITN016','');
 		$this->clickAndWait("link=Next Page", "");
-		$this->verifyTextNotPresent('ITN015','');
-		$this->verifyTextPresent('ITN016','');
+		$this->assertTextNotPresent('ITN015','');
+		$this->assertTextPresent('ITN016','');
 		$this->clickAndWait("link=Prev Page", "");
-		$this->verifyTextNotPresent('ITN010','');
-		$this->verifyTextPresent('ITN011','');
-		$this->verifyTextNotPresent('ITN016','');
+		$this->assertTextNotPresent('ITN010','');
+		$this->assertTextPresent('ITN011','');
+		$this->assertTextNotPresent('ITN016','');
 		$this->clickAndWait("link=Prev Page", "");
-		$this->verifyTextNotPresent('ITN005','');
-		$this->verifyTextPresent('ITN006','');
-		$this->verifyTextNotPresent('ITN011','');
+		$this->assertTextNotPresent('ITN005','');
+		$this->assertTextPresent('ITN006','');
+		$this->assertTextNotPresent('ITN011','');
 		$this->clickAndWait("link=Prev Page", "");
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextNotPresent('ITN006','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextNotPresent('ITN006','');
 
 		// change button count
 		$this->type("ctl0\$body\$PageButtonCount", "2");
 		$this->clickAndWait("name=ctl0\$body\$ctl6", "");
 		$this->clickAndWait("link=Next Page", "");
-		$this->verifyTextNotPresent('ITN010','');
-		$this->verifyTextPresent('ITN011','');
-		$this->verifyTextNotPresent('ITN016','');
+		$this->assertTextNotPresent('ITN010','');
+		$this->assertTextPresent('ITN011','');
+		$this->assertTextNotPresent('ITN016','');
 		$this->clickAndWait("link=4", "");
-		$this->verifyTextNotPresent('ITN015','');
-		$this->verifyTextPresent('ITN016','');
+		$this->assertTextNotPresent('ITN015','');
+		$this->assertTextPresent('ITN016','');
 		$this->clickAndWait("link=Prev Page", "");
-		$this->verifyTextNotPresent('ITN005','');
-		$this->verifyTextPresent('ITN006','');
-		$this->verifyTextNotPresent('ITN011','');
+		$this->assertTextNotPresent('ITN005','');
+		$this->assertTextPresent('ITN006','');
+		$this->assertTextNotPresent('ITN011','');
 
 		$this->type("ctl0\$body\$PageButtonCount", "10");
 		$this->clickAndWait("name=ctl0\$body\$ctl6", "");
 		$this->type("ctl0\$body\$PageSize", "2");
 		$this->clickAndWait("name=ctl0\$body\$ctl8", "");
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('ITN002','');
-		$this->verifyTextNotPresent('ITN003','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('ITN002','');
+		$this->assertTextNotPresent('ITN003','');
 		$this->clickAndWait("link=10", "");
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextNotPresent('ITN018','');
+		$this->assertTextPresent('ITN019','');
+		$this->assertTextNotPresent('ITN018','');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php
index c6fba20f..8d48fd85 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php
@@ -1,48 +1,48 @@
 <?php
 
-class QuickstartDataGrid6TestCase extends PradoGenericSeleniumTest
+class QuickstartDataGrid6TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample6&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataGrid.Sample6&amp;notheme=true&amp;lang=en");
 
 		// verify column headers
-		$this->verifyTextPresent('id','');
-		$this->verifyTextPresent('name','');
-		$this->verifyTextPresent('quantity','');
-		$this->verifyTextPresent('price','');
-		$this->verifyTextPresent('imported','');
+		$this->assertTextPresent('id','');
+		$this->assertTextPresent('name','');
+		$this->assertTextPresent('quantity','');
+		$this->assertTextPresent('price','');
+		$this->assertTextPresent('imported','');
 
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('ITN002','');
-		$this->verifyTextPresent('ITN003','');
-		$this->verifyTextPresent('ITN004','');
-		$this->verifyTextPresent('ITN005','');
-		$this->verifyTextNotPresent('ITN006','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('ITN002','');
+		$this->assertTextPresent('ITN003','');
+		$this->assertTextPresent('ITN004','');
+		$this->assertTextPresent('ITN005','');
+		$this->assertTextNotPresent('ITN006','');
 
 		// verify paging
 		$this->clickAndWait("link=2", "");
-		$this->verifyTextPresent('ITN006','');
-		$this->verifyTextPresent('ITN007','');
-		$this->verifyTextPresent('ITN008','');
-		$this->verifyTextPresent('ITN009','');
-		$this->verifyTextPresent('ITN010','');
-		$this->verifyTextNotPresent('ITN011','');
-		$this->verifyTextNotPresent('ITN005','');
+		$this->assertTextPresent('ITN006','');
+		$this->assertTextPresent('ITN007','');
+		$this->assertTextPresent('ITN008','');
+		$this->assertTextPresent('ITN009','');
+		$this->assertTextPresent('ITN010','');
+		$this->assertTextNotPresent('ITN011','');
+		$this->assertTextNotPresent('ITN005','');
 
 		$this->clickAndWait("link=4", "");
-		$this->verifyTextPresent('ITN016','');
-		$this->verifyTextPresent('ITN017','');
-		$this->verifyTextPresent('ITN018','');
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextNotPresent('ITN015','');
+		$this->assertTextPresent('ITN016','');
+		$this->assertTextPresent('ITN017','');
+		$this->assertTextPresent('ITN018','');
+		$this->assertTextPresent('ITN019','');
+		$this->assertTextNotPresent('ITN015','');
 
 		$this->clickAndWait("link=1", "");
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('ITN002','');
-		$this->verifyTextPresent('ITN003','');
-		$this->verifyTextPresent('ITN004','');
-		$this->verifyTextPresent('ITN005','');
-		$this->verifyTextNotPresent('ITN006','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('ITN002','');
+		$this->assertTextPresent('ITN003','');
+		$this->assertTextPresent('ITN004','');
+		$this->assertTextPresent('ITN005','');
+		$this->assertTextNotPresent('ITN006','');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php
index 4ff6478a..01a3b62a 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php
@@ -1,24 +1,24 @@
 <?php
 
-class QuickstartDataList1TestCase extends PradoGenericSeleniumTest
+class QuickstartDataList1TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample1&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample1&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('$100','');
-		$this->verifyTextPresent('Motherboard','');
-		$this->verifyTextPresent('ITN018','');
-		$this->verifyTextPresent('Surge protector','');
-		$this->verifyTextPresent('45','');
-		$this->verifyTextPresent('$15','');
-		$this->verifyTextPresent('Total 19 products.','');
-		$this->verifyTextPresent('Computer Parts','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('$100','');
+		$this->assertTextPresent('Motherboard','');
+		$this->assertTextPresent('ITN018','');
+		$this->assertTextPresent('Surge protector','');
+		$this->assertTextPresent('45','');
+		$this->assertTextPresent('$15','');
+		$this->assertTextPresent('Total 19 products.','');
+		$this->assertTextPresent('Computer Parts','');
 
 		// verify specific table tags
-		$this->verifyElementPresent("ctl0_body_DataList");
-		$this->verifyElementPresent("//td[@align='right']");
+		$this->assertElementPresent("ctl0_body_DataList");
+		$this->assertElementPresent("//td[@align='right']");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
index 4fb3743e..2957c96f 100755
--- a/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php
@@ -1,22 +1,22 @@
 <?php
 
-class QuickstartDataList2TestCase extends PradoGenericSeleniumTest
+class QuickstartDataList2TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample2&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDataList.Sample2&amp;notheme=true&amp;lang=en");
 
 		// verify initial presentation
-		$this->verifyTextPresent("Motherboard ", "");
-		$this->verifyTextPresent("Monitor ", "");
+		$this->assertTextPresent("Motherboard", "");
+		$this->assertTextPresent("Monitor", "");
 
 		// verify selecting an item
 		$this->clickAndWait("link=ITN003", "");
-		$this->verifyTextPresent("Quantity", "");
-		$this->verifyTextPresent("Price", "");
-		$this->verifyTextPresent("\$80", "");
+		$this->assertTextPresent("Quantity", "");
+		$this->assertTextPresent("Price", "");
+		$this->assertTextPresent("\$80", "");
 		$this->clickAndWait("link=ITN005", "");
-		$this->verifyTextPresent("\$150", "");
+		$this->assertTextPresent("\$150", "");
 
 		// verify editting an item
 		$this->clickAndWait("id=ctl0_body_DataList_ctl5_ctl0", "");
@@ -27,8 +27,8 @@ class QuickstartDataList2TestCase extends PradoGenericSeleniumTest
 
 		// verify item is saved
 		$this->clickAndWait("link=ITN005", "");
-		$this->verifyTextPresent("\$140.99", "");
-		$this->verifyTextPresent("11", "");
+		$this->assertTextPresent("\$140.99", "");
+		$this->assertTextPresent("11", "");
 
 		// verify editting another item
 		$this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", "");
@@ -39,21 +39,20 @@ class QuickstartDataList2TestCase extends PradoGenericSeleniumTest
 
 		// verify item is canceled
 		$this->clickAndWait("link=ITN003", "");
-		$this->verifyTextPresent("2", "");
-		$this->verifyTextPresent("Harddrive 	", "");
+		$this->assertTextPresent("2", "");
+		$this->assertTextPresent("Harddrive", "");
 
 		// verify item deletion
 		$this->clickAndWait("id=ctl0_body_DataList_ctl3_ctl1", "");
 		$this->verifyConfirmation("Are you sure?");
-		$this->chooseCancelOnNextConfirmation();
 		$this->click("id=ctl0_body_DataList_ctl5_ctl2", "");
-		$this->verifyConfirmation("Are you sure?");
-		$this->verifyTextPresent("Motherboard ", "");
-		$this->verifyTextPresent("CPU ", "");
-		$this->verifyTextNotPresent("Harddrive","");
-		$this->verifyTextPresent("Sound card", "");
-		$this->verifyTextPresent("Video card", "");
-		$this->verifyTextPresent("Keyboard","");
-		$this->verifyTextPresent("Monitor ", "");
+		$this->verifyConfirmationDismiss("Are you sure?");
+		$this->assertTextPresent("Motherboard", "");
+		$this->assertTextPresent("CPU", "");
+		$this->assertTextNotPresent("Harddrive","");
+		$this->assertTextPresent("Sound card", "");
+		$this->assertTextPresent("Video card", "");
+		$this->assertTextPresent("Keyboard","");
+		$this->assertTextPresent("Monitor", "");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
index eae8ab36..1b7aca5e 100755
--- a/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php
@@ -1,65 +1,65 @@
 <?php
 
-class QuickstartDropDownListTestCase extends PradoGenericSeleniumTest
+class QuickstartDropDownListTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TDropDownList.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TDropDownList.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// dropdown list with default settings
-		$this->verifyElementPresent("ctl0\$body\$ctl0");
+		$this->assertElementPresent("ctl0\$body\$ctl0");
 
 		// dropdown list with initial options
-		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4')); 
+		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4'));
 		$this->assertSelected("ctl0\$body\$ctl1","item 2");
 
 		// dropdown list with customized styles
-		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl2"), array('item 1', 'item 2', 'item 3', 'item 4')); 
+		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl2"), array('item 1', 'item 2', 'item 3', 'item 4'));
 		$this->assertSelected("ctl0\$body\$ctl2","item 2");
 
 		// a disabled dropdown list
 		$this->verifyAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled");
 
 		// an auto postback dropdown list
-		$this->verifyTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
+		$this->assertTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
 		$this->selectAndWait("ctl0\$body\$ctl4", "label=item 3");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
 
 		// a single selection list box upon postback
 		$this->select("ctl0\$body\$DropDownList1", "label=item 4");
-		$this->verifyTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
+		$this->assertTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
+		$this->assertTextPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
 
 		// Databind to an integer-indexed array
 		$this->selectAndWait("ctl0\$body\$DBDropDownList1", "label=item 3");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", "");
 
 		// Databind to an associative array
 		$this->selectAndWait("ctl0\$body\$DBDropDownList2", "label=item 2");
-		$this->verifyTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
+		$this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
 
 		// Databind with DataTextField and DataValueField specified
 		$this->selectAndWait("ctl0\$body\$DBDropDownList3", "label=Cary");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
 
 		// dropdown list is being validated
-		$this->verifyNotVisible('ctl0_body_ctl6');
+		$this->assertNotVisible('ctl0_body_ctl6');
 		$this->click("id=ctl0_body_ctl7", "");
-		$this->verifyVisible('ctl0_body_ctl6');
+		$this->assertVisible('ctl0_body_ctl6');
 		$this->select("ctl0\$body\$VDropDownList1", "label=item 2");
 		$this->clickAndWait("id=ctl0_body_ctl7", "");
-		$this->verifyNotVisible('ctl0_body_ctl6');
+		$this->assertNotVisible('ctl0_body_ctl6');
 
 		// dropdown list causing validation
-		$this->verifyNotVisible('ctl0_body_ctl8');
+		$this->assertNotVisible('ctl0_body_ctl8');
 		$this->select("ctl0\$body\$VDropDownList2", "label=Disagree");
 		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl8');
+		$this->assertVisible('ctl0_body_ctl8');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->selectAndWait("ctl0\$body\$VDropDownList2", "label=Agree");
-		$this->verifyNotVisible('ctl0_body_ctl8');
+		$this->assertNotVisible('ctl0_body_ctl8');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php b/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php
index 4d47fecd..7421bdf6 100755
--- a/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php
@@ -1,13 +1,13 @@
 <?php
 
-class QuickstartExpressionTestCase extends PradoGenericSeleniumTest
+class QuickstartExpressionTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TExpression.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TExpression.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
-		$this->verifyTextPresent('PRADO QuickStart Sample');
+		$this->assertTextPresent('PRADO QuickStart Sample');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php b/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php
index caa7a893..3d7de705 100755
--- a/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class QuickstartHtmlAreaTestCase extends PradoGenericSeleniumTest
+class QuickstartHtmlAreaTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.THtmlArea.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.THtmlArea.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
diff --git a/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php b/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php
index dc0261e7..3c80254f 100755
--- a/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php
@@ -1,15 +1,15 @@
 <?php
 
-class QuickstartHyperLinkTestCase extends PradoGenericSeleniumTest
+class QuickstartHyperLinkTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.THyperLink.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.THyperLink.Home&amp;notheme=true&amp;lang=en");
 		$this->verifyTitle("PRADO QuickStart Sample", "");
-		$this->verifyElementPresent("//a[@href=\"http://www.pradosoft.com/\" and @target=\"_blank\"]");
-		$this->verifyTextPresent("Welcome to", "");
-		$this->verifyTextPresent("Body contents", "");
-		$this->verifyElementPresent("//a[img/@alt='Hello World']");
-		$this->verifyElementPresent("//a[contains(text(),'Body contents')]");
+		$this->assertElementPresent("//a[@href=\"http://www.pradosoft.com/\" and @target=\"_blank\"]");
+		$this->assertTextPresent("Welcome to", "");
+		$this->assertTextPresent("Body contents", "");
+		$this->assertElementPresent("//a[img/@alt='Hello World']");
+		$this->assertElementPresent("//a[contains(text(),'Body contents')]");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php
index bf531d72..4133bcbd 100755
--- a/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php
@@ -1,28 +1,28 @@
 <?php
 
-class QuickstartImageButtonTestCase extends PradoGenericSeleniumTest
+class QuickstartImageButtonTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TImageButton.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TImageButton.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// a click button
 		$this->clickAndWait("//input[@type='image' and @alt='hello world']", "");
-		$this->verifyTextPresent("You clicked at ","");
+		$this->assertTextPresent("You clicked at ","");
 
 		// a command button
 		$this->clickAndWait("ctl0\$body\$ctl1", "");
-		$this->verifyTextPresent("Command name: test, Command parameter: value","");
+		$this->assertTextPresent("Command name: test, Command parameter: value","");
 
 		// a button causing validation
-		$this->verifyNotVisible('ctl0_body_ctl2');
+		$this->assertNotVisible('ctl0_body_ctl2');
 		$this->click("id=ctl0_body_ctl3", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl2');
+		$this->assertVisible('ctl0_body_ctl2');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->clickAndWait("id=ctl0_body_ctl3", "");
-		$this->verifyNotVisible('ctl0_body_ctl2');
+		$this->assertNotVisible('ctl0_body_ctl2');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php b/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php
index 19e80470..8dcf7d9a 100755
--- a/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ImageTestCase.php
@@ -1,18 +1,18 @@
 <?php
 
 //New Test
-class QuickstartImageTestCase extends PradoGenericSeleniumTest
+class QuickstartImageTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TImage.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TImage.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
-		//$this->verifyElementPresent("//img[contains(@src,'/hello_world.gif') and @alt='']");
-		$this->verifyElementPresent("//img[contains(@src,'/hello_world.gif') and @alt='Hello World!']");
-		$this->verifyTextPresent("Hello World! Hello World! Hello World!", "");
-		//$this->verifyElementPresent("//img[contains(@src,'/hello_world.gif') and @align='baseline']");
-		//$this->verifyElementPresent("//img[contains(@src,'/hello_world.gif') and contains(@longdesc,'HelloWorld.html')]");
+		//$this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and @alt='']");
+		$this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and @alt='Hello World!']");
+		$this->assertTextPresent("Hello World! Hello World! Hello World!", "");
+		//$this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and @align='baseline']");
+		//$this->assertElementPresent("//img[contains(@src,'/hello_world.gif') and contains(@longdesc,'HelloWorld.html')]");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php b/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php
index 03bba8ed..96873c00 100755
--- a/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/LabelTestCase.php
@@ -1,16 +1,16 @@
 <?php
 
 //New Test
-class QuickstartLabelTestCase extends PradoGenericSeleniumTest
+class QuickstartLabelTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TLabel.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TLabel.Home&amp;notheme=true&amp;lang=en");
 		$this->verifyTitle("PRADO QuickStart Sample", "");
-		$this->verifyTextPresent("This is a label with customized color and font.", "");
-		$this->verifyTextPresent("This is a form label associated with the TTextBox control below", "");
-		$this->verifyTextPresent("This is a label with empty Text property and nonempty body", "");
-		$this->verifyTextPresent("This is a disabled label", "");
+		$this->assertTextPresent("This is a label with customized color and font.", "");
+		$this->assertTextPresent("This is a form label associated with the TTextBox control below", "");
+		$this->assertTextPresent("This is a label with empty Text property and <b>nonempty body</b>", "");
+		$this->assertTextPresent("This is a disabled label", "");
 
 		$this->verifyAttribute("ctl0_body_Label2@disabled","regexp:true|disabled");
 
diff --git a/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php
index 57e7b975..65fd23fb 100755
--- a/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class QuickstartLinkButtonTestCase extends PradoGenericSeleniumTest
+class QuickstartLinkButtonTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TLinkButton.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TLinkButton.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
@@ -21,12 +21,12 @@ class QuickstartLinkButtonTestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait("//a[contains(text(),'Name: test, Param: value')]", "");
 
 		// a button causing validation
-		$this->verifyNotVisible('ctl0_body_ctl4');
+		$this->assertNotVisible('ctl0_body_ctl4');
 		$this->click("link=submit", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl4');
+		$this->assertVisible('ctl0_body_ctl4');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->clickAndWait("link=submit", "");
-		$this->verifyNotVisible('ctl0_body_ctl4');
+		$this->assertNotVisible('ctl0_body_ctl4');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
index 1cae0d43..99bb0509 100755
--- a/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php
@@ -1,37 +1,37 @@
 <?php
 
 //New Test
-class QuickstartListBoxTestCase extends PradoGenericSeleniumTest
+class QuickstartListBoxTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TListBox.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TListBox.Home&amp;notheme=true&amp;lang=en");
 
 		// a default single selection listbox
 		$this->verifyAttribute("ctl0\$body\$ctl0@size","4");
 
 		// single selection list box with initial options
-		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4')); 
+		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl1"), array('item 1', 'item 2', 'item 3', 'item 4'));
 		$this->assertSelected("ctl0\$body\$ctl1","item 2");
 
 		// a single selection list box with customized style
 		$this->verifyAttribute("ctl0\$body\$ctl2@size","3");
-		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl2"), array('item 1', 'item 2', 'item 3', 'item 4')); 
+		$this->assertEquals($this->getSelectOptions("ctl0\$body\$ctl2"), array('item 1', 'item 2', 'item 3', 'item 4'));
 		$this->assertSelected("ctl0\$body\$ctl2","item 2");
 
 		// a disabled list box
 		$this->verifyAttribute("ctl0\$body\$ctl3@disabled","regexp:true|disabled");
 
 		// an auto postback single selection list box
-		$this->verifyTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
+		$this->assertTextNotPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
 		$this->selectAndWait("ctl0\$body\$ctl4", "label=item 3");
-		$this->verifyTextPresent("exact:Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
 
 		// a single selection list box upon postback
 		$this->select("ctl0\$body\$ListBox1", "label=item 4");
-		$this->verifyTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
+		$this->assertTextNotPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyTextPresent("exact:Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
+		$this->assertTextPresent("Your selection is: (Index: 3, Value: value 4, Text: item 4)", "");
 
 		// a multiple selection list box
 		$this->verifyAttribute("ctl0\$body\$ctl6[]@size","4");
@@ -44,39 +44,38 @@ class QuickstartListBoxTestCase extends PradoGenericSeleniumTest
 		// multiselection list box's behavior upon postback
 		$this->addSelection("ctl0\$body\$ListBox2[]", "label=item 3");
 		$this->clickAndWait("name=ctl0\$body\$ctl8", "");
-		$this->verifyText("ctl0_body_MultiSelectionResult2","exact:Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 3, Value: value 4, Text: item 4)");
+		$this->assertText("ctl0_body_MultiSelectionResult2","Your selection is: (Index: 1, Value: value 2, Text: item 2)(Index: 2, Value: value 3, Text: item 3)(Index: 3, Value: value 4, Text: item 4)");
 
 		// Auto postback multiselection list box
 		$this->addSelection("ctl0\$body\$ctl9[]", "label=item 1");
-		$this->waitForPageToLoad(1000);
-		$this->verifyText("ctl0_body_MultiSelectionResult","exact:Your selection is: (Index: 0, Value: value 1, Text: item 1)(Index: 1, Value: value 2, Text: item 2)(Index: 3, Value: value 4, Text: item 4)");
+		$this->assertText("ctl0_body_MultiSelectionResult","Your selection is: (Index: 0, Value: value 1, Text: item 1)(Index: 1, Value: value 2, Text: item 2)(Index: 3, Value: value 4, Text: item 4)");
 
 		// Databind to an integer-indexed array
 		$this->selectAndWait("ctl0\$body\$DBListBox1[]", "label=item 3");
-		$this->verifyTextPresent("exact:Your selection is: (Index: 2, Value: 2, Text: item 3)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: 2, Text: item 3)", "");
 
 		// Databind to an associative array
 		$this->selectAndWait("ctl0\$body\$DBListBox2[]", "label=item 2");
-		$this->verifyTextPresent("exact:Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
+		$this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
 
 		// Databind with DataTextField and DataValueField specified
 		$this->selectAndWait("ctl0\$body\$DBListBox3[]", "label=Cary");
-		$this->verifyTextPresent("exact:Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
 
 		// List box is being validated
-		$this->verifyNotVisible('ctl0_body_ctl10');
+		$this->assertNotVisible('ctl0_body_ctl10');
 		$this->click("id=ctl0_body_ctl11", "");
-		$this->verifyVisible('ctl0_body_ctl10');
+		$this->assertVisible('ctl0_body_ctl10');
 		$this->select("ctl0\$body\$VListBox1", "label=item 2");
 		$this->clickAndWait("id=ctl0_body_ctl11", "");
-		$this->verifyNotVisible('ctl0_body_ctl10');
+		$this->assertNotVisible('ctl0_body_ctl10');
 
 		// List box causing validation
-		$this->verifyNotVisible('ctl0_body_ctl12');
+		$this->assertNotVisible('ctl0_body_ctl12');
 		$this->select("ctl0\$body\$VListBox2", "label=Agree");
-		$this->verifyVisible('ctl0_body_ctl12');
+		$this->assertVisible('ctl0_body_ctl12');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->selectAndWait("ctl0\$body\$VListBox2", "label=Disagree");
-		$this->verifyNotVisible('ctl0_body_ctl12');
+		$this->assertNotVisible('ctl0_body_ctl12');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php b/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php
index 2b47456e..43e0ed8d 100755
--- a/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php
@@ -1,34 +1,34 @@
 <?php
 
-class QuickstartMultiViewTestCase extends PradoGenericSeleniumTest
+class QuickstartMultiViewTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TMultiView.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TMultiView.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// view 1 : type in a string
-		$this->verifyElementNotPresent('ctl0_body_Result1');
-		$this->verifyElementNotPresent('ctl0_body_Result2');
+		$this->assertElementNotPresent('ctl0_body_Result1');
+		$this->assertElementNotPresent('ctl0_body_Result2');
 		$this->type('ctl0_body_Memo','test');
 		$this->clickAndWait('ctl0$body$ctl0'); // view 2 to select the dropdown
 		$this->clickAndWait('ctl0$body$ctl4');
 
 		// view 3 : check if the output is updated
-		$this->verifyTextPresent('Your text input is: test');
-		$this->verifyTextPresent('Your color choice is: Red');
+		$this->assertTextPresent('Your text input is: test');
+		$this->assertTextPresent('Your color choice is: Red');
 		$this->clickAndWait('ctl0$body$ctl7');
 
 		// view 2 : update dropdownlist
-		$this->verifyElementNotPresent('ctl0_body_Result1');
-		$this->verifyElementNotPresent('ctl0_body_Result2');
+		$this->assertElementNotPresent('ctl0_body_Result1');
+		$this->assertElementNotPresent('ctl0_body_Result2');
 		$this->select('ctl0$body$DropDownList', "label=Blue");
 		$this->clickAndWait('ctl0$body$ctl4');
 
 		// view 3 : check if the output is updated
-		$this->verifyTextPresent('Your text input is: test');
-		$this->verifyTextPresent('Your color choice is: Blue');
+		$this->assertTextPresent('Your text input is: test');
+		$this->assertTextPresent('Your color choice is: Blue');
 		$this->clickAndWait('ctl0$body$ctl7');
 
 		// view 2 : check if dropdownlist maintains state
diff --git a/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php b/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php
index a1fefed6..ecbfe82d 100755
--- a/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/PagerTestCase.php
@@ -1,56 +1,56 @@
 <?php
 
-class QuickstartPagerTestCase extends PradoGenericSeleniumTest
+class QuickstartPagerTestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TPager.Sample1&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TPager.Sample1&amp;notheme=true&amp;lang=en");
 
 		// verify datalist content
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('ITN002','');
-		$this->verifyTextNotPresent('ITN003','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('ITN002','');
+		$this->assertTextNotPresent('ITN003','');
 
 		// verify numeric paging
 		$this->clickAndWait("ctl0_body_Pager_ctl1", ""); // 2nd page
-		$this->verifyTextPresent('ITN003','');
-		$this->verifyTextPresent('ITN004','');
-		$this->verifyTextNotPresent('ITN002','');
-		$this->verifyTextNotPresent('ITN005','');
+		$this->assertTextPresent('ITN003','');
+		$this->assertTextPresent('ITN004','');
+		$this->assertTextNotPresent('ITN002','');
+		$this->assertTextNotPresent('ITN005','');
 		$this->clickAndWait("ctl0_body_Pager_ctl3", ""); // 4rd page
-		$this->verifyTextPresent('ITN007','');
-		$this->verifyTextPresent('ITN008','');
-		$this->verifyTextNotPresent('ITN006','');
-		$this->verifyTextNotPresent('ITN009','');
+		$this->assertTextPresent('ITN007','');
+		$this->assertTextPresent('ITN008','');
+		$this->assertTextNotPresent('ITN006','');
+		$this->assertTextNotPresent('ITN009','');
 		$this->clickAndWait("ctl0_body_Pager_ctl6", ""); // last page
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextNotPresent('ITN018','');
-		$this->verifyTextNotPresent('ITN001','');
+		$this->assertTextPresent('ITN019','');
+		$this->assertTextNotPresent('ITN018','');
+		$this->assertTextNotPresent('ITN001','');
 
 		// verify next-prev paging
 		$this->clickAndWait("ctl0_body_Pager2_ctl1", ""); // prev page
-		$this->verifyTextPresent('ITN017','');
-		$this->verifyTextPresent('ITN018','');
-		$this->verifyTextNotPresent('ITN019','');
-		$this->verifyTextNotPresent('ITN016','');
+		$this->assertTextPresent('ITN017','');
+		$this->assertTextPresent('ITN018','');
+		$this->assertTextNotPresent('ITN019','');
+		$this->assertTextNotPresent('ITN016','');
 		$this->clickAndWait("ctl0_body_Pager2_ctl0", ""); // first page
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('ITN002','');
-		$this->verifyTextNotPresent('ITN003','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('ITN002','');
+		$this->assertTextNotPresent('ITN003','');
 		$this->clickAndWait("ctl0_body_Pager2_ctl2", ""); // next page
-		$this->verifyTextPresent('ITN003','');
-		$this->verifyTextPresent('ITN004','');
-		$this->verifyTextNotPresent('ITN002','');
-		$this->verifyTextNotPresent('ITN005','');
+		$this->assertTextPresent('ITN003','');
+		$this->assertTextPresent('ITN004','');
+		$this->assertTextNotPresent('ITN002','');
+		$this->assertTextNotPresent('ITN005','');
 
 		$this->assertSelected("ctl0_body_Pager3_ctl0","2");
 		$this->selectAndWait("ctl0_body_Pager3_ctl0", "label=5");
-		$this->verifyTextPresent('ITN009','');
-		$this->verifyTextPresent('ITN010','');
-		$this->verifyTextNotPresent('ITN008','');
-		$this->verifyTextNotPresent('ITN011','');
+		$this->assertTextPresent('ITN009','');
+		$this->assertTextPresent('ITN010','');
+		$this->assertTextNotPresent('ITN008','');
+		$this->assertTextNotPresent('ITN011','');
 		$this->selectAndWait("ctl0_body_Pager3_ctl0", "label=10");
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextNotPresent('ITN018','');
+		$this->assertTextPresent('ITN019','');
+		$this->assertTextNotPresent('ITN018','');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php b/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php
index 3def308b..1360ec2f 100755
--- a/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/PanelTestCase.php
@@ -1,16 +1,16 @@
 <?php
 
-class QuickstartPanelTestCase extends PradoGenericSeleniumTest
+class QuickstartPanelTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TPanel.Home&amp;notheme=true&amp;lang=en", "");
-		$this->verifyTextPresent("This is panel content with", "");
-		$this->verifyElementPresent("//span[text()='label']");
-		$this->verifyTextPresent("grouping text", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TPanel.Home&amp;notheme=true&amp;lang=en");
+		$this->assertTextPresent("This is panel content with", "");
+		$this->assertElementPresent("//span[text()='label']");
+		$this->assertTextPresent("grouping text", "");
 		$this->click("//input[@name='ctl0\$body\$ctl17']", "");
-		$this->verifyTextNotPresent("You have clicked on 'button2'.");
+		$this->assertTextNotPresent("You have clicked on 'button2'.");
 		$this->clickAndWait("//input[@type='submit' and @value='button2']", "");
-		$this->verifyTextPresent("You have clicked on 'button2'.");
+		$this->assertTextPresent("You have clicked on 'button2'.");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php b/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php
index 659f20ff..a9092225 100755
--- a/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php
@@ -1,11 +1,11 @@
 <?php
 
 //New Test
-class QuickstartRadioButtonListTestCase extends PradoGenericSeleniumTest
+class QuickstartRadioButtonListTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButtonList.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButtonList.Home&amp;notheme=true&amp;lang=en");
 
 		// RadioButton list with default settings:
 		$this->click("//input[@name='ctl0\$body\$ctl0' and @value='value 3']", "");
@@ -22,31 +22,31 @@ class QuickstartRadioButtonListTestCase extends PradoGenericSeleniumTest
 		// RadioButton list's behavior upon postback
 		$this->click("//input[@name='ctl0\$body\$RadioButtonList' and @value='value 3']", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: value 3, Text: item 3)", "");
 
 		// Auto postback check box list
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl7' and @value='value 5']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", "");
+		$this->assertTextPresent("Your selection is: (Index: 4, Value: value 5, Text: item 5)", "");
 
 		// Databind to an integer-indexed array
 		$this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList1' and @value='0']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 0, Value: 0, Text: item 1)", "");
+		$this->assertTextPresent("Your selection is: (Index: 0, Value: 0, Text: item 1)", "");
 
 		// Databind to an associative array:
 		$this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList2' and @value='key 2']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
+		$this->assertTextPresent("Your selection is: (Index: 1, Value: key 2, Text: item 2)", "");
 
 		// Databind with DataTextField and DataValueField specified
 		$this->clickAndWait("//input[@name='ctl0\$body\$DBRadioButtonList3' and @value='003']", "");
-		$this->verifyTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
+		$this->assertTextPresent("Your selection is: (Index: 2, Value: 003, Text: Cary)", "");
 
 		// RadioButton list causing validation
-		$this->verifyNotVisible('ctl0_body_ctl8');
+		$this->assertNotVisible('ctl0_body_ctl8');
 		$this->click("//input[@name='ctl0\$body\$ctl9' and @value='Agree']", "");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl8');
+		$this->assertVisible('ctl0_body_ctl8');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl9' and @value='Disagree']", "");
-		$this->verifyNotVisible('ctl0_body_ctl8');
+		$this->assertNotVisible('ctl0_body_ctl8');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php b/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php
index 22031235..da58ce3a 100755
--- a/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class QuickstartRadioButtonTestCase extends PradoGenericSeleniumTest
+class QuickstartRadioButtonTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButton.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRadioButton.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
@@ -15,42 +15,42 @@ class QuickstartRadioButtonTestCase extends PradoGenericSeleniumTest
 		$this->click("//input[@name='ctl0\$body\$ctl1' and @value='value']", "");
 
 		// an auto postback radiobutton
-		$this->verifyTextNotPresent("I'm clicked");
+		$this->assertTextNotPresent("I'm clicked");
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", "");
-		$this->verifyTextPresent("I'm clicked");
+		$this->assertTextPresent("I'm clicked");
 		$this->click("//input[@name='ctl0\$body\$ctl2' and @value='ctl0\$body\$ctl2']", "");
-		$this->verifyTextPresent("I'm clicked");
+		$this->assertTextPresent("I'm clicked");
 
 		// a radiobutton causing validation on a textbox
-		$this->verifyNotVisible('ctl0_body_ctl3');
+		$this->assertNotVisible('ctl0_body_ctl3');
 		$this->click("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", "");
 		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl3');
+		$this->assertVisible('ctl0_body_ctl3');
 		$this->click("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", "");
 		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl3');
+		$this->assertVisible('ctl0_body_ctl3');
 		$this->type("ctl0\$body\$TextBox", "test");
 		$this->clickAndWait("//input[@name='ctl0\$body\$ctl4' and @value='ctl0\$body\$ctl4']", "");
-		$this->verifyNotVisible('ctl0_body_ctl3');
+		$this->assertNotVisible('ctl0_body_ctl3');
 
 		// a radiobutton validated by a required field validator
-		$this->verifyNotVisible('ctl0_body_ctl6');
+		$this->assertNotVisible('ctl0_body_ctl6');
 		$this->click("//input[@type='submit' and @value='Submit']", "");
 		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl6');
+		$this->assertVisible('ctl0_body_ctl6');
 		$this->click("//input[@name='ctl0\$body\$RadioButton' and @value='ctl0\$body\$RadioButton']", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyNotVisible('ctl0_body_ctl6');
+		$this->assertNotVisible('ctl0_body_ctl6');
 
 		// a radiobutton group
 		$this->clickAndWait("name=ctl0\$body\$ctl7", "");
-		$this->verifyTextPresent("Your selection is empty");
+		$this->assertTextPresent("Your selection is empty");
 		$this->click("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio2']", "");
 		$this->clickAndWait("name=ctl0\$body\$ctl7", "");
-		$this->verifyTextPresent("Your selection is 2");
+		$this->assertTextPresent("Your selection is 2");
 		$this->click("//input[@name='ctl0\$body\$RadioGroup' and @value='ctl0\$body\$Radio3']", "");
 		$this->click("//input[@name='ctl0\$body\$Radio4' and @value='ctl0\$body\$Radio4']", "");
 		$this->clickAndWait("name=ctl0\$body\$ctl7", "");
-		$this->verifyTextPresent("Your selection is 34");
+		$this->assertTextPresent("Your selection is 34");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php b/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php
index 948055e1..983e3b65 100755
--- a/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php
@@ -1,27 +1,27 @@
 <?php
 
-class QuickstartRepeater1TestCase extends PradoGenericSeleniumTest
+class QuickstartRepeater1TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample1&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample1&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('ID','');
-		$this->verifyTextPresent('Name','');
-		$this->verifyTextPresent('Quantity','');
-		$this->verifyTextPresent('Price','');
-		$this->verifyTextPresent('Imported','');
-		$this->verifyTextPresent('ITN001','');
-		$this->verifyTextPresent('Motherboard','');
-		$this->verifyTextPresent('Yes','');
-		$this->verifyTextPresent('ITN019','');
-		$this->verifyTextPresent('Speaker','');
-		$this->verifyTextPresent('No','');
-		$this->verifyTextPresent('Computer Parts Inventory','');
+		$this->assertTextPresent('ID','');
+		$this->assertTextPresent('Name','');
+		$this->assertTextPresent('Quantity','');
+		$this->assertTextPresent('Price','');
+		$this->assertTextPresent('Imported','');
+		$this->assertTextPresent('ITN001','');
+		$this->assertTextPresent('Motherboard','');
+		$this->assertTextPresent('Yes','');
+		$this->assertTextPresent('ITN019','');
+		$this->assertTextPresent('Speaker','');
+		$this->assertTextPresent('No','');
+		$this->assertTextPresent('Computer Parts Inventory','');
 
 		// verify specific table tags
-		$this->verifyElementPresent("//td[@colspan='5']");
-		$this->verifyElementPresent("//table[@cellpadding='2']");
+		$this->assertElementPresent("//td[@colspan='5']");
+		$this->assertElementPresent("//table[@cellpadding='2']");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php b/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php
index 7d989fd0..a36af297 100755
--- a/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php
@@ -1,35 +1,35 @@
 <?php
 
-class QuickstartRepeater2TestCase extends PradoGenericSeleniumTest
+class QuickstartRepeater2TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample2&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample2&amp;notheme=true&amp;lang=en");
 
 		// verify if all required texts are present
-		$this->verifyTextPresent('North','');
-		$this->verifyTextPresent('John','');
-		$this->verifyTextPresent('Developer','');
-		$this->verifyTextPresent('South','');
-		$this->verifyTextPresent('Carter','');
-		$this->verifyTextPresent('Program Manager','');
+		$this->assertTextPresent('North','');
+		$this->assertTextPresent('John','');
+		$this->assertTextPresent('Developer','');
+		$this->assertTextPresent('South','');
+		$this->assertTextPresent('Carter','');
+		$this->assertTextPresent('Program Manager','');
 
 		// verify specific table tags
-		$this->verifyElementPresent("//table[@cellspacing='1']");
-		$this->verifyElementPresent("//td[@id='ctl0_body_Repeater_ctl1_Cell' and contains(text(),'North')]","");
-		$this->verifyElementPresent("//td[@id='ctl0_body_Repeater_ctl1_Cell']","");
-		$this->verifyElementPresent("//td[@id='ctl0_body_Repeater_ctl2_Cell']","");
-		$this->verifyElementPresent("//td[@id='ctl0_body_Repeater_ctl3_Cell']","");
-		$this->verifyElementPresent("//td[@id='ctl0_body_Repeater_ctl4_Cell']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl1_Repeater2_ctl1_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl1_Repeater2_ctl2_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl1_Repeater2_ctl3_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl2_Repeater2_ctl1_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl2_Repeater2_ctl2_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl2_Repeater2_ctl3_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl3_Repeater2_ctl1_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl3_Repeater2_ctl2_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl4_Repeater2_ctl1_Row']","");
-		$this->verifyElementPresent("//tr[@id='ctl0_body_Repeater_ctl4_Repeater2_ctl2_Row']","");
+		$this->assertElementPresent("//table[@cellspacing='1']");
+		$this->assertElementPresent("//td[@id='ctl0_body_Repeater_ctl1_Cell' and contains(text(),'North')]","");
+		$this->assertElementPresent("//td[@id='ctl0_body_Repeater_ctl1_Cell']","");
+		$this->assertElementPresent("//td[@id='ctl0_body_Repeater_ctl2_Cell']","");
+		$this->assertElementPresent("//td[@id='ctl0_body_Repeater_ctl3_Cell']","");
+		$this->assertElementPresent("//td[@id='ctl0_body_Repeater_ctl4_Cell']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl1_Repeater2_ctl1_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl1_Repeater2_ctl2_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl1_Repeater2_ctl3_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl2_Repeater2_ctl1_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl2_Repeater2_ctl2_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl2_Repeater2_ctl3_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl3_Repeater2_ctl1_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl3_Repeater2_ctl2_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl4_Repeater2_ctl1_Row']","");
+		$this->assertElementPresent("//tr[@id='ctl0_body_Repeater_ctl4_Repeater2_ctl2_Row']","");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php b/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php
index a5031af5..22a5ab71 100755
--- a/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php
@@ -1,22 +1,22 @@
 <?php
 
-class QuickstartRepeater3TestCase extends PradoGenericSeleniumTest
+class QuickstartRepeater3TestCase extends PradoGenericSelenium2Test
 {
 	function test()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample3&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TRepeater.Sample3&amp;notheme=true&amp;lang=en");
 
 		// verify product name is required
-		$this->verifyNotVisible('ctl0_body_Repeater_ctl0_ctl0');
+		$this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl0');
 		$this->type("ctl0_body_Repeater_ctl0_ProductName", "");
 		$this->click("//input[@type='submit' and @value='Save']", "");
-		$this->verifyVisible('ctl0_body_Repeater_ctl0_ctl0');
+		$this->assertVisible('ctl0_body_Repeater_ctl0_ctl0');
 
 		// verify product price is of proper format
-		$this->verifyNotVisible('ctl0_body_Repeater_ctl0_ctl1');
+		$this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl1');
 		$this->type("ctl0_body_Repeater_ctl0_ProductPrice", "abc");
 		$this->click("//input[@type='submit' and @value='Save']", "");
-		$this->verifyVisible('ctl0_body_Repeater_ctl0_ctl1');
+		$this->assertVisible('ctl0_body_Repeater_ctl0_ctl1');
 
 		// perform postback
 		$this->click("ctl0_body_Repeater_ctl0_ProductImported",'');
@@ -24,12 +24,12 @@ class QuickstartRepeater3TestCase extends PradoGenericSeleniumTest
 		$this->type("ctl0_body_Repeater_ctl0_ProductPrice", "99.01");
 		$this->select("ctl0_body_Repeater_ctl3_ProductCategory", "label=Accessories");
 		$this->clickAndWait("//input[@type='submit' and @value='Save']", "");
-		$this->verifyNotVisible('ctl0_body_Repeater_ctl0_ctl0');
-		$this->verifyNotVisible('ctl0_body_Repeater_ctl0_ctl1');
+		$this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl0');
+		$this->assertNotVisible('ctl0_body_Repeater_ctl0_ctl1');
 
 		// verify postback results
-		$this->verifyElementPresent("//td[text()='Mother Board']",'');
-		$this->verifyElementNotPresent("//td[text()='Input Devices']",'');
-		$this->verifyElementPresent("//td[text()='99.01']",'');
+		$this->assertElementPresent("//td[text()='Mother Board']",'');
+		$this->assertElementNotPresent("//td[text()='Input Devices']",'');
+		$this->assertElementPresent("//td[text()='99.01']",'');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php b/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php
index a7c4c579..4085b005 100755
--- a/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php
@@ -1,13 +1,13 @@
 <?php
 
-class QuickstartStatementsTestCase extends PradoGenericSeleniumTest
+class QuickstartStatementsTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TStatements.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TStatements.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
-		$this->verifyTextPresent('UniqueID is \'ctl0$body$ctl0\'');
+		$this->assertTextPresent('UniqueID is \'ctl0$body$ctl0\'');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php b/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php
index d01e824d..3dc54ae2 100755
--- a/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/TabPanelTestCase.php
@@ -1,47 +1,47 @@
 <?php
 
-class QuickstartTabPanelTestCase extends PradoGenericSeleniumTest
+class QuickstartTabPanelTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TTabPanel.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTabPanel.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// verify initial visibility
-		$this->verifyNotVisible('ctl0_body_View1');		// view 1
-		$this->verifyVisible('ctl0_body_View2');		// view 2
-		$this->verifyNotVisible('ctl0_body_ctl2');		// view 3
+		$this->assertNotVisible('ctl0_body_View1');		// view 1
+		$this->assertVisible('ctl0_body_View2');		// view 2
+		$this->assertNotVisible('ctl0_body_ctl2');		// view 3
 
 		// switching to the first view
 		$this->click('ctl0_body_View1_0');
 		$this->pause(500);
-		$this->verifyVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyNotVisible('ctl0_body_ctl2');		// view 3
-		$this->verifyNotVisible('ctl0_body_View11');	// view 11
-		$this->verifyVisible('ctl0_body_View21');		// view 21
+		$this->assertVisible('ctl0_body_View1');		// view 1
+		$this->assertNotVisible('ctl0_body_View2');		// view 2
+		$this->assertNotVisible('ctl0_body_ctl2');		// view 3
+		$this->assertNotVisible('ctl0_body_View11');	// view 11
+		$this->assertVisible('ctl0_body_View21');		// view 21
 
 		// switching to View11
 		$this->click('ctl0_body_View11_0');
 		$this->pause(500);
-		$this->verifyVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyNotVisible('ctl0_body_ctl2');		// view 3
-		$this->verifyVisible('ctl0_body_View11');		// view 11
-		$this->verifyNotVisible('ctl0_body_View21');	// view 21
+		$this->assertVisible('ctl0_body_View1');		// view 1
+		$this->assertNotVisible('ctl0_body_View2');		// view 2
+		$this->assertNotVisible('ctl0_body_ctl2');		// view 3
+		$this->assertVisible('ctl0_body_View11');		// view 11
+		$this->assertNotVisible('ctl0_body_View21');	// view 21
 
 		// switching to the third view
 		$this->click('ctl0_body_ctl2_0');
 		$this->pause(500);
-		$this->verifyNotVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyVisible('ctl0_body_ctl2');			// view 3
+		$this->assertNotVisible('ctl0_body_View1');		// view 1
+		$this->assertNotVisible('ctl0_body_View2');		// view 2
+		$this->assertVisible('ctl0_body_ctl2');			// view 3
 
 		// submit: check if the visibility is kept
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyNotVisible('ctl0_body_View1');		// view 1
-		$this->verifyNotVisible('ctl0_body_View2');		// view 2
-		$this->verifyVisible('ctl0_body_ctl2');			// view 3
+		$this->assertNotVisible('ctl0_body_View1');		// view 1
+		$this->assertNotVisible('ctl0_body_View2');		// view 2
+		$this->assertVisible('ctl0_body_ctl2');			// view 3
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/TableTestCase.php b/tests/FunctionalTests/quickstart/Controls/TableTestCase.php
index 128f4b22..aafd6f80 100755
--- a/tests/FunctionalTests/quickstart/Controls/TableTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/TableTestCase.php
@@ -1,18 +1,18 @@
 <?php
 
-class QuickstartTableTestCase extends PradoGenericSeleniumTest
+class QuickstartTableTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TTable.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTable.Home&amp;notheme=true&amp;lang=en");
 
-		$this->verifyElementPresent("//table[@rules='all' and @border='1']");
-		$this->verifyElementPresent("//table/caption[@align='bottom' and text()='This is table caption']");
-		$this->verifyElementPresent("//th[text()='header cell 2']");
-		$this->verifyElementPresent("//tr[@align='right']/td[text()='text']");
-		$this->verifyElementPresent("//td[@align='center' and contains(text(),'cell 5')]");
+		$this->assertElementPresent("//table[@rules='all' and @border='1']");
+		$this->assertElementPresent("//table/caption[@align='bottom' and text()='This is table caption']");
+		$this->assertElementPresent("//th[text()='header cell 2']");
+		$this->assertElementPresent("//tr[@align='right']/td[text()='text']");
+		$this->assertElementPresent("//td[@align='center' and contains(text(),'cell 5')]");
 
-		$this->verifyElementPresent("//th[text()='Header 1']");
-		$this->verifyElementPresent("//td[text()='Cell 1']");
+		$this->assertElementPresent("//th[text()='Header 1']");
+		$this->assertElementPresent("//td[text()='Cell 1']");
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php
index a3464702..0f512d2c 100755
--- a/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php
@@ -1,10 +1,10 @@
 <?php
 
-class QuickstartTextBoxTestCase extends PradoGenericSeleniumTest
+class QuickstartTextBoxTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TTextBox.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TTextBox.Home&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
@@ -29,27 +29,27 @@ class QuickstartTextBoxTestCase extends PradoGenericSeleniumTest
 		$this->verifyAttribute("ctl0\$body\$ctl5@readonly","regexp:true|readonly");
 
 		// auto postback textbox, CausesValidation=false
-		$this->verifyValue("ctl0\$body\$ctl6", "change me");
-		$this->typeAndWait("ctl0\$body\$ctl6", "change mes");
-		$this->verifyValue("ctl0\$body\$ctl6", "text changed");
+		$this->assertValue("ctl0\$body\$ctl6", "change me");
+		$this->type("ctl0\$body\$ctl6", "change mes");
+		$this->assertValue("ctl0\$body\$ctl6", "text changed");
 
 		// auto postback textbox, CausesValidation=true
-		$this->verifyNotVisible('ctl0_body_ctl7');
+		$this->assertNotVisible('ctl0_body_ctl7');
 		$this->type("ctl0\$body\$TextBox3", "test");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl7');
-		$this->typeAndWait("ctl0\$body\$TextBox3", "non test");
-		$this->verifyNotVisible('ctl0_body_ctl7');
+		$this->assertVisible('ctl0_body_ctl7');
+		$this->type("ctl0\$body\$TextBox3", "non test");
+		$this->assertNotVisible('ctl0_body_ctl7');
 
 		// submitting textbox with a button
 		$this->type("ctl0\$body\$TextBox1", "texttext");
 		$this->clickAndWait("//input[@type='submit' and @value='Submit']", "");
-		$this->verifyValue("ctl0\$body\$TextBox1", "You just entered 'texttext'.");
+		$this->assertValue("ctl0\$body\$TextBox1", "You just entered 'texttext'.");
 
 		// SafeText
-		$this->verifyText("ctl0_body_Output","test");
-		$this->typeAndWait("ctl0\$body\$TextBox2","<a href=javascript:xxx>malicious code</a>");
-		$this->verifyText("ctl0_body_Output","malicious code");
+		$this->assertText("ctl0_body_Output","test");
+		$this->type("ctl0\$body\$TextBox2","<a href=javascript:xxx>malicious code</a>");
+		$this->assertText("ctl0_body_Output","malicious code");
 
 		// password
 		$this->verifyAttribute("ctl0\$body\$ctl9@type","password");
@@ -71,21 +71,21 @@ End of message
 		$this->verifyAttribute("ctl0\$body\$ctl13@wrap","off");
 
 		// auto postback textbox
-		$this->verifyValue("ctl0\$body\$ctl14", "change me");
-		$this->typeAndWait("ctl0\$body\$ctl14", "change mes");
-		$this->verifyValue("ctl0\$body\$ctl14", "text changed");
-		$this->verifyValue("ctl0\$body\$ctl10", "This is a\nmultiline\ntextbox.");
-		$this->verifyValue("ctl0\$body\$ctl11", "This is a multiline text box.
+		$this->assertValue("ctl0\$body\$ctl14", "change me");
+		$this->type("ctl0\$body\$ctl14", "change mes");
+		$this->assertValue("ctl0\$body\$ctl14", "text changed");
+		$this->assertValue("ctl0\$body\$ctl10", "This is a\nmultiline\ntextbox.");
+		$this->assertValue("ctl0\$body\$ctl11", "This is a multiline text box.
 In HTML, it is displayed as a textarea.
 End of message
 ");
 
 		// textbox associated with a validator
-		$this->verifyNotVisible('ctl0_body_ctl15');
+		$this->assertNotVisible('ctl0_body_ctl15');
 		$this->type("ctl0\$body\$MultiTextBox3", "demo");
 //		$this->pause(1000);
-		$this->verifyVisible('ctl0_body_ctl15');
-		$this->typeAndWait("ctl0\$body\$MultiTextBox3", "non demo");
-		$this->verifyNotVisible('ctl0_body_ctl15');
+		$this->assertVisible('ctl0_body_ctl15');
+		$this->type("ctl0\$body\$MultiTextBox3", "non demo");
+		$this->assertNotVisible('ctl0_body_ctl15');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php
index 5e7018c4..49a92fb7 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php
@@ -1,24 +1,24 @@
 <?php
 
-class QuickstartWizard1TestCase extends PradoGenericSeleniumTest
+class QuickstartWizard1TestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample1&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample1&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// step 1
-		$this->verifyTextPresent('Wizard Step 1');
-		$this->verifyTextNotPresent('Wizard Step 2');
-		$this->verifyVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
+		$this->assertTextPresent('Wizard Step 1');
+		$this->assertTextNotPresent('Wizard Step 2');
+		$this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
 		$this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled');
 		$this->select('ctl0$body$Wizard1$DropDownList1', "label=Purple");
 		$this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1');
 
 		// step 2
-		$this->verifyTextPresent('Your favorite color is: Purple');
-		$this->verifyTextNotPresent('Wizard Step 1');
-		$this->verifyTextPresent('Wizard Step 2');
+		$this->assertTextPresent('Your favorite color is: Purple');
+		$this->assertTextNotPresent('Wizard Step 1');
+		$this->assertTextPresent('Wizard Step 2');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php
index a77280ff..23881968 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php
@@ -1,24 +1,24 @@
 <?php
 
-class QuickstartWizard2TestCase extends PradoGenericSeleniumTest
+class QuickstartWizard2TestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample2&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample2&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// step 1
-		$this->verifyTextPresent('Please let us know your preference');
-		$this->verifyTextNotPresent('Thank you for your answer');
-		$this->verifyVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
+		$this->assertTextPresent('Please let us know your preference');
+		$this->assertTextNotPresent('Thank you for your answer');
+		$this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
 		$this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton@disabled','regexp:true|disabled');
 		$this->select('ctl0$body$Wizard1$DropDownList1', "label=Blue");
 		$this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1');
 
 		// step 2
-		$this->verifyTextPresent('Your favorite color is: Blue');
-		$this->verifyTextNotPresent('Please let us know your preference');
-		$this->verifyTextPresent('Thank you for your answer');
+		$this->assertTextPresent('Your favorite color is: Blue');
+		$this->assertTextNotPresent('Please let us know your preference');
+		$this->assertTextPresent('Thank you for your answer');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php
index ec0efe90..d58ca4fe 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php
@@ -1,16 +1,16 @@
 <?php
 
-class QuickstartWizard3TestCase extends PradoGenericSeleniumTest
+class QuickstartWizard3TestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// step 1
-		$this->verifyTextPresent('A Mini Survey');
-		$this->verifyTextPresent('PRADO QuickStart Sample');
+		$this->assertTextPresent('A Mini Survey');
+		$this->assertTextPresent('PRADO QuickStart Sample');
 		$this->click('ctl0_body_Wizard3_StudentCheckBox');
 		$this->clickAndWait('ctl0$body$Wizard3$ctl4$ctl0');
 
@@ -23,12 +23,12 @@ class QuickstartWizard3TestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait('ctl0$body$Wizard3$ctl6$ctl1');
 
 		// step 4
-		$this->verifyTextPresent('You are a college student');
-		$this->verifyTextPresent('You are in major: Chemistry');
-		$this->verifyTextPresent('Your favorite sport is: Tennis');
+		$this->assertTextPresent('You are a college student');
+		$this->assertTextPresent('You are in major: Chemistry');
+		$this->assertTextPresent('Your favorite sport is: Tennis');
 
 		// run the example again. this time we skip the page asking about major
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&amp;notheme=true", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample3&amp;notheme=true");
 
 		// step 1
 		$this->clickAndWait('ctl0$body$Wizard3$ctl4$ctl0');
@@ -38,7 +38,7 @@ class QuickstartWizard3TestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait('ctl0$body$Wizard3$ctl6$ctl1');
 
 		// step 4
-		$this->verifyTextNotPresent('You are a college student');
-		$this->verifyTextPresent('Your favorite sport is: Baseball');
+		$this->assertTextNotPresent('You are a college student');
+		$this->assertTextPresent('Your favorite sport is: Baseball');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php
index f2b8ad6e..fa565abb 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php
@@ -1,21 +1,21 @@
 <?php
 
-class QuickstartWizard4TestCase extends PradoGenericSeleniumTest
+class QuickstartWizard4TestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample4&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample4&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// step 1
-		$this->verifyTextPresent('Step 1 of 3');
+		$this->assertTextPresent('Step 1 of 3');
 		$this->select('ctl0_body_Wizard1_DropDownList1', "label=Cyan");
 		$this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton');
 
 		// step 3
-		$this->verifyTextPresent('Step 3 of 3');
-		$this->verifyTextPresent('Thank you for completing this survey.');
+		$this->assertTextPresent('Step 3 of 3');
+		$this->assertTextPresent('Thank you for completing this survey.');
 		$this->clickAndWait('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
 
 		// step 1
@@ -24,12 +24,12 @@ class QuickstartWizard4TestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait('ctl0_body_Wizard1_ctl4_ctl0');
 
 		// step 2
-		$this->verifyTextPresent('Step 2 of 3');
-		$this->verifyTextPresent('Your favorite color is: Black');
+		$this->assertTextPresent('Step 2 of 3');
+		$this->assertTextPresent('Your favorite color is: Black');
 		$this->clickAndWait('ctl0_body_Wizard1_ctl5_ctl0');
 
 		// step 1
-		$this->verifyTextPresent('Step 1 of 3');
+		$this->assertTextPresent('Step 1 of 3');
 		$this->assertSelected('ctl0_body_Wizard1_DropDownList1', "Black");
 		$this->clickAndWait('ctl0_body_Wizard1_ctl4_ctl0');
 
@@ -37,6 +37,6 @@ class QuickstartWizard4TestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait('ctl0_body_Wizard1_ctl5_ctl1');
 
 		// step 3
-		$this->verifyTextPresent('Step 3 of 3');
+		$this->assertTextPresent('Step 3 of 3');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php b/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php
index eb5edb3b..8fbd59c5 100755
--- a/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php
+++ b/tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php
@@ -1,17 +1,17 @@
 <?php
 
-class QuickstartWizard5TestCase extends PradoGenericSeleniumTest
+class QuickstartWizard5TestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample5&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Controls.Samples.TWizard.Sample5&amp;notheme=true&amp;lang=en");
 
 		$this->verifyTitle("PRADO QuickStart Sample", "");
 
 		// step 1
-		$this->verifyTextPresent('Please let us know your preference');
-		$this->verifyVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
-		$this->verifyVisible('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton');
+		$this->assertTextPresent('Please let us know your preference');
+		$this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl0_SideBarButton');
+		$this->assertVisible('ctl0_body_Wizard1_SideBarList_ctl1_SideBarButton');
 		$this->verifyAttribute('ctl0_body_Wizard1_SideBarList_ctl2_SideBarButton@disabled','regexp:true|disabled');
 		$this->select('ctl0_body_Wizard1_DropDownList1', "label=Cyan");
 		$this->clickAndWait('ctl0$body$Wizard1$ctl4$ctl0');
@@ -29,7 +29,7 @@ class QuickstartWizard5TestCase extends PradoGenericSeleniumTest
 		$this->clickAndWait('ctl0$body$Wizard1$ctl6$ctl1');
 
 		// step 3
-		$this->verifyTextPresent('Your favorite color is: Cyan');
-		$this->verifyTextPresent('Your favorite sport is: Football');
+		$this->assertTextPresent('Your favorite color is: Cyan');
+		$this->assertTextPresent('Your favorite sport is: Football');
 	}
 }
diff --git a/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php b/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php
index 3d531b47..7cf34d30 100755
--- a/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php
+++ b/tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php
@@ -1,32 +1,32 @@
 <?php
 
-class QuickstartHangmanTestCase extends PradoGenericSeleniumTest
+class QuickstartHangmanTestCase extends PradoGenericSelenium2Test
 {
 	function test ()
 	{
-		$this->open("../../demos/quickstart/index.php?page=Fundamentals.Samples.Hangman.Home&amp;notheme=true&amp;lang=en", "");
+		$this->url("../../demos/quickstart/index.php?page=Fundamentals.Samples.Hangman.Home&amp;notheme=true&amp;lang=en");
 		$this->verifyTitle("Hangman Game", "");
-		$this->verifyTextPresent("Medium game; you are allowed 5 misses.", "");
+		$this->assertTextPresent("Medium game; you are allowed 5 misses.", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Play!']", "");
-		$this->verifyTextPresent("You must choose a difficulty level", "");
+		$this->assertTextPresent("You must choose a difficulty level", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Play!']", "");
 		$this->click("//input[@name='ctl0\$body\$LevelSelection' and @value='3']", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Play!']", "");
-		$this->verifyTextPresent("Please make a guess", "");
-		$this->verifyTextPresent("maximum of 3", "");
+		$this->assertTextPresent("Please make a guess", "");
+		$this->assertTextPresent("maximum of 3", "");
 		$this->clickAndWait("link=B", "");
 		$this->clickAndWait("link=F", "");
 		$this->clickAndWait("link=Give up?", "");
-		$this->verifyTextPresent("You Lose", "");
+		$this->assertTextPresent("You Lose", "");
 		$this->clickAndWait("link=Start Again", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Play!']", "");
-		$this->verifyTextPresent("Please make a guess", "");
-		$this->verifyTextPresent("maximum of 3", "");
+		$this->assertTextPresent("Please make a guess", "");
+		$this->assertTextPresent("maximum of 3", "");
 		$this->clickAndWait("link=Give up?", "");
-		$this->verifyTextPresent("You Lose", "");
+		$this->assertTextPresent("You Lose", "");
 		$this->clickAndWait("link=Start Again", "");
 		$this->click("//input[@name='ctl0\$body\$LevelSelection' and @value='5']", "");
 		$this->clickAndWait("//input[@type='submit' and @value='Play!']", "");
-		$this->verifyTextPresent("maximum of 5", "");
+		$this->assertTextPresent("maximum of 5", "");
 	}
 }