diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 28e8da9f6..818ffad41 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -1648,6 +1648,7 @@ class comment
 	public function loadNested($id, $type, $sort)
 	{
 		$tp = e107::getParser();
+		$this->nestedComments = array();
 
 		$query = "SELECT c.*, u.*, ue.*, r.* FROM #comments AS c
 					LEFT JOIN #user AS u ON c.comment_author_id = u.user_id
diff --git a/e107_tests/tests/unit/commentTest.php b/e107_tests/tests/unit/commentTest.php
index b885124af..1ccff7568 100644
--- a/e107_tests/tests/unit/commentTest.php
+++ b/e107_tests/tests/unit/commentTest.php
@@ -9,20 +9,14 @@
 
 		protected function _before()
 		{
-			if(e107::getDb()->isEmpty('comments'))
+			e107::getDb()->truncate('comments');
+			$path = codecept_data_dir().'comments/commentsSetup.xml';
+			$result = e107::getXml()->e107Import($path);
+			if(!empty($result['failed']))
 			{
-				$path = codecept_data_dir().'comments/commentsSetup.xml';
-				$result = e107::getXml()->e107Import($path);
-				if(!empty($result['failed']))
-				{
-					$this->fail("Vstore setup failed. ".print_r($result['failed'], true));
-				}
-
+				$this->fail("Comment setup failed. ".print_r($result['failed'], true));
 			}
 
-
-
-
 			try
 			{
 				$this->cm = e107::getComment();
diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php
index e6782c530..b03bff553 100644
--- a/e107_tests/tests/unit/e107Test.php
+++ b/e107_tests/tests/unit/e107Test.php
@@ -1076,6 +1076,7 @@ class e107Test extends \Codeception\Test\Unit
 		$e107 = $this->e107;
 		$templates = scandir(e_CORE . "templates");
 
+		$e107::loadAdminIcons();
 
 		$exclude = array(
 			'bbcode_template.php',