Index: /CKEditor/trunk/_source/tests/core/ajax.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/ajax.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/ajax.html	(revision 3017)
@@ -4,6 +4,16 @@
 	<title>CKEDITOR.ajax</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	<script type="text/javascript" src="../../_source/core/loader.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
+	<script type="text/javascript">
+	//<![CDATA[
+
+CKEDITOR.loader.load( 'core/ajax' );
+
+	//]]>
+	</script>
 	<script type="text/javascript">
 	//<![CDATA[
Index: /CKEditor/trunk/_source/tests/core/ckeditor.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/ckeditor.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/ckeditor.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/ckeditor2.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/ckeditor2.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/ckeditor2.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR 2</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_basic_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/dom/document.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/dom/document.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/dom/document.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.dom.document</title>
 	<link rel="stylesheet" type="text/css" href="../../test.css" />
-	<script type="text/javascript" src="../../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/dom/element.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/dom/element.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/dom/element.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.dom.element</title>
 	<link rel="stylesheet" type="text/css" href="../../test.css" />
-	<script type="text/javascript" src="../../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/dom/node.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/dom/node.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/dom/node.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.dom.node</title>
 	<link rel="stylesheet" type="text/css" href="../../test.css" />
-	<script type="text/javascript" src="../../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/dom/range.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/dom/range.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/dom/range.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.dom.range</title>
 	<link rel="stylesheet" type="text/css" href="../../test.css" />
-	<script type="text/javascript" src="../../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/dom/text.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/dom/text.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/dom/text.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.dom.text</title>
 	<link rel="stylesheet" type="text/css" href="../../test.css" />
-	<script type="text/javascript" src="../../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/dom/window.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/dom/window.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/dom/window.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.dom.window</title>
 	<link rel="stylesheet" type="text/css" href="../../test.css" />
-	<script type="text/javascript" src="../../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/editor.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/editor.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/editor.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.editor</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/env.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/env.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/env.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.env</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/event.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/event.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/event.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.event</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/htmlparser/fragment.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/htmlparser/fragment.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/htmlparser/fragment.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.htmlParser.fragment</title>
 	<link rel="stylesheet" type="text/css" href="../../test.css" />
-	<script type="text/javascript" src="../../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/scriptloader.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/scriptloader.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/scriptloader.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.scriptLoader</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/tools.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/tools.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/tools.html	(revision 3017)
@@ -4,5 +4,7 @@
 	<title>CKEDITOR.tools</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
 	<script type="text/javascript">
Index: /CKEditor/trunk/_source/tests/core/xml.html
===================================================================
--- /CKEditor/trunk/_source/tests/core/xml.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/core/xml.html	(revision 3017)
@@ -4,6 +4,16 @@
 	<title>CKEDITOR.xml</title>
 	<link rel="stylesheet" type="text/css" href="../test.css" />
-	<script type="text/javascript" src="../../../ckeditor_source.js"></script>
+	<script type="text/javascript" src="../../../ckeditor_source.js"></script> <!-- %REMOVE_LINE%
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	<script type="text/javascript" src="../../_source/core/loader.js"></script>
+	%REMOVE_LINE% -->
 	<script type="text/javascript" src="../test.js"></script>
+	<script type="text/javascript">
+	//<![CDATA[
+
+CKEDITOR.loader.load( 'core/xml' );
+
+	//]]>
+	</script>
 	<script type="text/javascript">
 	//<![CDATA[
Index: /CKEditor/trunk/_source/tests/test.js
===================================================================
--- /CKEditor/trunk/_source/tests/test.js	(revision 3016)
+++ /CKEditor/trunk/_source/tests/test.js	(revision 3017)
@@ -11,6 +11,8 @@
 	'<script type="text/javascript" src="' +
 	CKEDITOR.basePath +
-	'_source/' +		// %REMOVE_LINE%
-	'tests/yuitest.js"></script>' );
+	'_source/' +						// %REMOVE_LINE%
+	'tests/yuitest.js"></script>' );	/* %REMOVE_LINE%
+	'_tests/yuitest.js"></script>' );
+%REMOVE_LINE%	*/
 
 document.write(
Index: /CKEditor/trunk/_source/tests/testall.html
===================================================================
--- /CKEditor/trunk/_source/tests/testall.html	(revision 3016)
+++ /CKEditor/trunk/_source/tests/testall.html	(revision 3017)
@@ -11,5 +11,5 @@
 	'core/ajax',
 	'core/ckeditor',
-	'core/ckeditor2',
+//	'core/ckeditor2',
 	'core/editor',
 	'core/env',