18 files changed, 28 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0a65e8a91..f0be47f6c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ JQ = ${DIST_DIR}/jquery.js
 JQ_LITE = ${DIST_DIR}/jquery.lite.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
+JAR = java -jar ${BUILD_DIR}/js.jar
+
 all: jquery lite pack docs
 	@@echo "jQuery build complete."
 
@@ -27,7 +29,7 @@ ${JQ}:
 		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
 	done
 
-	@@echo ${JQ} "built."
+	@@echo ${JQ} "Built"
 	@@echo
 
 lite: ${JQ_LITE}
@@ -35,8 +37,8 @@ lite: ${JQ_LITE}
 ${JQ_LITE}: jquery
 	@@echo "Building" ${JQ_LITE}
 	@@echo " - Removing ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
-	@@echo ${JQ_LITE} "built."
+	@@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+	@@echo ${JQ_LITE} "Built"
 	@@echo
 
 pack: ${JQ_PACK}
@@ -44,11 +46,24 @@ pack: ${JQ_PACK}
 ${JQ_PACK}: jquery
 	@@echo "Building" ${JQ_PACK}
 	@@echo " - Compressing using Packer"
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
-	@@echo ${JQ_PACK} "built."
+	@@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
+	@@echo ${JQ_PACK} "Built"
 	@@echo
 
 test: ${JQ}
+	@@echo "Building Test Suite"
+
+	@@echo " - Making Test Suite Directory:" ${TEST_DIR}
+	@@mkdir -p ${TEST_DIR}
+
+	@@echo " - Copying over script files."
+	@@cp -R ${BUILD_DIR}/test/js ${TEST_DIR}/js
+
+	@@echo " - Compiling Test Cases"
+	@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
+
+	@@echo "Test Suite Built"
+	@@echo
 
 docs: ${JQ}
 	@@echo "Building Documentation"
@@ -64,11 +79,17 @@ docs: ${JQ}
 	@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
 
 	@@echo " - Extracting ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
+	@@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
 
-	@@echo "Documentation built."
+	@@echo "Documentation Built"
 	@@echo
 
 clean:
+	@@echo "Removing Distribution directory:" ${DIST_DIR}
 	@@rm -rf ${DIST_DIR}
+
+	@@echo "Removing Test Suite directory:" ${TEST_DIR}
+	@@rm -rf ${TEST_DIR}
+
+	@@echo "Removing Documentation directory:" ${DOCS_DIR}
 	@@rm -rf ${DOCS_DIR}
diff --git a/test/lib/Test/Builder.js b/build/js/lib/Test/Builder.js
index 143508213..143508213 100644
--- a/test/lib/Test/Builder.js
+++ b/build/js/lib/Test/Builder.js
diff --git a/test/lib/Test/Harness.js b/build/js/lib/Test/Harness.js
index e43dc5c92..e43dc5c92 100644
--- a/test/lib/Test/Harness.js
+++ b/build/js/lib/Test/Harness.js
diff --git a/test/lib/Test/Harness/Browser.js b/build/js/lib/Test/Harness/Browser.js
index 4fa4cd2bc..4fa4cd2bc 100644
--- a/test/lib/Test/Harness/Browser.js
+++ b/build/js/lib/Test/Harness/Browser.js
diff --git a/test/lib/Test/Harness/Director.js b/build/js/lib/Test/Harness/Director.js
index 63d676b13..63d676b13 100755
--- a/test/lib/Test/Harness/Director.js
+++ b/build/js/lib/Test/Harness/Director.js
diff --git a/test/lib/Test/More.js b/build/js/lib/Test/More.js
index da94800c1..da94800c1 100644
--- a/test/lib/Test/More.js
+++ b/build/js/lib/Test/More.js
diff --git a/test/lib/Test/Simple.js b/build/js/lib/Test/Simple.js
index 8222ea84a..8222ea84a 100644
--- a/test/lib/Test/Simple.js
+++ b/build/js/lib/Test/Simple.js
diff --git a/test/lib/Test/tmp.js b/build/js/lib/Test/tmp.js
index c2d98b834..c2d98b834 100644
--- a/test/lib/Test/tmp.js
+++ b/build/js/lib/Test/tmp.js
diff --git a/test/lib/Test/tmp2.js b/build/js/lib/Test/tmp2.js
index a89609b90..a89609b90 100644
--- a/test/lib/Test/tmp2.js
+++ b/build/js/lib/Test/tmp2.js
diff --git a/test/lib/test.js b/build/js/lib/test.js
index 746581788..746581788 100644
--- a/test/lib/test.js
+++ b/build/js/lib/test.js
diff --git a/test/index.html b/build/test/index.html
index ac90376f2..ac90376f2 100644
--- a/test/index.html
+++ b/build/test/index.html
diff --git a/test/tests/basic.html b/build/test/tests/basic.html
index 9710083d1..9710083d1 100644
--- a/test/tests/basic.html
+++ b/build/test/tests/basic.html
diff --git a/test/tests/css1.html b/build/test/tests/css1.html
index 014fe4fb1..014fe4fb1 100644
--- a/test/tests/css1.html
+++ b/build/test/tests/css1.html
diff --git a/test/tests/css2.html b/build/test/tests/css2.html
index 5f19308c5..5f19308c5 100644
--- a/test/tests/css2.html
+++ b/build/test/tests/css2.html
diff --git a/test/tests/css3.html b/build/test/tests/css3.html
index ced1f9ca7..ced1f9ca7 100644
--- a/test/tests/css3.html
+++ b/build/test/tests/css3.html
diff --git a/test/tests/custom.html b/build/test/tests/custom.html
index 8341a2f80..8341a2f80 100644
--- a/test/tests/custom.html
+++ b/build/test/tests/custom.html
diff --git a/test/tests/prereq.html b/build/test/tests/prereq.html
index e73f19b90..e73f19b90 100644
--- a/test/tests/prereq.html
+++ b/build/test/tests/prereq.html
diff --git a/test/tests/xpath.html b/build/test/tests/xpath.html
index 483f89692..483f89692 100644
--- a/test/tests/xpath.html
+++ b/build/test/tests/xpath.html