diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php
index 28a794d9e..529b444c2 100644
--- a/e107_tests/tests/unit/e107Test.php
+++ b/e107_tests/tests/unit/e107Test.php
@@ -900,6 +900,15 @@ class e107Test extends \Codeception\Test\Unit
 		$template2 = $e107::loadAdminIcons();
 
 		$this->assertSame($new, $template2);
+
+		$range = range(1,10);
+		foreach($range as $t)
+		{
+			e107::loadAdminIcons();
+			$e107::loadAdminIcons();
+		}
+
+
 	}
 
 
diff --git a/e107_tests/tests/unit/e_formTest.php b/e107_tests/tests/unit/e_formTest.php
index b14122c82..56f678299 100644
--- a/e107_tests/tests/unit/e_formTest.php
+++ b/e107_tests/tests/unit/e_formTest.php
@@ -152,8 +152,8 @@ class e_formTest extends \Codeception\Test\Unit
 	{
 		try
 		{
-			$this->_frm = $this->make('e_form');
-			$this->_frm->__construct();
+			$this->_frm = e107::getForm();
+		//	$this->_frm->__construct();
 		}
 		catch (Exception $e)
 		{
diff --git a/e107_tests/tests/unit/e_parse_shortcodeTest.php b/e107_tests/tests/unit/e_parse_shortcodeTest.php
index 9778d2d7c..9e38430ed 100644
--- a/e107_tests/tests/unit/e_parse_shortcodeTest.php
+++ b/e107_tests/tests/unit/e_parse_shortcodeTest.php
@@ -156,7 +156,9 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 
     public function testAdminShortcodes()
     {
-        require_once(e_CORE."shortcodes/batch/admin_shortcodes.php");
+
+      //  require_once(e_CORE."shortcodes/batch/admin_shortcodes.php");
+        e107::getScBatch('admin');
 
         require_once(e_LANGUAGEDIR.'English/admin/lan_header.php');
         require_once(e_LANGUAGEDIR.'English/admin/lan_footer.php');
@@ -608,11 +610,11 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 
     public function testSignupShortcodes()
     {
-        require_once(e_CORE."shortcodes/batch/signup_shortcodes.php");
+      //  require_once(e_CORE."shortcodes/batch/signup_shortcodes.php");
 
         try
 		{
-			$sc = $this->make('signup_shortcodes');
+			$sc = e107::getScBatch('signup'); // $this->make('signup_shortcodes');
 		}
 		catch (Exception $e)
 		{
@@ -702,12 +704,13 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 
 	public function testUserSettingsShortcodes()
     {
-        require_once(e_CORE."shortcodes/batch/usersettings_shortcodes.php");
+   //     require_once(e_CORE."shortcodes/batch/usersettings_shortcodes.php");
 
         try
 		{
 			/** @var user_shortcodes $sc */
-			$sc = $this->make('usersettings_shortcodes');
+	//		$sc = $this->make('usersettings_shortcodes');
+			$sc = e107::getScBatch('usersettings');
 		}
 		catch (Exception $e)
 		{
@@ -746,7 +749,7 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit
 
 			);
 
-		$sc->__construct();
+	//	$sc->__construct();
 		$sc->setVars($vars);
 
 		// these are tested in the user-extended test.