diff --git a/build/test/data/json.php b/build/test/data/json.php
new file mode 100644
index 00000000..31668cf2
--- /dev/null
+++ b/build/test/data/json.php
@@ -0,0 +1,8 @@
+<?php
+$json = $_REQUEST['json'];
+if($json) {
+	echo '[ {"name": "John", "age": 21}, {"name": "Peter", "age": 25 } ]';
+} else {
+	echo '{ "data": {"lang": "en", "length": 25} }';
+}
+?>
\ No newline at end of file
diff --git a/build/test/data/name.php b/build/test/data/name.php
new file mode 100644
index 00000000..a287fc92
--- /dev/null
+++ b/build/test/data/name.php
@@ -0,0 +1,22 @@
+<?php
+$wait = $_REQUEST['wait'];
+if($wait) {
+	sleep($wait);
+}
+$xml = $_REQUEST['xml'];
+if($xml) {
+	header("Content-type: text/xml");
+	eval("\$result = $xml;");
+	echo "<math><calculation>$xml</calculation><result>$result</result></math>";
+	die();
+}
+$name = $_REQUEST['name'];
+if($name == 'foo') {
+	echo "bar";
+	die();
+} else if($name == 'peter') {
+	echo "pan";
+	die();
+}
+echo "ERROR";
+?>
\ No newline at end of file
diff --git a/build/test/data/test.js b/build/test/data/test.js
new file mode 100644
index 00000000..2764fe10
--- /dev/null
+++ b/build/test/data/test.js
@@ -0,0 +1 @@
+foobar = "bar";
diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js
index db97215b..11921f9c 100644
--- a/build/test/data/testrunner.js
+++ b/build/test/data/testrunner.js
@@ -50,8 +50,8 @@ function runTest(tests) {
 }
 
 function test(name, callback) {
-	Test = [];
 	synchronize(function() {
+		Test = [];
 		try {
 			callback();
 		} catch(e) {
diff --git a/build/test/index.html b/build/test/index.html
index 2124948a..048eec17 100644
--- a/build/test/index.html
+++ b/build/test/index.html
@@ -34,9 +34,9 @@
 		<p id="first">Try them out:</p>
 		<ul id="firstUL"></ul>
 		<ol id="empty"></ol>
-		<form id="form" action="formaction">
-			<input type="text" value="Test" name="action" id="text1"/>
-			<input type="text" value="Test" id="text2" disabled="disabled"/>
+		<form id="form" action="formaction">
+			<input type="text" name="action" value="Test" id="text1"/>
+			<input type="text" name="text2" value="Test" id="text2" disabled="disabled"/>
 			<input type="radio" name="radio1" id="radio1"/>
 
 			<input type="radio" name="radio2" id="radio2" checked/>
@@ -48,6 +48,8 @@
 			
 			<input type="text" id="name" name="name" value="name" />
 			
+			<button id="button" name="button">Button</button>
+			
 			<textarea id="area1">foobar</textarea>
 			
 			<select name="select1" id="select1">
diff --git a/build/test/test.js b/build/test/test.js
index 0a2b0427..4a6f0c2f 100644
--- a/build/test/test.js
+++ b/build/test/test.js
@@ -28,7 +28,12 @@ for ( var i = 0; i < jq.length; i++ ) {
 	if ( jq[i].tests.length > 0 ) {
 		var method = jq[i];
 		var name = addParams(method.name, method.params);
-		testFile[testFile.length] = addTestWrapper(name, method.tests.join("\n").decode());
+		for(var j = 0; j < method.tests.length; j++) {
+			if(j > 0) {
+				name += "x";
+			}
+			testFile[testFile.length] = addTestWrapper(name, method.tests[j].decode()) + "\n";
+		}
 	}
 }