diff --git a/apps/basic/tests/unit/_bootstrap.php b/apps/basic/tests/unit/_bootstrap.php
index 51c8d1e..d6d11e9 100644
--- a/apps/basic/tests/unit/_bootstrap.php
+++ b/apps/basic/tests/unit/_bootstrap.php
@@ -1,3 +1,8 @@
 <?php
 
-// add unit testing specific bootstrap code here
\ No newline at end of file
+// add unit testing specific bootstrap code here
+
+yii\codeception\TestCase::$applicationConfig = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/../../config/web.php'),
+	require(__DIR__ . '/../../config/codeception/unit.php')
+);
\ No newline at end of file
diff --git a/extensions/yii/codeception/BasePage.php b/extensions/yii/codeception/BasePage.php
index 0e8aeae..d2e3b77 100644
--- a/extensions/yii/codeception/BasePage.php
+++ b/extensions/yii/codeception/BasePage.php
@@ -2,13 +2,18 @@
 
 namespace yii\codeception;
 
-use Codeception\AbstractGuy;
-
 /**
+ * Represents a web page to test
+ *
+ * Pages extend from this class and declare UI map for this page via
+ * static properties. CSS or XPath allowed.
+ *
+ * Here is an example:
  *
- * Declare UI map for this page here. CSS or XPath allowed.
+ * ```php
  * public static $usernameField = '#username';
  * public static $formSubmitButton = "#mainForm input[type=submit]";
+ * ```
  *
  * @author Mark Jebri <mark.github@yandex.ru>
  * @since 2.0
@@ -20,7 +25,7 @@ abstract class BasePage
 	 */
 	public static $URL = '';
 	/**
-	 * @var AbstractGuy
+	 * @var \Codeception\AbstractGuy
 	 */
 	protected $guy;
 
diff --git a/extensions/yii/codeception/TestCase.php b/extensions/yii/codeception/TestCase.php
index 44dd92e..e6809bc 100644
--- a/extensions/yii/codeception/TestCase.php
+++ b/extensions/yii/codeception/TestCase.php
@@ -3,20 +3,24 @@
 namespace yii\codeception;
 
 use Yii;
-
+use yii\helpers\ArrayHelper;
+
+/**
+ * TestCase is the base class for all codeception unit tests
+ *
+ * @author Mark Jebri <mark.github@yandex.ru>
+ * @since 2.0
+ */
 class TestCase extends \PHPUnit_Framework_TestCase
 {
 	/**
-	 * Your application base config that will be used for creating application each time before test.
+	 * @var array|string Your application base config that will be used for creating application each time before test.
 	 * This can be an array or alias, pointing to the config file. For example for console application it can be
 	 * '@tests/unit/console_bootstrap.php' that can be similar to existing unit tests bootstrap file.
-	 * @var mixed
 	 */
-	protected $baseConfig = '@app/config/web.php';
-
+	public static $applicationConfig = '@app/config/web.php';
 	/**
-	 * Your application config, will be merged with base config when creating application. Can be an alias too.
-	 * @var mixed
+	 * @var array|string Your application config, will be merged with base config when creating application. Can be an alias too.
 	 */
 	protected $config = [];
 
@@ -24,13 +28,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
 	 * Created application class
 	 * @var string
 	 */
-	protected $appClass = 'yii\web\Application';
-
-	protected function setUp()
-	{
-		parent::setUp();
-		$this->mockApplication();
-	}
+	protected $applicationClass = 'yii\web\Application';
 
 	protected function tearDown()
 	{
@@ -38,16 +36,21 @@ class TestCase extends \PHPUnit_Framework_TestCase
 		parent::tearDown();
 	}
 
+	/**
+	 * Sets up `Yii::$app`.
+	 */
 	protected function mockApplication()
 	{
-		$baseConfig = is_array($this->baseConfig) ? $this->baseConfig : require(Yii::getAlias($this->baseConfig));
+		$baseConfig = is_array(static::$applicationConfig) ? static::$applicationConfig : require(Yii::getAlias(static::$applicationConfig));
 		$config = is_array($this->config)? $this->config : require(Yii::getAlias($this->config));
-		new $this->appClass(\yii\helpers\ArrayHelper::merge($baseConfig,$config));
+		new $this->applicationClass(ArrayHelper::merge($baseConfig,$config));
 	}
 
+	/**
+	 * Destroys an application created via [[mockApplication]].
+	 */
 	protected function destroyApplication()
 	{
 		\Yii::$app = null;
 	}
-
 }