diff --git a/framework/test/TestCase.php b/framework/test/TestCase.php
index 3fd92c0..f190e5a 100644
--- a/framework/test/TestCase.php
+++ b/framework/test/TestCase.php
@@ -10,9 +10,9 @@
 namespace yii\test;
 
 require_once('PHPUnit/Runner/Version.php');
-spl_autoload_unregister(array('YiiBase','autoload'));
+spl_autoload_unregister(array('Yii','autoload'));
 require_once('PHPUnit/Autoload.php');
-spl_autoload_register(array('YiiBase','autoload')); // put yii's autoloader at the end
+spl_autoload_register(array('Yii','autoload')); // put yii's autoloader at the end
 
 /**
  * TestCase is the base class for all test case classes.
diff --git a/framework/test/WebTestCase.php b/framework/test/WebTestCase.php
new file mode 100644
index 0000000..39162c9
--- /dev/null
+++ b/framework/test/WebTestCase.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * WebTestCase class.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\test;
+
+require_once('PHPUnit/Runner/Version.php');
+spl_autoload_unregister(array('Yii','autoload'));
+require_once('PHPUnit/Autoload.php');
+spl_autoload_register(array('Yii','autoload')); // put yii's autoloader at the end
+
+/**
+ * WebTestCase is the base class for all test case classes.
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+abstract class WebTestCase extends \PHPUnit_Extensions_SeleniumTestCase
+{
+}
diff --git a/framework/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php
index 4a0f89c..b8c8f2c 100644
--- a/framework/widgets/ActiveForm.php
+++ b/framework/widgets/ActiveForm.php
@@ -63,7 +63,7 @@ class ActiveForm extends Widget
 			$models = array($models);
 		}
 
-		$showAll = isset($options['showAll']) && $options['showAll']);
+		$showAll = isset($options['showAll']) && $options['showAll'];
 		$lines = array();
 		/** @var $model Model */
 		foreach ($models as $model) {