diff --git a/common/framework/parsers/template/TemplateParser_v2.php b/common/framework/parsers/template/TemplateParser_v2.php
index 108075f27..24cf085fc 100644
--- a/common/framework/parsers/template/TemplateParser_v2.php
+++ b/common/framework/parsers/template/TemplateParser_v2.php
@@ -784,7 +784,9 @@ class TemplateParser_v2
 					$escape_option = $filter;
 					break;
 				case 'escapejs':
+				case 'js':
 					$str = "escape_js({$str})";
+					$escape_option = 'noescape';
 					break;
 				case 'json':
 					$str = "json_encode({$str}, \JSON_UNESCAPED_UNICODE | \JSON_UNESCAPED_SLASHES)";
diff --git a/modules/admin/controllers/maintenance/Cleanup.php b/modules/admin/controllers/maintenance/Cleanup.php
index 87a0422c1..26595408f 100644
--- a/modules/admin/controllers/maintenance/Cleanup.php
+++ b/modules/admin/controllers/maintenance/Cleanup.php
@@ -361,6 +361,8 @@ class Cleanup extends Base
 		'modules/spamfilter/spamfilter.lib.php' => 'deleted',
 		'modules/spamfilter/ruleset/' => 'deleted',
 		'phpDoc/' => 'deleted:xe',
+		'tests/unit/classes/template/' => 'deleted',
+		'tests/unit/classes/TemplateHandlerTest.php' => 'deleted',
 		'tools/dbxml_validator/' => 'deleted:xe',
 		'tools/korea_ip_ranges/' => 'deleted',
 		'tools/phpDoc/' => 'deleted',
diff --git a/tests/unit/classes/template/css/style.css b/tests/_data/template/css/style.css
similarity index 100%
rename from tests/unit/classes/template/css/style.css
rename to tests/_data/template/css/style.css
diff --git a/tests/unit/classes/template/sample.html b/tests/_data/template/sample.html
similarity index 100%
rename from tests/unit/classes/template/sample.html
rename to tests/_data/template/sample.html
diff --git a/tests/unit/classes/TemplateHandlerTest.php b/tests/unit/framework/parsers/TemplateParserV1Test.php
similarity index 90%
rename from tests/unit/classes/TemplateHandlerTest.php
rename to tests/unit/framework/parsers/TemplateParserV1Test.php
index c0d0151a2..03b75336e 100644
--- a/tests/unit/classes/TemplateHandlerTest.php
+++ b/tests/unit/framework/parsers/TemplateParserV1Test.php
@@ -1,13 +1,13 @@
 <?php
 
-class TemplateHandlerTest extends \Codeception\TestCase\Test
+class TemplateParserV1Test extends \Codeception\TestCase\Test
 {
 	private $baseurl;
     private $prefix = '<?php if (!defined("RX_VERSION")) exit();';
 
 	public function _before()
 	{
-		$this->baseurl = '/' . basename(dirname(dirname(dirname(__DIR__)))) . '/';
+		$this->baseurl = '/' . basename(dirname(dirname(dirname(dirname(__DIR__))))) . '/';
 	}
 
     public function testParse()
@@ -101,42 +101,42 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             // #include
             array(
                 '<dummy /><!--#include("sample.html")--><div>This is another dummy</div>',
-                '?><dummy /><?php $__tpl=TemplateHandler::getInstance();echo $__tpl->compile(\'tests/unit/classes/template\',\'sample.html\') ?><div>This is another dummy</div>'
+                '?><dummy /><?php $__tpl=TemplateHandler::getInstance();echo $__tpl->compile(\'tests/_data/template\',\'sample.html\') ?><div>This is another dummy</div>'
             ),
             // <include target="file">
             array(
                 '<dummy /><include target="../sample.html" /><div>This is another dummy</div>',
-                '?><dummy /><?php $__tpl=TemplateHandler::getInstance();echo $__tpl->compile(\'tests/unit/classes\',\'sample.html\') ?><div>This is another dummy</div>'
+                '?><dummy /><?php $__tpl=TemplateHandler::getInstance();echo $__tpl->compile(\'tests/_data\',\'sample.html\') ?><div>This is another dummy</div>'
             ),
             // <load target="../../modules/page/lang/lang.xml">
             array(
-                '<dummy /><load target="../../../../modules/page/lang/lang.xml" /><dummy />',
+                '<dummy /><load target="../../../modules/page/lang/lang.xml" /><dummy />',
                 '?><dummy /><?php Context::loadLang(\'modules/page/lang\'); ?><dummy />'
             ),
             // <load target="style.css">
             array(
                 '<dummy /><load target="css/style.css" /><dummy />',
-                '?><dummy /><!--#Meta:tests/unit/classes/template/css/style.css--><?php Context::loadFile([\'tests/unit/classes/template/css/style.css\', \'\', \'\', \'\', []]); ?><dummy />'
+                '?><dummy /><!--#Meta:tests/_data/template/css/style.css--><?php Context::loadFile([\'tests/_data/template/css/style.css\', \'\', \'\', \'\', []]); ?><dummy />'
             ),
             // <unload target="style.css">
             array(
                 '<dummy /><unload target="css/style.css" /><dummy />',
-                '?><dummy /><?php Context::unloadFile(\'tests/unit/classes/template/css/style.css\', \'\', \'\'); ?><dummy />'
+                '?><dummy /><?php Context::unloadFile(\'tests/_data/template/css/style.css\', \'\', \'\'); ?><dummy />'
             ),
             // <!--%import("../../modules/page/tpl/filter/insert_config.xml")-->
             array(
-                '<dummy /><!--%import("../../../../modules/page/tpl/filter/insert_config.xml")--><dummy />',
+                '<dummy /><!--%import("../../../modules/page/tpl/filter/insert_config.xml")--><dummy />',
                 '?><dummy /><?php require_once(\'./classes/xml/XmlJsFilter.class.php\');$__xmlFilter=new XmlJsFilter(\'modules/page/tpl/filter\',\'insert_config.xml\');$__xmlFilter->compile(); ?><dummy />'
             ),
             // <!--%import("../script.js",type="body")-->
             array(
                 '<dummy /><!--%import("../script.js",type="body")--><dummy />',
-                '?><dummy /><!--#Meta:tests/unit/classes/script.js--><?php Context::loadFile([\'tests/unit/classes/script.js\', \'body\', \'\', \'\']); ?><dummy />'
+                '?><dummy /><!--#Meta:tests/_data/script.js--><?php Context::loadFile([\'tests/_data/script.js\', \'body\', \'\', \'\']); ?><dummy />'
             ),
             // <!--%unload("../script.js",type="body")-->
             array(
                 '<dummy /><!--%unload("../script.js",type="body")--><dummy />',
-                '?><dummy /><?php Context::unloadFile(\'tests/unit/classes/script.js\', \'\'); ?><dummy />'
+                '?><dummy /><?php Context::unloadFile(\'tests/_data/script.js\', \'\'); ?><dummy />'
             ),
             // comment
             array(
@@ -151,11 +151,11 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             // relative path1
             array(
                 '<img src="http://naver.com/naver.gif"><input type="image" src="../local.gif" />',
-                '?><img src="http://naver.com/naver.gif"><input type="image" src="' . $this->baseurl . 'tests/unit/classes/local.gif" />'
+                '?><img src="http://naver.com/naver.gif"><input type="image" src="' . $this->baseurl . 'tests/_data/local.gif" />'
             ),
             // relative path2
             array(
-                '<img src="http://naver.com/naver.gif"><input type="image" src="../../../dir/local.gif" />',
+                '<img src="http://naver.com/naver.gif"><input type="image" src="../../dir/local.gif" />',
                 '?><img src="http://naver.com/naver.gif"><input type="image" src="' . $this->baseurl . 'tests/dir/local.gif" />'
             ),
             // error case
@@ -211,12 +211,12 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             // issue 512 - ignores <marquee>
             array(
                 '<div class="topimgContex"><marquee direction="up" scrollamount="1" height="130" loop="infinity" behavior="lscro">{$lang->sl_show_topimgtext}</marquee></div>',
-                '?><div class="topimgContex"><marquee direction="up" scrollamount="1" height="130" loop="infinity" behavior="lscro"><?php echo $lang->sl_show_topimgtext ?></marquee></div>'
+                '?><div class="topimgContex"><marquee direction="up" scrollamount="1" height="130" loop="infinity" behavior="lscro"><?php echo $__Context->lang->sl_show_topimgtext ?? \'\' ?></marquee></div>'
             ),
             // issue 584
             array(
                 '<img cond="$oBodex->display_extra_images[\'mobile\'] && $arr_extra && $arr_extra->bodex->mobile" src="./images/common/mobile.gif" title="mobile" alt="mobile" />',
-                'if($__Context->oBodex->display_extra_images[\'mobile\'] && $__Context->arr_extra && $__Context->arr_extra->bodex->mobile){ ?><img src="' . $this->baseurl . 'tests/unit/classes/template/images/common/mobile.gif" title="mobile" alt="mobile" /><?php } ?>'
+                'if($__Context->oBodex->display_extra_images[\'mobile\'] && $__Context->arr_extra && $__Context->arr_extra->bodex->mobile){ ?><img src="' . $this->baseurl . 'tests/_data/template/images/common/mobile.gif" title="mobile" alt="mobile" /><?php } ?>'
             ),
             // issue 831
             array(
@@ -226,7 +226,7 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             // issue 746
             array(
                 '<img src="../whatever/img.png" />',
-                '?><img src="' . $this->baseurl . 'tests/unit/classes/whatever/img.png" />'
+                '?><img src="' . $this->baseurl . 'tests/_data/whatever/img.png" />'
             ),
             // issue 696
             array(
@@ -236,35 +236,35 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             // https://github.com/xpressengine/xe-core/issues/1510
             array(
                 '<img cond="$foo->bar" src="../common/mobile.gif" />',
-                'if($__Context->foo->bar ?? false){ ?><img src="' . $this->baseurl . 'tests/unit/classes/common/mobile.gif" /><?php } ?>'
+                'if($__Context->foo->bar ?? false){ ?><img src="' . $this->baseurl . 'tests/_data/common/mobile.gif" /><?php } ?>'
             ),
             // https://github.com/xpressengine/xe-core/issues/1510
             array(
                 '<img cond="$foo->bar > 100" alt="a!@#$%^&*()_-=[]{}?/" src="../common/mobile.gif" />',
-                'if($__Context->foo->bar > 100){ ?><img alt="a!@#$%^&*()_-=[]{}?/" src="' . $this->baseurl . 'tests/unit/classes/common/mobile.gif" /><?php } ?>'
+                'if($__Context->foo->bar > 100){ ?><img alt="a!@#$%^&*()_-=[]{}?/" src="' . $this->baseurl . 'tests/_data/common/mobile.gif" /><?php } ?>'
             ),
             // https://github.com/xpressengine/xe-core/issues/1510
             array(
                 '<img src="../common/mobile.gif" cond="$foo->bar" />',
-                'if($__Context->foo->bar ?? false){ ?><img src="' . $this->baseurl . 'tests/unit/classes/common/mobile.gif" /><?php } ?>'
+                'if($__Context->foo->bar ?? false){ ?><img src="' . $this->baseurl . 'tests/_data/common/mobile.gif" /><?php } ?>'
             ),
             // https://github.com/xpressengine/xe-core/issues/1510
             array(
                 '<img class="tmp_class" cond="!$module_info->title" src="../img/common/blank.gif" />',
-                'if(!$__Context->module_info->title){ ?><img class="tmp_class" src="' . $this->baseurl . 'tests/unit/classes/img/common/blank.gif" /><?php } ?>'
+                'if(!$__Context->module_info->title){ ?><img class="tmp_class" src="' . $this->baseurl . 'tests/_data/img/common/blank.gif" /><?php } ?>'
             ),
             // https://github.com/xpressengine/xe-core/issues/1510
             array(
                 '<img cond="$mi->title" class="tmp_class"|cond="$mi->use" src="../img/common/blank.gif" />',
-                'if($__Context->mi->title ?? false){ ?><img<?php if($__Context->mi->use){ ?> class="tmp_class"<?php } ?> src="' . $this->baseurl . 'tests/unit/classes/img/common/blank.gif" /><?php } ?>'
+                'if($__Context->mi->title ?? false){ ?><img<?php if($__Context->mi->use){ ?> class="tmp_class"<?php } ?> src="' . $this->baseurl . 'tests/_data/img/common/blank.gif" /><?php } ?>'
             ),
             array(
                 '<input foo="bar" /> <img cond="$foo->bar" alt="alt"   src="../common/mobile.gif" />',
-                '?><input foo="bar" /> <?php if($__Context->foo->bar ?? false){ ?><img alt="alt"   src="' . $this->baseurl . 'tests/unit/classes/common/mobile.gif" /><?php } ?>'
+                '?><input foo="bar" /> <?php if($__Context->foo->bar ?? false){ ?><img alt="alt"   src="' . $this->baseurl . 'tests/_data/common/mobile.gif" /><?php } ?>'
             ),
             array(
                 '<input foo="bar" />' . "\r\n" . '<input foo="bar" /> <img cond="$foo->bar" alt="alt"   src="../common/mobile.gif" />',
-                '?><input foo="bar" />' . "\n" . '<input foo="bar" /> <?php if($__Context->foo->bar ?? false){ ?><img alt="alt"   src="' . $this->baseurl . 'tests/unit/classes/common/mobile.gif" /><?php } ?>'
+                '?><input foo="bar" />' . "\n" . '<input foo="bar" /> <?php if($__Context->foo->bar ?? false){ ?><img alt="alt"   src="' . $this->baseurl . 'tests/_data/common/mobile.gif" /><?php } ?>'
             ),
             array(
                 'asf <img src="{$foo->bar}" />',
@@ -272,11 +272,11 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             ),
             array(
                 '<img alt="" '.PHP_EOL.' src="../whatever/img.png" />',
-                '?><img alt="" '.PHP_EOL.' src="' . $this->baseurl . 'tests/unit/classes/whatever/img.png" />'
+                '?><img alt="" '.PHP_EOL.' src="' . $this->baseurl . 'tests/_data/whatever/img.png" />'
             ),
             array(
                 '<input>asdf src="../img/img.gif" asdf</input> <img alt="src" src="../whatever/img.png" /> <input>asdf src="../img/img.gif" asdf</input>',
-                '?><input>asdf src="../img/img.gif" asdf</input> <img alt="src" src="' . $this->baseurl . 'tests/unit/classes/whatever/img.png" /> <input>asdf src="../img/img.gif" asdf</input>'
+                '?><input>asdf src="../img/img.gif" asdf</input> <img alt="src" src="' . $this->baseurl . 'tests/_data/whatever/img.png" /> <input>asdf src="../img/img.gif" asdf</input>'
             ),
             array(
                 '<input>asdf src="../img/img.gif" asdf</input>',
@@ -289,7 +289,7 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
             // srcset (PR #1544)
             array(
                 '<img src="./img/sticker_banner_960w.png" alt="this is a test image." srcset="https://abc.com/static/img/test@2x.png 2x,  http://abc.com/static/test@2.5x.png 2.5x,../img/test@3x.png 3x, ../img/test_960w.png  960w, {$mid}/image.png 480w">',
-                '?><img src="' . $this->baseurl . 'tests/unit/classes/template/img/sticker_banner_960w.png" alt="this is a test image." srcset="https://abc.com/static/img/test@2x.png 2x, http://abc.com/static/test@2.5x.png 2.5x, ' . $this->baseurl . 'tests/unit/classes/img/test@3x.png 3x, ' . $this->baseurl . 'tests/unit/classes/img/test_960w.png  960w, <?php echo $__Context->mid ?? \'\' ?>/image.png 480w">'
+                '?><img src="' . $this->baseurl . 'tests/_data/template/img/sticker_banner_960w.png" alt="this is a test image." srcset="https://abc.com/static/img/test@2x.png 2x, http://abc.com/static/test@2.5x.png 2.5x, ' . $this->baseurl . 'tests/_data/img/test@3x.png 3x, ' . $this->baseurl . 'tests/_data/img/test_960w.png  960w, <?php echo $__Context->mid ?? \'\' ?>/image.png 480w">'
             ),
 			// Rhymix improvements (PR #604)
             array(
@@ -505,7 +505,7 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
         foreach ($tests as $test)
         {
             $tmpl = new TemplateHandlerWrapper;
-            $tmpl->init(__DIR__ . '/template', 'no_file.html');
+            $tmpl->init('./tests/_data/template', 'no_file.html');
             $result = $tmpl->parse($test[0]);
 			$between = str_starts_with($test[1], '?>') ? '' : ' ';
             $this->assertEquals($this->prefix . $between . $test[1], $result);
@@ -515,7 +515,7 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
     public function testParseNoContent()
     {
         $tmpl = new TemplateHandlerWrapper;
-        $tmpl->init(__DIR__ . '/template', 'no_file.html');
+        $tmpl->init('./tests/_data/template', 'no_file.html');
         $result = $tmpl->parse(null);
 
         $this->assertEquals('', $result);
@@ -524,7 +524,7 @@ class TemplateHandlerTest extends \Codeception\TestCase\Test
     public function testCompileDirect()
     {
         $tmpl = TemplateHandler::getInstance();
-        $result = $tmpl->compileDirect(__DIR__ . '/template', 'sample.html');
+        $result = $tmpl->compileDirect('./tests/_data/template', 'sample.html');
         $result = trim($result);
 
         $this->assertEquals($this->prefix . ' if($__Context->has_blog ?? false){ ?><a href="http://mygony.com">Taggon\'s blog</a><?php } ?>'.PHP_EOL.'<!--#Meta://external.host/js.js--><?php Context::loadFile([\'//external.host/js.js\', \'\', \'tests\', \'\']); ?>', $result);