diff --git a/test/Cloud/CloudTest.php b/test/Cloud/CloudTest.php
index 31e8042..a071932 100644
--- a/test/Cloud/CloudTest.php
+++ b/test/Cloud/CloudTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag\Cloud;
@@ -18,9 +17,6 @@
 use ZendTest\Tag\Cloud\TestAsset;
 
 /**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
  * @group      Zend_Tag
  * @group      Zend_Tag_Cloud
  */
diff --git a/test/Cloud/Decorator/HtmlCloudTest.php b/test/Cloud/Decorator/HtmlCloudTest.php
index a2ea521..a1a2327 100644
--- a/test/Cloud/Decorator/HtmlCloudTest.php
+++ b/test/Cloud/Decorator/HtmlCloudTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag\Cloud\Decorator;
@@ -13,9 +12,6 @@
 use Zend\Tag\Cloud\Decorator;
 
 /**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
  * @group      Zend_Tag
  * @group      Zend_Tag_Cloud
  */
diff --git a/test/Cloud/Decorator/HtmlTagTest.php b/test/Cloud/Decorator/HtmlTagTest.php
index 304e222..999c99f 100644
--- a/test/Cloud/Decorator/HtmlTagTest.php
+++ b/test/Cloud/Decorator/HtmlTagTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag\Cloud\Decorator;
@@ -15,9 +14,6 @@
 use Zend\Tag\Cloud\Decorator\Exception\InvalidArgumentException;
 
 /**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
  * @group      Zend_Tag
  * @group      Zend_Tag_Cloud
  */
diff --git a/test/Cloud/TestAsset/CloudDummy.php b/test/Cloud/TestAsset/CloudDummy.php
index aaa8028..ff4a790 100644
--- a/test/Cloud/TestAsset/CloudDummy.php
+++ b/test/Cloud/TestAsset/CloudDummy.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag\Cloud\TestAsset;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
- */
 class CloudDummy extends \Zend\Tag\Cloud\Decorator\HtmlCloud
 {
     protected $_foo;
diff --git a/test/Cloud/TestAsset/CloudDummy1.php b/test/Cloud/TestAsset/CloudDummy1.php
index d3a9d3d..277b54c 100644
--- a/test/Cloud/TestAsset/CloudDummy1.php
+++ b/test/Cloud/TestAsset/CloudDummy1.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag\Cloud\TestAsset;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
- */
 class CloudDummy1 extends \Zend\Tag\Cloud\Decorator\HtmlCloud
 {
     protected $_foo;
diff --git a/test/Cloud/TestAsset/CloudDummy2.php b/test/Cloud/TestAsset/CloudDummy2.php
index 0760dc9..59f204e 100644
--- a/test/Cloud/TestAsset/CloudDummy2.php
+++ b/test/Cloud/TestAsset/CloudDummy2.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag\Cloud\TestAsset;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
- */
 class CloudDummy2 extends \Zend\Tag\Cloud\Decorator\HtmlCloud
 {
     protected $_foo;
diff --git a/test/Cloud/TestAsset/TagDummy.php b/test/Cloud/TestAsset/TagDummy.php
index f06e3b4..bc41913 100644
--- a/test/Cloud/TestAsset/TagDummy.php
+++ b/test/Cloud/TestAsset/TagDummy.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag\Cloud\TestAsset;
 
-/**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
- */
 class TagDummy extends \Zend\Tag\Cloud\Decorator\HtmlTag
 {
     protected $_foo;
diff --git a/test/ItemListTest.php b/test/ItemListTest.php
index b909df4..e994d56 100644
--- a/test/ItemListTest.php
+++ b/test/ItemListTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag;
@@ -15,9 +14,6 @@
 use Zend\Tag\Exception\OutOfBoundsException;
 
 /**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
  * @group      Zend_Tag
  */
 class ItemListTest extends \PHPUnit_Framework_TestCase
diff --git a/test/ItemTest.php b/test/ItemTest.php
index 13fc724..bb329b9 100644
--- a/test/ItemTest.php
+++ b/test/ItemTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Tag
  */
 
 namespace ZendTest\Tag;
@@ -14,14 +13,11 @@
 use Zend\Tag\Exception\InvalidArgumentException;
 
 /**
- * @category   Zend
- * @package    Zend_Tag
- * @subpackage UnitTests
  * @group      Zend_Tag
  */
 class ItemTest extends \PHPUnit_Framework_TestCase
 {
-    public function testConstuctor()
+    public function testConstructor()
     {
         $tag = new Tag\Item(array(
             'title' => 'foo',