diff --git a/tests/unit/framework/rbac/ManagerTestBase.php b/tests/unit/framework/rbac/ManagerTestBase.php
index 8efa3cf..83ca85b 100644
--- a/tests/unit/framework/rbac/ManagerTestBase.php
+++ b/tests/unit/framework/rbac/ManagerTestBase.php
@@ -32,7 +32,7 @@ abstract class ManagerTestBase extends TestCase
 		$this->assertEquals($item2->type, Item::TYPE_ROLE);
 
 		// test adding an item with the same name
-		$this->setExpectedException('Exception');
+		$this->setExpectedException('\yii\base\Exception');
 		$this->auth->createItem($name, $type, $description, $bizRule, $data);
 	}
 
@@ -69,14 +69,14 @@ abstract class ManagerTestBase extends TestCase
 		$this->auth->addItemChild('createPost', 'updatePost');
 
 		// test adding upper level item to lower one
-		$this->setExpectedException('Exception');
+		$this->setExpectedException('\yii\base\Exception');
 		$this->auth->addItemChild('readPost', 'reader');
 	}
 
 	public function testAddItemChild2()
 	{
 		// test adding inexistent items
-		$this->setExpectedException('Exception');
+		$this->setExpectedException('\yii\base\Exception');
 		$this->assertFalse($this->auth->addItemChild('createPost2', 'updatePost'));
 	}
 
@@ -105,7 +105,7 @@ abstract class ManagerTestBase extends TestCase
 		$this->assertEquals($auth->bizRule, 'rule');
 		$this->assertEquals($auth->data, 'data');
 
-		$this->setExpectedException('Exception');
+		$this->setExpectedException('\yii\base\Exception');
 		$this->auth->assign('new user', 'createPost2', 'rule', 'data');
 	}
 
@@ -158,7 +158,7 @@ abstract class ManagerTestBase extends TestCase
 
 	public function testDetectLoop()
 	{
-		$this->setExpectedException('Exception');
+		$this->setExpectedException('\yii\base\Exception');
 		$this->auth->addItemChild('readPost', 'readPost');
 	}
 
diff --git a/yii/web/Response.php b/yii/web/Response.php
index 954c999..ed73418 100644
--- a/yii/web/Response.php
+++ b/yii/web/Response.php
@@ -15,6 +15,7 @@ use yii\helpers\StringHelper;
 
 /**
  * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
 class Response extends \yii\base\Response