diff --git a/hphp/test/zend/bad/ext-date/bug65184.php b/hphp/test/zend/bad/ext-date/bug65184.php
new file mode 100644
index 000000000..c122ae9ee
--- /dev/null
+++ b/hphp/test/zend/bad/ext-date/bug65184.php
@@ -0,0 +1,13 @@
+<?php
+	setlocale(LC_ALL, 'Japanese_Japan.932');
+	/* timestamp has to be some wednesday */
+	$s = strftime('%A', 1372884126);
+
+	for ($i = 0; $i < strlen($s); $i++) {
+		printf("%x ", ord($s[$i]));
+	}
+	echo "\n";
+
+	echo strlen(strftime('%A')), "\n";
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-date/bug65184.php.expectf b/hphp/test/zend/bad/ext-date/bug65184.php.expectf
new file mode 100644
index 000000000..9a2bcd7d7
--- /dev/null
+++ b/hphp/test/zend/bad/ext-date/bug65184.php.expectf
@@ -0,0 +1,3 @@
+90 85 97 6a 93 fa 
+6
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-gd/imagecrop_auto.php b/hphp/test/zend/bad/ext-gd/imagecrop_auto.php
index 4908bc86a..bcba2a519 100644
--- a/hphp/test/zend/bad/ext-gd/imagecrop_auto.php
+++ b/hphp/test/zend/bad/ext-gd/imagecrop_auto.php
@@ -50,4 +50,6 @@ $im_crop = imagecropauto($im, IMG_CROP_THRESHOLD, 0.1, 0x0);
 imagepng($im_crop, __DIR__ . "/crop_threshold.png");
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
+
+@unlink(__DIR__ . "/crop_threshold.png");
 ?> 
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-hash/hash_file_error.php b/hphp/test/zend/bad/ext-hash/hash_file_error.php
index 37682c96f..068c5a410 100644
--- a/hphp/test/zend/bad/ext-hash/hash_file_error.php
+++ b/hphp/test/zend/bad/ext-hash/hash_file_error.php
@@ -16,8 +16,8 @@ file_put_contents( $filename, 'The quick brown fox jumped over the lazy dog.' );
 echo "\n-- Testing hash_file() function with an unknown algorithm --\n";
 var_dump( hash_file( 'foobar', $filename ) );
 
-echo "\n-- Testing hash_file() function with a non-existant file --\n";
-var_dump( hash_file( 'md5', 'nonexistant.txt' ) );
+echo "\n-- Testing hash_file() function with a non-existent file --\n";
+var_dump( hash_file( 'md5', 'nonexistent.txt' ) );
 
 echo "\n-- Testing hash_file() function with less than expected no. of arguments --\n";
 var_dump( hash_file( 'md5' ) );
diff --git a/hphp/test/zend/bad/ext-hash/hash_file_error.php.expectf b/hphp/test/zend/bad/ext-hash/hash_file_error.php.expectf
index ef2a40af7..7efa3eef1 100644
--- a/hphp/test/zend/bad/ext-hash/hash_file_error.php.expectf
+++ b/hphp/test/zend/bad/ext-hash/hash_file_error.php.expectf
@@ -4,7 +4,7 @@
 HipHop Warning: %s
 bool(false)
 
--- Testing hash_file() function with a non-existant file --
+-- Testing hash_file() function with a non-existent file --
 HipHop Warning: %s
 bool(false)
 
diff --git a/hphp/test/zend/bad/ext-intl/bug61860.php b/hphp/test/zend/bad/ext-intl/bug61860.php
new file mode 100644
index 000000000..1753ab6bb
--- /dev/null
+++ b/hphp/test/zend/bad/ext-intl/bug61860.php
@@ -0,0 +1,9 @@
+<?php
+$haystack = 'Auf der Straße nach Paris habe ich mit dem Fahrer gesprochen';
+var_dump(
+    grapheme_stripos($haystack, 'pariS '),
+    grapheme_stristr($haystack, 'paRis '),
+    grapheme_substr($haystack, grapheme_stripos($haystack, 'Paris'))
+);
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-intl/bug61860.php.expectf b/hphp/test/zend/bad/ext-intl/bug61860.php.expectf
new file mode 100644
index 000000000..2deae41c8
--- /dev/null
+++ b/hphp/test/zend/bad/ext-intl/bug61860.php.expectf
@@ -0,0 +1,3 @@
+int(20)
+string(40) "Paris habe ich mit dem Fahrer gesprochen"
+string(40) "Paris habe ich mit dem Fahrer gesprochen"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-intl/bug62759.php b/hphp/test/zend/bad/ext-intl/bug62759.php
new file mode 100644
index 000000000..1581c39f4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-intl/bug62759.php
@@ -0,0 +1,10 @@
+<?php
+var_dump(substr('deja', 1, -4));
+var_dump(substr('deja', -1, 0));
+var_dump(grapheme_substr('deja', 1, -4));
+var_dump(intl_get_error_message());
+var_dump(grapheme_substr('deja', -1, 0));
+var_dump(grapheme_substr('déjà', 1, -4));
+var_dump(intl_get_error_message());
+var_dump(grapheme_substr('déjà', -1, 0));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-intl/bug62759.php.expectf b/hphp/test/zend/bad/ext-intl/bug62759.php.expectf
new file mode 100644
index 000000000..0d6d3c554
--- /dev/null
+++ b/hphp/test/zend/bad/ext-intl/bug62759.php.expectf
@@ -0,0 +1,8 @@
+bool(false)
+string(0) ""
+bool(false)
+string(61) "grapheme_substr: invalid parameters: U_ILLEGAL_ARGUMENT_ERROR"
+string(0) ""
+bool(false)
+string(65) "grapheme_substr: length is beyond start: U_ILLEGAL_ARGUMENT_ERROR"
+string(0) ""
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-intl/calendar_setMinimalDaysInFirstWeek_basic.php b/hphp/test/zend/bad/ext-intl/calendar_setMinimalDaysInFirstWeek_basic.php
new file mode 100644
index 000000000..72b19862e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-intl/calendar_setMinimalDaysInFirstWeek_basic.php
@@ -0,0 +1,13 @@
+<?php
+ini_set("intl.error_level", E_WARNING);
+ini_set("intl.default_locale", "nl");
+
+$intlcal = IntlCalendar::createInstance('UTC');
+var_dump(
+		$intlcal->setMinimalDaysInFirstWeek(6),
+		$intlcal->getMinimalDaysInFirstWeek(),
+		intlcal_set_minimal_days_in_first_week($intlcal, 5),
+		$intlcal->getMinimalDaysInFirstWeek()
+);
+?>
+==DONE==
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-intl/calendar_setMinimalDaysInFirstWeek_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_setMinimalDaysInFirstWeek_basic.php.expectf
new file mode 100644
index 000000000..5134ddcf6
--- /dev/null
+++ b/hphp/test/zend/bad/ext-intl/calendar_setMinimalDaysInFirstWeek_basic.php.expectf
@@ -0,0 +1,5 @@
+bool(true)
+int(6)
+bool(true)
+int(5)
+==DONE==
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-intl/transliterator_create_error.php b/hphp/test/zend/bad/ext-intl/transliterator_create_error.php
index 2e52c9142..9d90552ef 100644
--- a/hphp/test/zend/bad/ext-intl/transliterator_create_error.php
+++ b/hphp/test/zend/bad/ext-intl/transliterator_create_error.php
@@ -1,7 +1,7 @@
 <?php
 
 ini_set("intl.error_level", E_WARNING);
-Transliterator::create("inexistant id");
+Transliterator::create("inexistent id");
 echo intl_get_error_message(), "\n";
 Transliterator::create("bad UTF-8 \x8F");
 echo intl_get_error_message(), "\n";
diff --git a/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf
index e2d8da66c..249919c1f 100644
--- a/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf
+++ b/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf
@@ -1,5 +1,5 @@
 HipHop Warning: %s
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 HipHop Warning: %s
 String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
 Done.
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php
index aa71c5f96..7da4ab613 100644
--- a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php
+++ b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php
@@ -8,7 +8,7 @@ echo transliterator_transliterate("\x8F", $str), "\n";
 echo intl_get_error_message(), "\n";
 
 class A {
-function __toString() { return "inexistant id"; }
+function __toString() { return "inexistent id"; }
 }
 
 echo transliterator_transliterate(new A(), $str), "\n";
diff --git a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf
index a15374a94..0409acb0d 100644
--- a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf
+++ b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf
@@ -6,5 +6,5 @@ String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
 HipHop Warning: %s
 HipHop Warning: %s
 
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 Done.
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-json/fail001.php b/hphp/test/zend/bad/ext-json/fail001.php
similarity index 99%
rename from hphp/test/zend/good/ext-json/fail001.php
rename to hphp/test/zend/bad/ext-json/fail001.php
index c4600dce0..347916d0b 100644
--- a/hphp/test/zend/good/ext-json/fail001.php
+++ b/hphp/test/zend/bad/ext-json/fail001.php
@@ -34,4 +34,4 @@ foreach ($tests as $test)
     var_dump(json_decode($test, true));
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-json/fail001.php.expectf b/hphp/test/zend/bad/ext-json/fail001.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-json/fail001.php.expectf
rename to hphp/test/zend/bad/ext-json/fail001.php.expectf
diff --git a/hphp/test/zend/bad/ext-ldap/ldap_get_values_len_error.php b/hphp/test/zend/bad/ext-ldap/ldap_get_values_len_error.php
index 6bf4fd0b1..d5da8eaef 100644
--- a/hphp/test/zend/bad/ext-ldap/ldap_get_values_len_error.php
+++ b/hphp/test/zend/bad/ext-ldap/ldap_get_values_len_error.php
@@ -11,7 +11,7 @@ var_dump(ldap_get_values_len($link));
 var_dump(ldap_get_values_len($link, $entry));
 var_dump(ldap_get_values_len($link, $entry, "weirdAttribute", "Additional data"));
 
-var_dump(ldap_get_values_len($link, $entry, "inexistantAttribute"));
+var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute"));
 ?>
 ===DONE===?>
 <?php
diff --git a/hphp/test/zend/bad/ext-ldap/ldap_set_rebind_proc_error.php b/hphp/test/zend/bad/ext-ldap/ldap_set_rebind_proc_error.php
index 1f7130bae..c03fe3040 100644
--- a/hphp/test/zend/bad/ext-ldap/ldap_set_rebind_proc_error.php
+++ b/hphp/test/zend/bad/ext-ldap/ldap_set_rebind_proc_error.php
@@ -17,6 +17,6 @@ function rebind_proc ($ds, $ldap_url) {
 $link = ldap_connect($host, $port);
 var_dump(ldap_set_rebind_proc($link));
 var_dump(ldap_set_rebind_proc($link, "rebind_proc", "Additional data"));
-var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistant"));
+var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistent"));
 ?>
 ===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php b/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php
index 5236e8d69..baf9dd78a 100644
--- a/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php
+++ b/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php
@@ -8,9 +8,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_grep reacts to being passed bad regexes
 */
 echo "*** Testing preg_grep() : error conditions ***\n";
-$values = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$values = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php b/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php
index 78d2d48c6..a053321f8 100644
--- a/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php
+++ b/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php
@@ -8,9 +8,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_match_all reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_match_all() : error conditions ***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_error1.php b/hphp/test/zend/bad/ext-pcre/preg_match_error1.php
index 73bc2f2c2..f0a58e842 100644
--- a/hphp/test/zend/bad/ext-pcre/preg_match_error1.php
+++ b/hphp/test/zend/bad/ext-pcre/preg_match_error1.php
@@ -8,9 +8,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_match reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_match() : error conditions ***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php b/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php
index 84b3f27c1..d646ce2ed 100644
--- a/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php
+++ b/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php
@@ -8,9 +8,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_replace reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_replace() : error conditions***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_phpinfo.php b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_phpinfo.php
index 866a7e521..44521f919 100644
--- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_phpinfo.php
+++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_phpinfo.php
@@ -8,10 +8,9 @@
 	ob_end_clean();
 
 	/*	PDO Driver for MySQL, client library version => 6.0.3-alpha	*/
-	$expected = sprintf('Client API version => %s',
-		$db->getAttribute(PDO::ATTR_CLIENT_VERSION));
+	$reg = 'Client API version.*' . pcre_quote($db->getAttribute(PDO::ATTR_CLIENT_VERSION), '/');
 
-	if (false === stristr($tmp, $expected)) {
+	if (!preg_match("/$reg/", $tmp)) {
 		printf("[001] Cannot find MySQL PDO driver line in phpinfo() output\n");
 	}
 
diff --git a/hphp/test/zend/bad/ext-pgsql/08escape.php b/hphp/test/zend/bad/ext-pgsql/08escape.php
index 4bef8cb86..421684520 100644
--- a/hphp/test/zend/bad/ext-pgsql/08escape.php
+++ b/hphp/test/zend/bad/ext-pgsql/08escape.php
@@ -43,15 +43,24 @@ $sql = "INSERT INTO ".$table_name." (num, bin) VALUES (-9999, CAST ('".$escaped_
 pg_query($db, $sql);
 
 // Retrieve binary from DB
-$sql = "SELECT bin::bytea FROM ".$table_name." WHERE num = -9999";
-$result = pg_query($db, $sql);
-$row = pg_fetch_array($result, 0, PGSQL_ASSOC);
+for ($i = 0; $i < 2; $i++) {
+	$sql = "SELECT bin::bytea FROM ".$table_name." WHERE num = -9999";
+	$result = pg_query($db, $sql);
+	$row = pg_fetch_array($result, 0, PGSQL_ASSOC);
 
-if ($data === pg_unescape_bytea($row['bin'])) {
-	echo "pg_escape_bytea() actually works with database\n";
-}
-else {
-	echo "pg_escape_bytea() is broken\n";
+	if ($data === pg_unescape_bytea($row['bin'])) {
+		echo "pg_escape_bytea() actually works with database\n";
+		break;
+	}
+	elseif (!$i) {
+		// Force bytea escaping and retry
+		@pg_query($db, "SET bytea_output = 'escape'");
+	}
+	else {
+		$result = pg_query($db, $sql);
+		echo "pg_escape_bytea() is broken\n";
+		break;
+	}
 }
 
 // pg_escape_literal/pg_escape_identifier
diff --git a/hphp/test/zend/bad/ext-pgsql/10pg_convert_9.php b/hphp/test/zend/bad/ext-pgsql/10pg_convert_9.php
new file mode 100644
index 000000000..76588472a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/10pg_convert_9.php
@@ -0,0 +1,13 @@
+<?php
+error_reporting(E_ALL);
+
+include 'config.inc';
+
+$db = pg_connect($conn_str);
+pg_query($db, "SET standard_conforming_strings = 0");
+
+$fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB');
+$converted = pg_convert($db, $table_name, $fields);
+
+var_dump($converted);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/10pg_convert_9.php.expectf b/hphp/test/zend/bad/ext-pgsql/10pg_convert_9.php.expectf
new file mode 100644
index 000000000..6c05ac47b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/10pg_convert_9.php.expectf
@@ -0,0 +1,8 @@
+array(3) {
+  ["num"]=>
+  string(4) "1234"
+  ["str"]=>
+  string(5) "'AAA'"
+  ["bin"]=>
+  string(11) "'\\x424242'"
+}
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/12pg_insert_9.php b/hphp/test/zend/bad/ext-pgsql/12pg_insert_9.php
new file mode 100644
index 000000000..fd74f29e4
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/12pg_insert_9.php
@@ -0,0 +1,15 @@
+<?php
+error_reporting(E_ALL);
+
+include 'config.inc';
+
+$db = pg_connect($conn_str);
+pg_query($db, "SET standard_conforming_strings = 0");
+
+$fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB');
+
+pg_insert($db, $table_name, $fields) or print "Error in test 1\n";
+echo pg_insert($db, $table_name, $fields, PGSQL_DML_STRING)."\n";
+
+echo "Ok\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/12pg_insert_9.php.expectf b/hphp/test/zend/bad/ext-pgsql/12pg_insert_9.php.expectf
new file mode 100644
index 000000000..e1dd7b890
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/12pg_insert_9.php.expectf
@@ -0,0 +1,2 @@
+INSERT INTO php_pgsql_test (num,str,bin) VALUES (1234,'AAA','\\x424242');
+Ok
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/13pg_select_9.php b/hphp/test/zend/bad/ext-pgsql/13pg_select_9.php
new file mode 100644
index 000000000..3cf4a3c1a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/13pg_select_9.php
@@ -0,0 +1,17 @@
+<?php
+error_reporting(E_ALL);
+
+include 'config.inc';
+
+$db = pg_connect($conn_str);
+pg_query("SET bytea_output = 'hex'");
+
+$fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ');
+$ids = array('num'=>'1234');
+
+$res = pg_select($db, $table_name, $ids) or print "Error\n";
+var_dump($res);
+echo pg_select($db, $table_name, $ids, PGSQL_DML_STRING)."\n";
+echo "Ok\n";
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/13pg_select_9.php.expectf b/hphp/test/zend/bad/ext-pgsql/13pg_select_9.php.expectf
new file mode 100644
index 000000000..3d636c34a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/13pg_select_9.php.expectf
@@ -0,0 +1,13 @@
+array(1) {
+  [0]=>
+  array(3) {
+    ["num"]=>
+    string(4) "1234"
+    ["str"]=>
+    string(3) "AAA"
+    ["bin"]=>
+    string(8) "\x424242"
+  }
+}
+SELECT * FROM php_pgsql_test WHERE num=1234;
+Ok
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/14pg_update_9.php b/hphp/test/zend/bad/ext-pgsql/14pg_update_9.php
new file mode 100644
index 000000000..736b3cce5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/14pg_update_9.php
@@ -0,0 +1,16 @@
+<?php
+error_reporting(E_ALL);
+
+include 'config.inc';
+
+$db = pg_connect($conn_str);
+pg_query($db, "SET standard_conforming_strings = 0");
+
+$fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ');
+$ids = array('num'=>'1234');
+
+pg_update($db, $table_name, $fields, $ids) or print "Error in test 1\n";
+echo pg_update($db, $table_name, $fields, $ids, PGSQL_DML_STRING)."\n";
+
+echo "Ok\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/14pg_update_9.php.expectf b/hphp/test/zend/bad/ext-pgsql/14pg_update_9.php.expectf
new file mode 100644
index 000000000..b2da8e63a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/14pg_update_9.php.expectf
@@ -0,0 +1,2 @@
+UPDATE php_pgsql_test SET num=1234,str='ABC',bin='\\x58595a' WHERE num=1234;
+Ok
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_before.php b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_before.php
new file mode 100644
index 000000000..f34ec2bf1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_before.php
@@ -0,0 +1,23 @@
+<?php
+// optional functions
+
+include('config.inc');
+
+$image = file_get_contents(dirname(__FILE__) . '/php.gif');
+$esc_image = pg_escape_bytea($image);
+
+$db = pg_connect($conn_str);
+@pg_query($db, "SET bytea_output = 'escape'");
+
+pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, E\''.$esc_image.'\');');
+$result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
+$rows = pg_fetch_all($result);
+$unesc_image = pg_unescape_bytea($rows[0]['bin']);
+
+if ($unesc_image !== $image) {
+	echo "NG";
+}
+else {
+	echo "OK";
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_before.php.expectf b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_before.php.expectf
new file mode 100644
index 000000000..a0aba9318
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_before.php.expectf
@@ -0,0 +1 @@
+OK
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_esc.php b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_esc.php
new file mode 100644
index 000000000..3338cab9b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_esc.php
@@ -0,0 +1,23 @@
+<?php
+// optional functions
+
+include('config.inc');
+
+$db = pg_connect($conn_str);
+@pg_query($db, "SET bytea_output = 'escape'");
+
+$image = file_get_contents(dirname(__FILE__) . '/php.gif');
+$esc_image = pg_escape_bytea($image);
+
+pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, \''.$esc_image.'\');');
+$result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
+$rows = pg_fetch_all($result);
+$unesc_image = pg_unescape_bytea($rows[0]['bin']);
+
+if ($unesc_image !== $image) {
+	echo "NG";
+}
+else {
+	echo "OK";
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_esc.php.expectf b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_esc.php.expectf
new file mode 100644
index 000000000..a0aba9318
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_esc.php.expectf
@@ -0,0 +1 @@
+OK
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_hex.php b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_hex.php
new file mode 100644
index 000000000..bb3dc0557
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_hex.php
@@ -0,0 +1,23 @@
+<?php
+// optional functions
+
+include('config.inc');
+
+$db = pg_connect($conn_str);
+@pg_query($db, "SET bytea_output = 'hex'");
+
+$image = file_get_contents(dirname(__FILE__) . '/php.gif');
+$esc_image = pg_escape_bytea($image);
+
+pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, \''.$esc_image.'\');');
+$result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
+$rows = pg_fetch_all($result);
+$unesc_image = pg_unescape_bytea($rows[0]['bin']);
+
+if ($unesc_image !== $image) {
+	echo "NG";
+}
+else {
+	echo "OK";
+}
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_hex.php.expectf b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_hex.php.expectf
new file mode 100644
index 000000000..a0aba9318
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea_hex.php.expectf
@@ -0,0 +1 @@
+OK
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/80_bug36625.php b/hphp/test/zend/bad/ext-pgsql/80_bug36625.php
index 247a1963a..934edf3b4 100644
--- a/hphp/test/zend/bad/ext-pgsql/80_bug36625.php
+++ b/hphp/test/zend/bad/ext-pgsql/80_bug36625.php
@@ -30,6 +30,8 @@ array_walk($trace, 'search_trace_file');
 var_dump($found > 0);
 var_dump(file_exists($tracefile));
 
+@unlink($tracefile);
+
 ?>
 ===DONE===?>
 <?php unlink($tracefile); ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/bug37100.php b/hphp/test/zend/bad/ext-pgsql/bug37100.php
index 960f00466..8a9c286c4 100644
--- a/hphp/test/zend/bad/ext-pgsql/bug37100.php
+++ b/hphp/test/zend/bad/ext-pgsql/bug37100.php
@@ -3,6 +3,7 @@
 include 'config.inc';
 
 $db = pg_connect($conn_str);
+@pg_query("SET bytea_output = 'escape'");
 
 @pg_query('DROP TABLE test_bug');
 
diff --git a/hphp/test/zend/bad/ext-pgsql/bug37100_9.php b/hphp/test/zend/bad/ext-pgsql/bug37100_9.php
new file mode 100644
index 000000000..960f00466
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/bug37100_9.php
@@ -0,0 +1,33 @@
+<?php
+
+include 'config.inc';
+
+$db = pg_connect($conn_str);
+
+@pg_query('DROP TABLE test_bug');
+
+pg_query('CREATE TABLE test_bug (binfield byteA) ;');
+pg_query("INSERT INTO test_bug VALUES (decode('0103AA000812','hex'))");
+
+
+$data = pg_query("SELECT binfield FROM test_bug");
+$res = pg_fetch_result($data,0);
+var_dump($res);
+var_dump(bin2hex(pg_unescape_bytea($res)));
+
+$sql = "BEGIN; DECLARE mycursor BINARY CURSOR FOR SELECT binfield FROM test_bug; FETCH ALL IN mycursor;";
+
+$data = pg_query($sql);
+$res = pg_fetch_result($data,0);
+
+var_dump(strlen($res));
+var_dump(bin2hex($res));
+
+pg_close($db);
+
+$db = pg_connect($conn_str);
+pg_query('DROP TABLE test_bug');
+pg_close($db);
+
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-pgsql/bug37100_9.php.expectf b/hphp/test/zend/bad/ext-pgsql/bug37100_9.php.expectf
new file mode 100644
index 000000000..430d0a9cd
--- /dev/null
+++ b/hphp/test/zend/bad/ext-pgsql/bug37100_9.php.expectf
@@ -0,0 +1,4 @@
+string(14) "\x0103aa000812"
+string(12) "0103aa000812"
+int(6)
+string(12) "0103aa000812"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-sockets/socket_abstract_path.php b/hphp/test/zend/bad/ext-sockets/socket_abstract_path.php
new file mode 100644
index 000000000..9afb44509
--- /dev/null
+++ b/hphp/test/zend/bad/ext-sockets/socket_abstract_path.php
@@ -0,0 +1,27 @@
+<?php
+include __DIR__."/mcast_helpers.php.inc";
+
+$path = "\x00/foo_bar";
+
+echo "creating server socket\n";
+$servers = socket_create(AF_UNIX, SOCK_STREAM, 0) or die("err");
+socket_bind($servers, $path) or die("Could not bind");
+socket_listen($servers) or die("Could not listen");
+socket_set_nonblock($servers) or die("Could not put in non-blocking mode");
+
+echo "creating client socket\n";
+$clients = socket_create(AF_UNIX, SOCK_STREAM, 0) or die("err");
+socket_connect($clients, $path) or die("Error connecting");
+
+$conns = socket_accept($servers) or die("Could not accept connection");
+
+$r = socket_sendmsg($clients, [
+	//"name" => [ "addr" => $path, ],
+	"iov" => ["test ", "thing", "\n"],
+], 0);
+var_dump($r);
+checktimeout($conns, 500);
+
+if (!socket_recv($conns, $buf, 20, 0)) die("recv");
+print_r($buf);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-sockets/socket_abstract_path.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_abstract_path.php.expectf
new file mode 100644
index 000000000..f4d68b9ce
--- /dev/null
+++ b/hphp/test/zend/bad/ext-sockets/socket_abstract_path.php.expectf
@@ -0,0 +1,4 @@
+creating server socket
+creating client socket
+int(11)
+test thing
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-sockets/socket_abstract_path_sendmsg.php b/hphp/test/zend/bad/ext-sockets/socket_abstract_path_sendmsg.php
new file mode 100644
index 000000000..dda325b9a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-sockets/socket_abstract_path_sendmsg.php
@@ -0,0 +1,23 @@
+<?php
+include __DIR__."/mcast_helpers.php.inc";
+
+$path = "\x00/bar_foo";
+
+echo "creating send socket\n";
+$sends1 = socket_create(AF_UNIX, SOCK_DGRAM, 0) or die("err");
+socket_set_nonblock($sends1) or die("Could not put in non-blocking mode");
+
+echo "creating receive socket\n";
+$s = socket_create(AF_UNIX, SOCK_DGRAM, 0) or die("err");
+socket_bind($s, $path) or die("err");
+
+$r = socket_sendmsg($sends1, [
+	"name" => [ "path" => $path],
+	"iov" => ["test ", "thing", "\n"],
+], 0);
+var_dump($r);
+checktimeout($s, 500);
+
+if (!socket_recv($s, $buf, 20, 0)) die("recv");
+print_r($buf);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-sockets/socket_abstract_path_sendmsg.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_abstract_path_sendmsg.php.expectf
new file mode 100644
index 000000000..1326a5ea5
--- /dev/null
+++ b/hphp/test/zend/bad/ext-sockets/socket_abstract_path_sendmsg.php.expectf
@@ -0,0 +1,4 @@
+creating send socket
+creating receive socket
+int(11)
+test thing
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-sockets/socket_cmsg_rights.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_cmsg_rights.php.expectf
index 46b8ea014..d64fe7a72 100644
--- a/hphp/test/zend/bad/ext-sockets/socket_cmsg_rights.php.expectf
+++ b/hphp/test/zend/bad/ext-sockets/socket_cmsg_rights.php.expectf
@@ -27,6 +27,7 @@ Array
                             [0] => Resource id #%d
                             [1] => Resource id #%d
                             [2] => Resource id #%d
+                            [3] => Resource id #%d
                         )
 
                 )
diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_option_bindtodevice.php b/hphp/test/zend/bad/ext-sockets/socket_set_option_bindtodevice.php
new file mode 100644
index 000000000..fec54fb05
--- /dev/null
+++ b/hphp/test/zend/bad/ext-sockets/socket_set_option_bindtodevice.php
@@ -0,0 +1,14 @@
+<?php
+$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+
+if (!$socket) {
+        die('Unable to create AF_INET socket [socket]');
+}
+// wrong params
+$retval_1 = socket_set_option( $socket, SOL_SOCKET, SO_BINDTODEVICE, "lo");
+var_dump($retval_1);
+$retval_2 = socket_set_option( $socket, SOL_SOCKET, SO_BINDTODEVICE, "ethIDONOTEXIST");
+var_dump($retval_2);
+
+socket_close($socket);
+?>
diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_option_bindtodevice.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_set_option_bindtodevice.php.expectf
new file mode 100644
index 000000000..fcf53043d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-sockets/socket_set_option_bindtodevice.php.expectf
@@ -0,0 +1,3 @@
+bool(true)
+HipHop Warning: %s
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-spl/DirectoryIterator_getGroup_basic.php b/hphp/test/zend/bad/ext-spl/DirectoryIterator_getGroup_basic.php
similarity index 100%
rename from hphp/test/zend/good/ext-spl/DirectoryIterator_getGroup_basic.php
rename to hphp/test/zend/bad/ext-spl/DirectoryIterator_getGroup_basic.php
diff --git a/hphp/test/zend/good/ext-spl/DirectoryIterator_getGroup_basic.php.expectf b/hphp/test/zend/bad/ext-spl/DirectoryIterator_getGroup_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-spl/DirectoryIterator_getGroup_basic.php.expectf
rename to hphp/test/zend/bad/ext-spl/DirectoryIterator_getGroup_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php
index 1ba8c152b..de865dbe5 100644
--- a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php
+++ b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php
@@ -6,5 +6,8 @@ $fo = new SplFileObject('SplFileObject_rewind_error001.csv');
 
 $fo->rewind( "invalid" );
 
+unlink('SplFileObject_rewind_error001.csv');
+?><?php
+unlink('SplFileObject_rewind_error001.csv');
 unlink('SplFileObject_rewind_error001.csv');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_getIteratorClass_basic1.php b/hphp/test/zend/bad/ext-spl/arrayObject_getIteratorClass_basic1.php
deleted file mode 100644
index 9d4c809d4..000000000
--- a/hphp/test/zend/bad/ext-spl/arrayObject_getIteratorClass_basic1.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-class MyIterator extends ArrayIterator {
-
-	function __construct() {
-	 	$args = func_get_args();
-		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
-	}
-
-	function rewind() { 
-		$args = func_get_args();
-		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
-		return parent::rewind();
-	}
-
-	function valid() { 
-		$args = func_get_args();
-		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
-		return parent::valid();
-	}
-	
-	function current() { 
-		$args = func_get_args();
-		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
-		return parent::current();
-	}
-
-	function next() { 
-		$args = func_get_args();
-		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
-		return parent::next();
-	}
-	
-	function key() { 
-		$args = func_get_args();
-		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
-		return parent::key();
-	}
-}
-
-$ao = new ArrayObject(array('a'=>1,'b'=>2,'c'=>3), 0, "MyIterator");
-
-echo "--> Access using MyIterator:\n";
-var_dump($ao->getIteratorClass());
-var_dump($ao->getIterator());
-foreach($ao as $key=>$value) {
-	echo "  $key=>$value\n";
-}
-
-echo "\n\n--> Access using ArrayIterator:\n";
-var_dump($ao->setIteratorClass("ArrayIterator"));
-var_dump($ao->getIteratorClass());
-var_dump($ao->getIterator());
-foreach($ao as $key=>$value) {
-	echo "$key=>$value\n";
-}
-
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-spl/bug61828.php b/hphp/test/zend/bad/ext-spl/bug61828.php
new file mode 100644
index 000000000..ea348468d
--- /dev/null
+++ b/hphp/test/zend/bad/ext-spl/bug61828.php
@@ -0,0 +1,5 @@
+<?php
+$x = new DirectoryIterator('.');
+$x->__construct('/tmp');
+echo "Okey";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-spl/bug61828.php.expectf b/hphp/test/zend/bad/ext-spl/bug61828.php.expectf
new file mode 100644
index 000000000..0466119d3
--- /dev/null
+++ b/hphp/test/zend/bad/ext-spl/bug61828.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %s
+Okey
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setpostfix.php b/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setpostfix.php
new file mode 100644
index 000000000..e9e0a1078
--- /dev/null
+++ b/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setpostfix.php
@@ -0,0 +1,52 @@
+<?php
+
+$arr = array(
+	0 => array(
+		"a",
+		1,
+	),
+	"a" => array(
+		2,
+		"b",
+		3 => array(
+			4,
+			"c",
+		),
+		"3" => array(
+			4,
+			"c",
+		),
+	),
+);
+
+$it = new RecursiveArrayIterator($arr);
+$it = new RecursiveTreeIterator($it);
+
+echo "----\n";
+echo $it->getPostfix();
+echo "\n\n";
+
+echo "----\n";
+$it->setPostfix("POSTFIX");
+echo $it->getPostfix();
+echo "\n\n";
+
+echo "----\n";
+foreach($it as $k => $v) {
+	echo "[$k] => $v\n";
+}
+
+echo "----\n";
+$it->setPostfix("");
+echo $it->getPostfix();
+echo "\n\n";
+
+echo "----\n";
+foreach($it as $k => $v) {
+	echo "[$k] => $v\n";
+}
+
+
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setpostfix.php.expectf b/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setpostfix.php.expectf
new file mode 100644
index 000000000..5173ada22
--- /dev/null
+++ b/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setpostfix.php.expectf
@@ -0,0 +1,30 @@
+----
+
+
+----
+POSTFIX
+
+----
+[0] => |-ArrayPOSTFIX
+[0] => | |-aPOSTFIX
+[1] => | \-1POSTFIX
+[a] => \-ArrayPOSTFIX
+[0] =>   |-2POSTFIX
+[1] =>   |-bPOSTFIX
+[3] =>   \-ArrayPOSTFIX
+[0] =>     |-4POSTFIX
+[1] =>     \-cPOSTFIX
+----
+
+
+----
+[0] => |-Array
+[0] => | |-a
+[1] => | \-1
+[a] => \-Array
+[0] =>   |-2
+[1] =>   |-b
+[3] =>   \-Array
+[0] =>     |-4
+[1] =>     \-c
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-standard-array/array_next_error2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_next_error2.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-standard-array/array_next_error2.php.expectf
rename to hphp/test/zend/bad/ext-standard-array/array_next_error2.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_walk_closure.php b/hphp/test/zend/bad/ext-standard-array/array_walk_closure.php
new file mode 100644
index 000000000..51bbf3a7b
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-array/array_walk_closure.php
@@ -0,0 +1,92 @@
+<?php
+
+var_dump(array_walk());
+
+$ar = false;
+var_dump(array_walk($ar, $ar));
+
+$ar = NULL;
+var_dump(array_walk($ar, $ar));
+
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+var_dump(array_walk($ar, function(){ var_dump(func_get_args());}));
+
+echo "\nclosure with array\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = ["sum" => 42];
+$func = function($value, $key, &$udata) {
+	var_dump($udata);
+	$udata["sum"] += $value;
+};
+
+var_dump(array_walk($ar, $func, $user_data));
+echo "End result:";
+var_dump($user_data["sum"]);
+
+echo "\nclosure with use\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = ["sum" => 42];
+$func = function($value, $key) use (&$user_data) {
+	var_dump($user_data);
+	$user_data["sum"] += $value;
+};
+
+var_dump(array_walk($ar, $func, $user_data));
+echo "End result:";
+var_dump($user_data["sum"]);
+
+
+echo "\nclosure with object\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = (object)["sum" => 42];
+$func = function($value, $key, &$udata) {
+	var_dump($udata);
+	$udata->sum += $value;
+};
+
+var_dump(array_walk($ar, $func, $user_data));
+echo "End result:";
+var_dump($user_data->sum);
+
+
+
+echo "\nfunction with object\n";
+function sum_it_up_object($value, $key, $udata)
+{
+	var_dump($udata);
+	$udata->sum += $value;
+}
+
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = (object)["sum" => 42];
+
+var_dump(array_walk($ar, "sum_it_up_object", $user_data));
+echo "End result:";
+var_dump($user_data->sum);
+
+
+echo "\nfunction with array\n";
+function sum_it_up_array($value, $key, $udata)
+{
+	var_dump($udata);
+	$udata['sum'] += $value;
+}
+
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = ["sum" => 42];
+
+var_dump(array_walk($ar, "sum_it_up_array", $user_data));
+echo "End result:";
+var_dump($user_data['sum']);
+
+echo "\nclosure and exception\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+try {
+	var_dump(array_walk($ar, function($v, $k) { if ($v == 2) throw new Exception; } ));
+} catch (Exception $e) {
+	var_dump($e->getTrace());
+}
+
+
+echo "Done\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-array/array_walk_closure.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_walk_closure.php.expectf
new file mode 100644
index 000000000..d28786d24
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-array/array_walk_closure.php.expectf
@@ -0,0 +1,153 @@
+HipHop Warning: %s
+NULL
+HipHop Warning: %s
+NULL
+HipHop Warning: %s
+NULL
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  string(3) "one"
+}
+array(2) {
+  [0]=>
+  int(2)
+  [1]=>
+  string(3) "two"
+}
+array(2) {
+  [0]=>
+  int(3)
+  [1]=>
+  string(5) "three"
+}
+bool(true)
+
+closure with array
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(43)
+}
+array(1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(42)
+
+closure with use
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(43)
+}
+array(1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(48)
+
+closure with object
+object(stdClass)#1 (1) {
+  ["sum"]=>
+  int(42)
+}
+object(stdClass)#1 (1) {
+  ["sum"]=>
+  int(43)
+}
+object(stdClass)#1 (1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(48)
+
+function with object
+object(stdClass)#2 (1) {
+  ["sum"]=>
+  int(42)
+}
+object(stdClass)#2 (1) {
+  ["sum"]=>
+  int(43)
+}
+object(stdClass)#2 (1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(48)
+
+function with array
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+bool(true)
+End result:int(42)
+
+closure and exception
+array(2) {
+  [0]=>
+  array(2) {
+    ["function"]=>
+    string(9) "{closure}"
+    ["args"]=>
+    array(2) {
+      [0]=>
+      int(2)
+      [1]=>
+      string(3) "two"
+    }
+  }
+  [1]=>
+  array(4) {
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
+    ["function"]=>
+    string(10) "array_walk"
+    ["args"]=>
+    array(2) {
+      [0]=>
+      &array(3) {
+        ["one"]=>
+        int(1)
+        ["two"]=>
+        int(2)
+        ["three"]=>
+        int(3)
+      }
+      [1]=>
+      object(Closure)#2 (1) {
+        ["parameter"]=>
+        array(2) {
+          ["$v"]=>
+          string(10) "<required>"
+          ["$k"]=>
+          string(10) "<required>"
+        }
+      }
+    }
+  }
+}
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-array/bug65304.php b/hphp/test/zend/bad/ext-standard-array/bug65304.php
new file mode 100644
index 000000000..61715180e
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-array/bug65304.php
@@ -0,0 +1,4 @@
+<?php
+var_dump(array_sum(array(PHP_INT_MAX, 1)));
+var_dump(PHP_INT_MAX + 1);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-array/bug65304.php.expectf b/hphp/test/zend/bad/ext-standard-array/bug65304.php.expectf
new file mode 100644
index 000000000..24049ad27
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-array/bug65304.php.expectf
@@ -0,0 +1,2 @@
+float(%s)
+float(%s)
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-standard-array/prev_error3.php.expectf b/hphp/test/zend/bad/ext-standard-array/prev_error3.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-standard-array/prev_error3.php.expectf
rename to hphp/test/zend/bad/ext-standard-array/prev_error3.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/uasort_object2.php b/hphp/test/zend/bad/ext-standard-array/uasort_object2.php
index ac4240c8e..3ae855b14 100644
--- a/hphp/test/zend/bad/ext-standard-array/uasort_object2.php
+++ b/hphp/test/zend/bad/ext-standard-array/uasort_object2.php
@@ -5,7 +5,7 @@
 *
 
 /*
- * This testcase tests uasort() functionality with differnt objects
+ * This testcase tests uasort() functionality with different objects
  * Objects of different classes: 
  *  simple class,
  *  child class,
diff --git a/hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/get_object_vars_variation_003.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php.expectf
rename to hphp/test/zend/bad/ext-standard-class_object/get_object_vars_variation_003.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-file/bug41874.php b/hphp/test/zend/bad/ext-standard-file/bug41874.php
index 58806c440..5e2941218 100644
--- a/hphp/test/zend/bad/ext-standard-file/bug41874.php
+++ b/hphp/test/zend/bad/ext-standard-file/bug41874.php
@@ -1,5 +1,5 @@
 <?php
-$result = exec('cd 1:\non_existant; dir nonexistant');
+$result = exec('cd 1:\non_existent; dir nonexistent');
 echo "$result";
-system('cd 1:\non_existant; dir nonexistant');
+system('cd 1:\non_existent; dir nonexistent');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-file/bug41874_2.php b/hphp/test/zend/bad/ext-standard-file/bug41874_2.php
index d6069b590..efd98537d 100644
--- a/hphp/test/zend/bad/ext-standard-file/bug41874_2.php
+++ b/hphp/test/zend/bad/ext-standard-file/bug41874_2.php
@@ -1,4 +1,4 @@
 <?php
-$result = exec('cd 1:\\non_existant; dir nonexistant');
+$result = exec('cd 1:\\non_existent; dir nonexistent');
 echo "$result";
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-file/bug41874_3.php b/hphp/test/zend/bad/ext-standard-file/bug41874_3.php
index ea8ad7a40..82156862c 100644
--- a/hphp/test/zend/bad/ext-standard-file/bug41874_3.php
+++ b/hphp/test/zend/bad/ext-standard-file/bug41874_3.php
@@ -1,3 +1,3 @@
 <?php
-system('cd 1:\\non_existant; dir nonexistant');
+system('cd 1:\\non_existent; dir nonexistent');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-file/lchown_error.php b/hphp/test/zend/bad/ext-standard-file/lchown_error.php
index 4d1b4a12b..51dc574bb 100644
--- a/hphp/test/zend/bad/ext-standard-file/lchown_error.php
+++ b/hphp/test/zend/bad/ext-standard-file/lchown_error.php
@@ -19,7 +19,7 @@ var_dump( lchown( $filename ) );
 // More than expected arguments
 var_dump( lchown( $filename, $uid, 'foobar' ) );
 
-// Non-existant filename
+// Non-existent filename
 var_dump( lchown( 'foobar_lchown.txt', $uid ) );
 
 // Wrong argument types
diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php b/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php
index 50a92ea59..e464dd4ea 100644
--- a/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php
+++ b/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php
@@ -10,8 +10,8 @@ symlink(basename($prefix . "_file"), $prefix . "_link1");
 symlink(basename($prefix . "_link1"), $prefix . "_link2");
 
 // symlink to a non-existent path
-@unlink($prefix . "_nonexistant");
-symlink(basename($prefix . "_nonexistant"), $prefix . "_link3");
+@unlink($prefix . "_nonexistent");
+symlink(basename($prefix . "_nonexistent"), $prefix . "_link3");
 
 // symlink to a regular file using an absolute path
 symlink($prefix . "_file", $prefix . "_link4");
diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php.expectf
index 806cd512d..157791cfa 100644
--- a/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php.expectf
+++ b/hphp/test/zend/bad/ext-standard-file/symlink_to_symlink.php.expectf
@@ -1,5 +1,5 @@
 %unicode|string%(%d) "symlink_to_symlink.php_file"
 %unicode|string%(%d) "symlink_to_symlink.php_link1"
-%unicode|string%(%d) "symlink_to_symlink.php_nonexistant"
+%unicode|string%(%d) "symlink_to_symlink.php_nonexistent"
 %unicode|string%(%d) "%s/symlink_to_symlink.php_file"
 %unicode|string%(%d) "%s/symlink_to_symlink.php_link4"
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-file/userstreams.php b/hphp/test/zend/bad/ext-standard-file/userstreams.php
index 24b322419..8edf7e9bb 100644
--- a/hphp/test/zend/bad/ext-standard-file/userstreams.php
+++ b/hphp/test/zend/bad/ext-standard-file/userstreams.php
@@ -155,7 +155,7 @@ class mystream
 }
 
 if (@stream_wrapper_register("bogus", "class_not_exist")) {
-	die("Registered a non-existant class!!!???");
+	die("Registered a non-existent class!!!???");
 }
 echo "Not Registered\n";
 
diff --git a/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php b/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php
index ce33232e0..2796211fe 100644
--- a/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php
+++ b/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php
@@ -21,8 +21,8 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
-$delimeters =  array (
+// array with different values for $delimiter
+$delimiters =  array (
 
   // integer values
   0,
@@ -65,13 +65,13 @@ $delimeters =  array (
   @$unset_var
 );
 
-// loop through with each element of the $delimeters array to test explode() function
+// loop through with each element of the $delimiters array to test explode() function
 $count = 1;
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
-foreach($delimeters as $delimeter) {
+foreach($delimiters as $delimiter) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/hphp/test/zend/bad/ext-standard-network/ip2long_variation2.php b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2.php
new file mode 100644
index 000000000..85e9190dd
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2.php
@@ -0,0 +1,24 @@
+<?php
+/* Prototype  : int ip2long(string ip_address)
+ * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address 
+ * Source code: ext/standard/basic_functions.c
+ * Alias to functions: 
+ */
+
+$ips = array(
+	"1.1.011.011",
+	"127.0.0.1",
+	"1.1.071.071",
+	"0.0.0.0",
+	"1.1.081.081",
+	"192.168.0.0",
+	"256.0.0.1",
+	"192.168.0xa.5",
+);
+
+foreach($ips as $ip) {
+	var_dump(ip2long($ip));
+}
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-network/ip2long_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2.php.expectf
new file mode 100644
index 000000000..a4ae341b1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2.php.expectf
@@ -0,0 +1,9 @@
+bool(false)
+int(2130706433)
+bool(false)
+int(0)
+bool(false)
+int(-1062731776)
+bool(false)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-network/ip2long_variation2_x64.php b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2_x64.php
new file mode 100644
index 000000000..85e9190dd
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2_x64.php
@@ -0,0 +1,24 @@
+<?php
+/* Prototype  : int ip2long(string ip_address)
+ * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address 
+ * Source code: ext/standard/basic_functions.c
+ * Alias to functions: 
+ */
+
+$ips = array(
+	"1.1.011.011",
+	"127.0.0.1",
+	"1.1.071.071",
+	"0.0.0.0",
+	"1.1.081.081",
+	"192.168.0.0",
+	"256.0.0.1",
+	"192.168.0xa.5",
+);
+
+foreach($ips as $ip) {
+	var_dump(ip2long($ip));
+}
+
+?>
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-network/ip2long_variation2_x64.php.expectf b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2_x64.php.expectf
new file mode 100644
index 000000000..d15971b10
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-network/ip2long_variation2_x64.php.expectf
@@ -0,0 +1,9 @@
+bool(false)
+int(2130706433)
+bool(false)
+int(0)
+bool(false)
+int(3232235520)
+bool(false)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php b/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php
index 8af23fe51..6192f1b22 100644
--- a/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php
+++ b/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php
@@ -21,8 +21,8 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
-$delimeters =  array (
+// array with different values for $delimiter
+$delimiters =  array (
 
 		  // integer values
 /*1*/	  0,
@@ -65,13 +65,13 @@ $delimeters =  array (
 /*22*/	  @$unset_var
 );
 
-// loop through with each element of the $delimeters array to test explode() function
+// loop through with each element of the $delimiters array to test explode() function
 $count = 1;
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
-foreach($delimeters as $delimeter) {
+foreach($delimiters as $delimiter) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php b/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php
index 3a577b6a9..e86f5e680 100644
--- a/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php
+++ b/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php
@@ -67,11 +67,11 @@ $strings =  array (
 
 // loop through with each element of the $strings array to test explode() function
 $count = 1;
-$delimeter = " ";
+$delimiter = " ";
 $limit = 5;
 foreach($strings as $string) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php b/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php
index 77dd5d18a..0f25fc884 100644
--- a/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php
+++ b/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php
@@ -21,7 +21,7 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
+// array with different values for $delimiter
 $limits =  array (
 
 		  // integer values
@@ -67,11 +67,11 @@ $limits =  array (
 
 // loop through with each element of the $limits array to test explode() function
 $count = 1;
-$delimeter = " ";
+$delimiter = " ";
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 foreach($limits as $limit) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/hphp/test/zend/bad/ext-standard-strings/implode1.php b/hphp/test/zend/bad/ext-standard-strings/implode1.php
index 093938201..1ae162525 100644
--- a/hphp/test/zend/bad/ext-standard-strings/implode1.php
+++ b/hphp/test/zend/bad/ext-standard-strings/implode1.php
@@ -88,7 +88,7 @@ $file_handle = fopen(__FILE__, "r");
 /* directory type resource */
 $dir_handle = opendir( dirname(__FILE__) );
 
-/* store resources in array for comparision */
+/* store resources in array for comparison */
 $resources = array($file_handle, $dir_handle);
 
 var_dump( implode("::", $resources) );
diff --git a/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php b/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php
index aeab1958d..ae96055af 100644
--- a/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php
+++ b/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php
@@ -31,6 +31,6 @@ var_dump( strrchr("Hello, World", "Hi") );
 var_dump( strrchr("Hello, World", "o") );
 var_dump( strrchr("Hello, World", "ooo") );
 
-var_dump( strrchr("Hello, World", "Zzzz") ); //non-existant needle in haystack
+var_dump( strrchr("Hello, World", "Zzzz") ); //non-existent needle in haystack
 echo "*** Done ***";
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php b/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php
index 5f1a55e0d..b15d875b6 100644
--- a/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php
+++ b/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php
@@ -23,7 +23,7 @@ echo "\n-- Testing substr_replace() function with start and length different typ
 var_dump(substr_replace($s1, "evening", array(5))); 
 var_dump(substr_replace($s1, "evening", 5, array(8))); 
   
-echo "\n-- Testing substr_replace() function with start and length with a different number of elments --\n";
+echo "\n-- Testing substr_replace() function with start and length with a different number of elements --\n";
 var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); 
 
 echo "\n-- Testing substr_replace() function with start and length as arrays but string not--\n";
diff --git a/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf
index c8163e629..23826423c 100644
--- a/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf
+++ b/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf
@@ -16,7 +16,7 @@ string(12) "Good morning"
 HipHop Warning: %s
 string(12) "Good morning"
 
--- Testing substr_replace() function with start and length with a different number of elments --
+-- Testing substr_replace() function with start and length with a different number of elements --
 HipHop Warning: %s
 string(12) "Good morning"
 
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_001.php b/hphp/test/zend/bad/ext-standard-url/parse_url_basic_001.php
similarity index 100%
rename from hphp/test/zend/good/ext-standard-url/parse_url_basic_001.php
rename to hphp/test/zend/bad/ext-standard-url/parse_url_basic_001.php
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_001.php.expectf b/hphp/test/zend/bad/ext-standard-url/parse_url_basic_001.php.expectf
similarity index 99%
rename from hphp/test/zend/good/ext-standard-url/parse_url_basic_001.php.expectf
rename to hphp/test/zend/bad/ext-standard-url/parse_url_basic_001.php.expectf
index 16b799dcb..4d6fd71b2 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_001.php.expectf
+++ b/hphp/test/zend/bad/ext-standard-url/parse_url_basic_001.php.expectf
@@ -1,4 +1,3 @@
-
 --> 64.246.30.37: array(1) {
   ["path"]=>
   string(12) "64.246.30.37"
@@ -720,13 +719,6 @@
   string(1) ":"
 }
 
---> http://::#: array(2) {
-  ["scheme"]=>
-  string(4) "http"
-  ["host"]=>
-  string(1) ":"
-}
-
 --> x://::6.5: array(3) {
   ["scheme"]=>
   string(1) "x"
@@ -840,8 +832,6 @@
 
 --> http://?: bool(false)
 
---> http://#: bool(false)
-
 --> http://?:: bool(false)
 
 --> http://:?: bool(false)
diff --git a/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php b/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php
new file mode 100644
index 000000000..7f4c08fe9
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php
@@ -0,0 +1,6 @@
+<?php
+parse_str("foo=BAR", $_POST);
+$_REQUEST = array_merge($_REQUEST, $_POST);
+
+echo php_sapi_name();
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php.expectf b/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php.expectf
new file mode 100644
index 000000000..fcfdfbcd1
--- /dev/null
+++ b/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php.expectf
@@ -0,0 +1 @@
+cgi-fcgi
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-xml/bug65236.php b/hphp/test/zend/bad/ext-xml/bug65236.php
new file mode 100644
index 000000000..9f637508a
--- /dev/null
+++ b/hphp/test/zend/bad/ext-xml/bug65236.php
@@ -0,0 +1,5 @@
+<?php
+xml_parse_into_struct(xml_parser_create_ns(), str_repeat("<blah>", 1000), $a);
+
+echo "Done\n";
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-xml/bug65236.php.expectf b/hphp/test/zend/bad/ext-xml/bug65236.php.expectf
new file mode 100644
index 000000000..34876a7ca
--- /dev/null
+++ b/hphp/test/zend/bad/ext-xml/bug65236.php.expectf
@@ -0,0 +1,2 @@
+HipHop Warning: %s
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-classes/private_members_serialization.php b/hphp/test/zend/bad/tests-classes/private_members_serialization.php
new file mode 100644
index 000000000..4a77be804
--- /dev/null
+++ b/hphp/test/zend/bad/tests-classes/private_members_serialization.php
@@ -0,0 +1,18 @@
+<?php
+class foo
+{
+	private $private = 'private';
+	protected $protected = 'protected';
+	public $public = 'public';
+}
+
+class bar extends foo
+{
+	public function __sleep()
+	{
+		return array("\0foo\0private", 'protected', 'public');
+	}
+}
+
+var_dump(str_replace("\0", '\0', serialize(new bar())));
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-classes/private_members_serialization.php.expectf b/hphp/test/zend/bad/tests-classes/private_members_serialization.php.expectf
new file mode 100644
index 000000000..64616cab9
--- /dev/null
+++ b/hphp/test/zend/bad/tests-classes/private_members_serialization.php.expectf
@@ -0,0 +1 @@
+string(114) "O:3:"bar":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}"
\ No newline at end of file
diff --git a/hphp/test/zend/good/tests-lang/038.php.expectf b/hphp/test/zend/bad/tests-lang/038.php.expectf
similarity index 100%
rename from hphp/test/zend/good/tests-lang/038.php.expectf
rename to hphp/test/zend/bad/tests-lang/038.php.expectf
diff --git a/hphp/test/zend/bad/zend-generators/bug65035.php b/hphp/test/zend/bad/zend-generators/bug65035.php
new file mode 100644
index 000000000..40a4e07a7
--- /dev/null
+++ b/hphp/test/zend/bad/zend-generators/bug65035.php
@@ -0,0 +1,15 @@
+<?php
+
+function gen() {
+    fn();
+    yield;
+}
+
+function fn() {
+    exit('Done');
+}
+
+$gen = gen();
+$gen->current();
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend-generators/bug65035.php.expectf b/hphp/test/zend/bad/zend-generators/bug65035.php.expectf
new file mode 100644
index 000000000..8ad96f878
--- /dev/null
+++ b/hphp/test/zend/bad/zend-generators/bug65035.php.expectf
@@ -0,0 +1 @@
+Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug65291.php b/hphp/test/zend/bad/zend/bug65291.php
new file mode 100644
index 000000000..ad036880e
--- /dev/null
+++ b/hphp/test/zend/bad/zend/bug65291.php
@@ -0,0 +1,20 @@
+<?php
+
+trait TestTrait
+{
+	public static function testStaticFunction()
+	{
+		return __CLASS__;
+	}
+}
+class Tester
+{
+	use TestTrait;
+}
+
+$foo = Tester::testStaticFunction();
+get_defined_constants();
+get_defined_constants(true);
+
+echo $foo;
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug65291.php.expectf b/hphp/test/zend/bad/zend/bug65291.php.expectf
new file mode 100644
index 000000000..7bb3f2427
--- /dev/null
+++ b/hphp/test/zend/bad/zend/bug65291.php.expectf
@@ -0,0 +1 @@
+Tester
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/closure_044.php b/hphp/test/zend/bad/zend/closure_044.php
index eab027965..45fdba51c 100644
--- a/hphp/test/zend/bad/zend/closure_044.php
+++ b/hphp/test/zend/bad/zend/closure_044.php
@@ -1,6 +1,6 @@
 <?php
 /* A non-static closure has a bound instance if it has a scope
- * and does't have an instance if it has no scope */
+ * and doesn't have an instance if it has no scope */
 
 $nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };
 
diff --git a/hphp/test/zend/good/zend/lsb_021.php.expectf b/hphp/test/zend/bad/zend/lsb_021.php.expectf
similarity index 100%
rename from hphp/test/zend/good/zend/lsb_021.php.expectf
rename to hphp/test/zend/bad/zend/lsb_021.php.expectf
diff --git a/hphp/test/zend/good/zend/lsb_022.php.expectf b/hphp/test/zend/bad/zend/lsb_022.php.expectf
similarity index 100%
rename from hphp/test/zend/good/zend/lsb_022.php.expectf
rename to hphp/test/zend/bad/zend/lsb_022.php.expectf
diff --git a/hphp/test/zend/bad/ext-curl/curl_version_error.php b/hphp/test/zend/good/ext-curl/curl_version_error.php
similarity index 100%
rename from hphp/test/zend/bad/ext-curl/curl_version_error.php
rename to hphp/test/zend/good/ext-curl/curl_version_error.php
diff --git a/hphp/test/zend/bad/ext-curl/curl_version_error.php.expectf b/hphp/test/zend/good/ext-curl/curl_version_error.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-curl/curl_version_error.php.expectf
rename to hphp/test/zend/good/ext-curl/curl_version_error.php.expectf
diff --git a/hphp/test/zend/bad/ext-imap/imap_8bit_basic.php b/hphp/test/zend/good/ext-imap/imap_8bit_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-imap/imap_8bit_basic.php
rename to hphp/test/zend/good/ext-imap/imap_8bit_basic.php
diff --git a/hphp/test/zend/bad/ext-imap/imap_8bit_basic.php.expectf b/hphp/test/zend/good/ext-imap/imap_8bit_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-imap/imap_8bit_basic.php.expectf
rename to hphp/test/zend/good/ext-imap/imap_8bit_basic.php.expectf
diff --git a/hphp/test/zend/good/ext-json/bug54484.php b/hphp/test/zend/good/ext-json/bug54484.php
index a711c95bf..26390b7fd 100644
--- a/hphp/test/zend/good/ext-json/bug54484.php
+++ b/hphp/test/zend/good/ext-json/bug54484.php
@@ -12,4 +12,4 @@ var_dump(json_last_error());
 
 json_decode("");
 var_dump(json_last_error());
-?>
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-json/json_decode_basic.php b/hphp/test/zend/good/ext-json/json_decode_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-json/json_decode_basic.php
rename to hphp/test/zend/good/ext-json/json_decode_basic.php
diff --git a/hphp/test/zend/bad/ext-json/json_decode_basic.php.expectf b/hphp/test/zend/good/ext-json/json_decode_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-json/json_decode_basic.php.expectf
rename to hphp/test/zend/good/ext-json/json_decode_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic.php
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic.php.expectf
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic2.php
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic2.php
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic2.php.expectf
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic3.php
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_basic3.php.expectf
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_variation6.php
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_variation6.php
diff --git a/hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf
rename to hphp/test/zend/good/ext-mbstring/mb_encode_mimeheader_variation6.php.expectf
diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_basic.php b/hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_basic.php
rename to hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_basic.php
diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php b/hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php
rename to hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_basic.php
diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_error.php b/hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_error.php
similarity index 100%
rename from hphp/test/zend/bad/ext-spl/SplFileObject_fgetcsv_delimiter_error.php
rename to hphp/test/zend/good/ext-spl/SplFileObject_fgetcsv_delimiter_error.php
diff --git a/hphp/test/zend/good/ext-spl/SplObjectStorage_getInfo_empty_storage.php b/hphp/test/zend/good/ext-spl/SplObjectStorage_getInfo_empty_storage.php
index 7b22ec5a6..d63c546df 100644
--- a/hphp/test/zend/good/ext-spl/SplObjectStorage_getInfo_empty_storage.php
+++ b/hphp/test/zend/good/ext-spl/SplObjectStorage_getInfo_empty_storage.php
@@ -4,4 +4,4 @@ $s = new SplObjectStorage();
 
 var_dump($s->getInfo());
 
-?>
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-spl/bug62672.php b/hphp/test/zend/good/ext-spl/bug62672.php
new file mode 100644
index 000000000..e6af201f9
--- /dev/null
+++ b/hphp/test/zend/good/ext-spl/bug62672.php
@@ -0,0 +1,26 @@
+<?php
+
+class ObjA
+{
+    private $_varA;
+
+    public function __construct(Iterator $source)
+    {
+        $this->_varA = $source;
+    }
+}
+
+class ObjB extends ObjA
+{
+    private $_varB;
+
+    public function __construct(ArrayObject $keys)
+    {
+        $this->_varB = $keys;
+        parent::__construct($keys->getIterator());
+    }
+}
+
+$obj = new ObjB(new ArrayObject());
+
+var_dump($obj == unserialize(serialize($obj)));
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-spl/bug62672.php.expectf b/hphp/test/zend/good/ext-spl/bug62672.php.expectf
new file mode 100644
index 000000000..254d25151
--- /dev/null
+++ b/hphp/test/zend/good/ext-spl/bug62672.php.expectf
@@ -0,0 +1 @@
+bool(true)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-spl/iterator_002.php b/hphp/test/zend/good/ext-spl/iterator_002.php
similarity index 100%
rename from hphp/test/zend/bad/ext-spl/iterator_002.php
rename to hphp/test/zend/good/ext-spl/iterator_002.php
diff --git a/hphp/test/zend/bad/ext-spl/iterator_002.php.expectf b/hphp/test/zend/good/ext-spl/iterator_002.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-spl/iterator_002.php.expectf
rename to hphp/test/zend/good/ext-spl/iterator_002.php.expectf
diff --git a/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php b/hphp/test/zend/good/ext-spl/iterator_to_array_nonscalar_keys.php
similarity index 100%
rename from hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php
rename to hphp/test/zend/good/ext-spl/iterator_to_array_nonscalar_keys.php
diff --git a/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php.expectf b/hphp/test/zend/good/ext-spl/iterator_to_array_nonscalar_keys.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php.expectf
rename to hphp/test/zend/good/ext-spl/iterator_to_array_nonscalar_keys.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-array/array_column_basic.php.expectf b/hphp/test/zend/good/ext-standard-array/array_column_basic.php.expectf
index f7aec28dc..5e8e2fe7e 100644
--- a/hphp/test/zend/good/ext-standard-array/array_column_basic.php.expectf
+++ b/hphp/test/zend/good/ext-standard-array/array_column_basic.php.expectf
@@ -39,7 +39,7 @@ array(3) {
 *** Testing multiple data types ***
 array(8) {
   [0]=>
-  object(stdClass)#1 (0) {
+  object(stdClass)#%d (0) {
   }
   [1]=>
   float(34.2345)
@@ -58,7 +58,7 @@ array(8) {
 }
 array(8) {
   [1]=>
-  object(stdClass)#1 (0) {
+  object(stdClass)#%d (0) {
   }
   [2]=>
   float(34.2345)
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php b/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php
rename to hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation3.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation3.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation4.php b/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation4.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation4.php
rename to hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation4.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation4.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation4.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation4.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_intersect_assoc_variation4.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php b/hphp/test/zend/good/ext-standard-array/array_intersect_variation3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php
rename to hphp/test/zend/good/ext-standard-array/array_intersect_variation3.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_variation3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_intersect_variation3.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation4.php b/hphp/test/zend/good/ext-standard-array/array_intersect_variation4.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_variation4.php
rename to hphp/test/zend/good/ext-standard-array/array_intersect_variation4.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation4.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_variation4.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_intersect_variation4.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_intersect_variation4.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php b/hphp/test/zend/good/ext-standard-array/array_merge_recursive_variation3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php
rename to hphp/test/zend/good/ext-standard-array/array_merge_recursive_variation3.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_merge_recursive_variation3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_merge_recursive_variation3.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_pad_variation3.php b/hphp/test/zend/good/ext-standard-array/array_pad_variation3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_pad_variation3.php
rename to hphp/test/zend/good/ext-standard-array/array_pad_variation3.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_pad_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_pad_variation3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_pad_variation3.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_pad_variation3.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-array/array_search_variation4.php b/hphp/test/zend/good/ext-standard-array/array_search_variation4.php
index cbc1b7c27..389e41f67 100644
--- a/hphp/test/zend/good/ext-standard-array/array_search_variation4.php
+++ b/hphp/test/zend/good/ext-standard-array/array_search_variation4.php
@@ -13,7 +13,7 @@ $file_handle = fopen(__FILE__, "r");
 //directory type resource
 $dir_handle = opendir( dirname(__FILE__) );
 
-//store resources in array for comparision.
+//store resources in array for comparison.
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
diff --git a/hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php b/hphp/test/zend/good/ext-standard-array/array_unique_variation2.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php
rename to hphp/test/zend/good/ext-standard-array/array_unique_variation2.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_unique_variation2.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_unique_variation2.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation7.php b/hphp/test/zend/good/ext-standard-array/array_unshift_variation7.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_unshift_variation7.php
rename to hphp/test/zend/good/ext-standard-array/array_unshift_variation7.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation7.php.expectf b/hphp/test/zend/good/ext-standard-array/array_unshift_variation7.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_unshift_variation7.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_unshift_variation7.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php b/hphp/test/zend/good/ext-standard-array/array_unshift_variation9.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php
rename to hphp/test/zend/good/ext-standard-array/array_unshift_variation9.php
diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php.expectf b/hphp/test/zend/good/ext-standard-array/array_unshift_variation9.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php.expectf
rename to hphp/test/zend/good/ext-standard-array/array_unshift_variation9.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-array/array_values_variation7.php b/hphp/test/zend/good/ext-standard-array/array_values_variation7.php
index 907e06987..64081af69 100644
--- a/hphp/test/zend/good/ext-standard-array/array_values_variation7.php
+++ b/hphp/test/zend/good/ext-standard-array/array_values_variation7.php
@@ -6,7 +6,7 @@
 
 /*
  * Check that array_values is re-assigning keys according to the internal order of the array,
- * and is not dependant on the \$input argument's keys
+ * and is not dependent on the \$input argument's keys
  */
 
 echo "*** Testing array_values() : usage variations ***\n";
diff --git a/hphp/test/zend/good/ext-standard-array/bug34066.php b/hphp/test/zend/good/ext-standard-array/bug34066.php
index 51c5ef26e..1de925019 100644
--- a/hphp/test/zend/good/ext-standard-array/bug34066.php
+++ b/hphp/test/zend/good/ext-standard-array/bug34066.php
@@ -120,7 +120,7 @@
                 "ProceedKeyArticle"	=>	"01",
                 "ActionKey"		=>	"00",
                 "ContactCommissionArticle"=>	"0,00",
-                "QuantDependantPriceKey"=>	"",
+                "QuantdependentPriceKey"=>	"",
                 "Quant"			=>	"1",
                 "QuantUnit"		=>	"",
                 "Meas" => array(
diff --git a/hphp/test/zend/good/ext-standard-array/bug34066.php.expectf b/hphp/test/zend/good/ext-standard-array/bug34066.php.expectf
index 9067bcd57..7d683998c 100644
--- a/hphp/test/zend/good/ext-standard-array/bug34066.php.expectf
+++ b/hphp/test/zend/good/ext-standard-array/bug34066.php.expectf
@@ -316,7 +316,7 @@ gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
 /Docs/Doc/DocItems/DocItem/ContactCommissionArticle=0,00
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
-/Docs/Doc/DocItems/DocItem/QuantDependantPriceKey
+/Docs/Doc/DocItems/DocItem/QuantdependentPriceKey
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
 /Docs/Doc/DocItems/DocItem/Quant=1
diff --git a/hphp/test/zend/good/ext-standard-array/bug34066_1.php b/hphp/test/zend/good/ext-standard-array/bug34066_1.php
index ac501ceec..241c07082 100644
--- a/hphp/test/zend/good/ext-standard-array/bug34066_1.php
+++ b/hphp/test/zend/good/ext-standard-array/bug34066_1.php
@@ -120,7 +120,7 @@
                 "ProceedKeyArticle"	=>	"01",
                 "ActionKey"		=>	"00",
                 "ContactCommissionArticle"=>	"0,00",
-                "QuantDependantPriceKey"=>	"",
+                "QuantdependentPriceKey"=>	"",
                 "Quant"			=>	"1",
                 "QuantUnit"		=>	"",
                 "Meas" => array(
diff --git a/hphp/test/zend/good/ext-standard-array/bug34066_1.php.expectf b/hphp/test/zend/good/ext-standard-array/bug34066_1.php.expectf
index 6a498ecff..e2f9a04c2 100644
--- a/hphp/test/zend/good/ext-standard-array/bug34066_1.php.expectf
+++ b/hphp/test/zend/good/ext-standard-array/bug34066_1.php.expectf
@@ -275,7 +275,7 @@ gen_xml(prefix=/Docs/)
 /Docs/ContactCommissionArticle=0,00
 gen_xml(prefix=/Docs/) end
 gen_xml(prefix=/Docs/)
-/Docs/QuantDependantPriceKey
+/Docs/QuantdependentPriceKey
 gen_xml(prefix=/Docs/) end
 gen_xml(prefix=/Docs/)
 /Docs/Quant=1
diff --git a/hphp/test/zend/good/ext-standard-array/in_array_variation4.php b/hphp/test/zend/good/ext-standard-array/in_array_variation4.php
index fab3148fa..c271e1d61 100644
--- a/hphp/test/zend/good/ext-standard-array/in_array_variation4.php
+++ b/hphp/test/zend/good/ext-standard-array/in_array_variation4.php
@@ -16,7 +16,7 @@ $file_handle = fopen(__FILE__, "r");
 //directory type resource
 $dir_handle = opendir( dirname(__FILE__) );
 
-//store resources in array for comparision.
+//store resources in array for comparison.
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
diff --git a/hphp/test/zend/good/ext-standard-array/uasort_variation10.php b/hphp/test/zend/good/ext-standard-array/uasort_variation10.php
index 4482b177d..9f165d1af 100644
--- a/hphp/test/zend/good/ext-standard-array/uasort_variation10.php
+++ b/hphp/test/zend/good/ext-standard-array/uasort_variation10.php
@@ -8,7 +8,7 @@
 * Testing uasort() with 'array_arg' containing different reference variables
 */
 
-// comparision function
+// comparison function
 /* Prototype : int cmp_function(mixed $value1, mixed $value2)
  * Parameters : $value1 and $value2 - values to be compared
  * Return value : 0 - if both values are same
diff --git a/hphp/test/zend/good/ext-standard-array/uasort_variation4.php b/hphp/test/zend/good/ext-standard-array/uasort_variation4.php
index b2b8f15e0..6394b4d20 100644
--- a/hphp/test/zend/good/ext-standard-array/uasort_variation4.php
+++ b/hphp/test/zend/good/ext-standard-array/uasort_variation4.php
@@ -9,7 +9,7 @@
 *  integer, octal, hexadecimal & float
 */
 
-// comparision function
+// comparison function
 /* Prototype : int cmp_function(mixed $value1, mixed $value2)
  * Parameters : $value1 and $value2 - values to be compared
  * Return value : 0 - if both values are same
diff --git a/hphp/test/zend/bad/ext-standard-dir/chdir_error2.php b/hphp/test/zend/good/ext-standard-dir/chdir_error2.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-dir/chdir_error2.php
rename to hphp/test/zend/good/ext-standard-dir/chdir_error2.php
diff --git a/hphp/test/zend/bad/ext-standard-dir/chdir_error2.php.expectf b/hphp/test/zend/good/ext-standard-dir/chdir_error2.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-dir/chdir_error2.php.expectf
rename to hphp/test/zend/good/ext-standard-dir/chdir_error2.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-file/bug12556.php b/hphp/test/zend/good/ext-standard-file/bug12556.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/bug12556.php
rename to hphp/test/zend/good/ext-standard-file/bug12556.php
diff --git a/hphp/test/zend/bad/ext-standard-file/bug22382.php b/hphp/test/zend/good/ext-standard-file/bug22382.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/bug22382.php
rename to hphp/test/zend/good/ext-standard-file/bug22382.php
diff --git a/hphp/test/zend/bad/ext-standard-file/bug26003.php b/hphp/test/zend/good/ext-standard-file/bug26003.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/bug26003.php
rename to hphp/test/zend/good/ext-standard-file/bug26003.php
diff --git a/hphp/test/zend/bad/ext-standard-file/bug39538.php b/hphp/test/zend/good/ext-standard-file/bug39538.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/bug39538.php
rename to hphp/test/zend/good/ext-standard-file/bug39538.php
diff --git a/hphp/test/zend/bad/ext-standard-file/bug39538.php.expectf b/hphp/test/zend/good/ext-standard-file/bug39538.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/bug39538.php.expectf
rename to hphp/test/zend/good/ext-standard-file/bug39538.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation10.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation10.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation13.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation13.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation14.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation14.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation15.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation15.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation16.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation16.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation18.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation18.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation20.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation20.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation21.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation21.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation22.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation22.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation22.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation22.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation23.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation23.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation23.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation23.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation26.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation26.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation26.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation26.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation29.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation29.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation30.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation30.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation30.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation30.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation31.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation31.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation8.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation8.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation9.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation9.php
rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php
diff --git a/hphp/test/zend/bad/ext-standard-file/file_variation9.php b/hphp/test/zend/good/ext-standard-file/file_variation9.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/file_variation9.php
rename to hphp/test/zend/good/ext-standard-file/file_variation9.php
diff --git a/hphp/test/zend/bad/ext-standard-file/file_variation9.php.expectf b/hphp/test/zend/good/ext-standard-file/file_variation9.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/file_variation9.php.expectf
rename to hphp/test/zend/good/ext-standard-file/file_variation9.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation10.php b/hphp/test/zend/good/ext-standard-file/fputcsv_variation10.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation10.php
rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation10.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation11.php b/hphp/test/zend/good/ext-standard-file/fputcsv_variation11.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation11.php
rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation11.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation12.php b/hphp/test/zend/good/ext-standard-file/fputcsv_variation12.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation12.php
rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation12.php
diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation5.php b/hphp/test/zend/good/ext-standard-file/fputcsv_variation5.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation5.php
rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation5.php
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/004.php b/hphp/test/zend/good/ext-standard-general_functions/004.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/004.php
rename to hphp/test/zend/good/ext-standard-general_functions/004.php
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_loaded_extensions_basic.php b/hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/get_loaded_extensions_basic.php
rename to hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_loaded_extensions_basic.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/get_loaded_extensions_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_basic.php b/hphp/test/zend/good/ext-standard-general_functions/get_resource_type_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_basic.php
rename to hphp/test/zend/good/ext-standard-general_functions/get_resource_type_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_basic.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/get_resource_type_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-general_functions/get_resource_type_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/sleep_basic.php b/hphp/test/zend/good/ext-standard-general_functions/sleep_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/sleep_basic.php
rename to hphp/test/zend/good/ext-standard-general_functions/sleep_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/sleep_basic.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/sleep_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/sleep_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-general_functions/sleep_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/usleep_basic.php b/hphp/test/zend/good/ext-standard-general_functions/usleep_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/usleep_basic.php
rename to hphp/test/zend/good/ext-standard-general_functions/usleep_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-general_functions/usleep_basic.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/usleep_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-general_functions/usleep_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-general_functions/usleep_basic.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-math/abs.php b/hphp/test/zend/good/ext-standard-math/abs.php
index 5b909593e..a608bb5b6 100644
--- a/hphp/test/zend/good/ext-standard-math/abs.php
+++ b/hphp/test/zend/good/ext-standard-math/abs.php
@@ -15,4 +15,4 @@ $tests = <<<TESTS
 -(LONG_MIN+1) === abs(LONG_MIN+1)
 TESTS;
 
-include(dirname(__FILE__) . '/../tests/quicktester.inc');
+include(dirname(__FILE__) . '/../tests/quicktester.inc');
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-math/bug21523.php b/hphp/test/zend/good/ext-standard-math/bug21523.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-math/bug21523.php
rename to hphp/test/zend/good/ext-standard-math/bug21523.php
diff --git a/hphp/test/zend/bad/ext-standard-math/bug21523.php.expectf b/hphp/test/zend/good/ext-standard-math/bug21523.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-math/bug21523.php.expectf
rename to hphp/test/zend/good/ext-standard-math/bug21523.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-math/bug25665.php b/hphp/test/zend/good/ext-standard-math/bug25665.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-math/bug25665.php
rename to hphp/test/zend/good/ext-standard-math/bug25665.php
diff --git a/hphp/test/zend/bad/ext-standard-math/bug25665.php.expectf b/hphp/test/zend/good/ext-standard-math/bug25665.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-math/bug25665.php.expectf
rename to hphp/test/zend/good/ext-standard-math/bug25665.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-math/bug27646.php b/hphp/test/zend/good/ext-standard-math/bug27646.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-math/bug27646.php
rename to hphp/test/zend/good/ext-standard-math/bug27646.php
diff --git a/hphp/test/zend/bad/ext-standard-math/bug27646.php.expectf b/hphp/test/zend/good/ext-standard-math/bug27646.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-math/bug27646.php.expectf
rename to hphp/test/zend/good/ext-standard-math/bug27646.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-network/gethostbyname_basic003.php b/hphp/test/zend/good/ext-standard-network/gethostbyname_basic003.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-network/gethostbyname_basic003.php
rename to hphp/test/zend/good/ext-standard-network/gethostbyname_basic003.php
diff --git a/hphp/test/zend/bad/ext-standard-network/gethostbyname_basic003.php.expectf b/hphp/test/zend/good/ext-standard-network/gethostbyname_basic003.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-network/gethostbyname_basic003.php.expectf
rename to hphp/test/zend/good/ext-standard-network/gethostbyname_basic003.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-network/gethostbynamel_basic1.php b/hphp/test/zend/good/ext-standard-network/gethostbynamel_basic1.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-network/gethostbynamel_basic1.php
rename to hphp/test/zend/good/ext-standard-network/gethostbynamel_basic1.php
diff --git a/hphp/test/zend/bad/ext-standard-network/gethostbynamel_basic1.php.expectf b/hphp/test/zend/good/ext-standard-network/gethostbynamel_basic1.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-network/gethostbynamel_basic1.php.expectf
rename to hphp/test/zend/good/ext-standard-network/gethostbynamel_basic1.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/bug28386.php b/hphp/test/zend/good/ext-standard-strings/bug28386.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/bug28386.php
rename to hphp/test/zend/good/ext-standard-strings/bug28386.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chop_basic.php b/hphp/test/zend/good/ext-standard-strings/chop_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chop_basic.php
rename to hphp/test/zend/good/ext-standard-strings/chop_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chop_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/chop_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chop_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/chop_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_basic.php b/hphp/test/zend/good/ext-standard-strings/chunk_split_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_basic.php
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/chunk_split_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation11.php b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation11.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation11.php
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation11.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation11.php.expectf b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation11.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation11.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation11.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation13.php b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation13.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation13.php
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation13.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation13.php.expectf b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation13.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation13.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation13.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation4.php b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation4.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation4.php
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation4.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation4.php.expectf b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation4.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation4.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation4.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation7.php b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation7.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation7.php
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation7.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation7.php.expectf b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation7.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation7.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation7.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation9.php b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation9.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation9.php
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation9.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation9.php.expectf b/hphp/test/zend/good/ext-standard-strings/chunk_split_variation9.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/chunk_split_variation9.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/chunk_split_variation9.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-strings/explode_error.php b/hphp/test/zend/good/ext-standard-strings/explode_error.php
index 3f4bf08d3..6e3e0d94f 100644
--- a/hphp/test/zend/good/ext-standard-strings/explode_error.php
+++ b/hphp/test/zend/good/ext-standard-strings/explode_error.php
@@ -11,11 +11,11 @@ echo "\n-- Testing explode() function with no arguments --\n";
 var_dump( explode() );
 
 echo "\n-- Testing explode() function with more than expected no. of arguments --\n";
-$delimeter = " ";
+$delimiter = " ";
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
 $extra_arg = 10;
-var_dump( explode($delimeter, $string, $limit, $extra_arg) );
+var_dump( explode($delimiter, $string, $limit, $extra_arg) );
 
 ?>
 ===Done===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_basic1.php b/hphp/test/zend/good/ext-standard-strings/md5_basic1.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/md5_basic1.php
rename to hphp/test/zend/good/ext-standard-strings/md5_basic1.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_basic1.php.expectf b/hphp/test/zend/good/ext-standard-strings/md5_basic1.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/md5_basic1.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/md5_basic1.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_basic2.php b/hphp/test/zend/good/ext-standard-strings/md5_basic2.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/md5_basic2.php
rename to hphp/test/zend/good/ext-standard-strings/md5_basic2.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_basic2.php.expectf b/hphp/test/zend/good/ext-standard-strings/md5_basic2.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/md5_basic2.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/md5_basic2.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_error.php b/hphp/test/zend/good/ext-standard-strings/md5_error.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/md5_error.php
rename to hphp/test/zend/good/ext-standard-strings/md5_error.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/md5_error.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/md5_error.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/md5_error.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/soundex_basic.php b/hphp/test/zend/good/ext-standard-strings/soundex_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/soundex_basic.php
rename to hphp/test/zend/good/ext-standard-strings/soundex_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/soundex_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/soundex_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/soundex_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/soundex_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation15.php b/hphp/test/zend/good/ext-standard-strings/sprintf_variation15.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation15.php
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation15.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation15.php.expectf b/hphp/test/zend/good/ext-standard-strings/sprintf_variation15.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation15.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation15.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation21.php b/hphp/test/zend/good/ext-standard-strings/sprintf_variation21.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation21.php
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation21.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation21.php.expectf b/hphp/test/zend/good/ext-standard-strings/sprintf_variation21.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation21.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation21.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation22.php b/hphp/test/zend/good/ext-standard-strings/sprintf_variation22.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation22.php
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation22.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation22.php.expectf b/hphp/test/zend/good/ext-standard-strings/sprintf_variation22.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation22.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation22.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation24.php b/hphp/test/zend/good/ext-standard-strings/sprintf_variation24.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation24.php
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation24.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation24.php.expectf b/hphp/test/zend/good/ext-standard-strings/sprintf_variation24.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation24.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation24.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation25.php b/hphp/test/zend/good/ext-standard-strings/sprintf_variation25.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation25.php
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation25.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation25.php.expectf b/hphp/test/zend/good/ext-standard-strings/sprintf_variation25.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation25.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation25.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation26.php b/hphp/test/zend/good/ext-standard-strings/sprintf_variation26.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation26.php
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation26.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation26.php.expectf b/hphp/test/zend/good/ext-standard-strings/sprintf_variation26.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation26.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation26.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation27.php b/hphp/test/zend/good/ext-standard-strings/sprintf_variation27.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation27.php
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation27.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation27.php.expectf b/hphp/test/zend/good/ext-standard-strings/sprintf_variation27.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/sprintf_variation27.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/sprintf_variation27.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_rot13_basic.php b/hphp/test/zend/good/ext-standard-strings/str_rot13_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_rot13_basic.php
rename to hphp/test/zend/good/ext-standard-strings/str_rot13_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_rot13_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_rot13_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_rot13_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/str_rot13_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php b/hphp/test/zend/good/ext-standard-strings/str_rot13_error.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php
rename to hphp/test/zend/good/ext-standard-strings/str_rot13_error.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_rot13_error.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/str_rot13_error.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation3.php b/hphp/test/zend/good/ext-standard-strings/str_split_variation3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_split_variation3.php
rename to hphp/test/zend/good/ext-standard-strings/str_split_variation3.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation3.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_split_variation3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_split_variation3.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/str_split_variation3.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation5.php b/hphp/test/zend/good/ext-standard-strings/str_split_variation5.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_split_variation5.php
rename to hphp/test/zend/good/ext-standard-strings/str_split_variation5.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation5.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_split_variation5.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/str_split_variation5.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/str_split_variation5.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/stripcslashes_basic.php b/hphp/test/zend/good/ext-standard-strings/stripcslashes_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/stripcslashes_basic.php
rename to hphp/test/zend/good/ext-standard-strings/stripcslashes_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/stripcslashes_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/stripcslashes_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/stripcslashes_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/stripcslashes_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php b/hphp/test/zend/good/ext-standard-strings/strnatcasecmp_error.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php
rename to hphp/test/zend/good/ext-standard-strings/strnatcasecmp_error.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strnatcasecmp_error.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/strnatcasecmp_error.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcmp_basic.php b/hphp/test/zend/good/ext-standard-strings/strnatcmp_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strnatcmp_basic.php
rename to hphp/test/zend/good/ext-standard-strings/strnatcmp_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcmp_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/strnatcmp_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strnatcmp_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/strnatcmp_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php b/hphp/test/zend/good/ext-standard-strings/strnatcmp_error.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php
rename to hphp/test/zend/good/ext-standard-strings/strnatcmp_error.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strnatcmp_error.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/strnatcmp_error.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/strrev_variation1.php b/hphp/test/zend/good/ext-standard-strings/strrev_variation1.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strrev_variation1.php
rename to hphp/test/zend/good/ext-standard-strings/strrev_variation1.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/strrev_variation1.php.expectf b/hphp/test/zend/good/ext-standard-strings/strrev_variation1.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strrev_variation1.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/strrev_variation1.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/strtr_variation3.php b/hphp/test/zend/good/ext-standard-strings/strtr_variation3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strtr_variation3.php
rename to hphp/test/zend/good/ext-standard-strings/strtr_variation3.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/strtr_variation3.php.expectf b/hphp/test/zend/good/ext-standard-strings/strtr_variation3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strtr_variation3.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/strtr_variation3.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/strval_basic.php b/hphp/test/zend/good/ext-standard-strings/strval_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strval_basic.php
rename to hphp/test/zend/good/ext-standard-strings/strval_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/strval_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/strval_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/strval_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/strval_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/ucwords_basic.php b/hphp/test/zend/good/ext-standard-strings/ucwords_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/ucwords_basic.php
rename to hphp/test/zend/good/ext-standard-strings/ucwords_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/ucwords_basic.php.expectf b/hphp/test/zend/good/ext-standard-strings/ucwords_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/ucwords_basic.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/ucwords_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/ucwords_variation2.php b/hphp/test/zend/good/ext-standard-strings/ucwords_variation2.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/ucwords_variation2.php
rename to hphp/test/zend/good/ext-standard-strings/ucwords_variation2.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/ucwords_variation2.php.expectf b/hphp/test/zend/good/ext-standard-strings/ucwords_variation2.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/ucwords_variation2.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/ucwords_variation2.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/ucwords_variation4.php b/hphp/test/zend/good/ext-standard-strings/ucwords_variation4.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/ucwords_variation4.php
rename to hphp/test/zend/good/ext-standard-strings/ucwords_variation4.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/ucwords_variation4.php.expectf b/hphp/test/zend/good/ext-standard-strings/ucwords_variation4.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/ucwords_variation4.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/ucwords_variation4.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/url_t.php b/hphp/test/zend/good/ext-standard-strings/url_t.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/url_t.php
rename to hphp/test/zend/good/ext-standard-strings/url_t.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/url_t.php.expectf b/hphp/test/zend/good/ext-standard-strings/url_t.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/url_t.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/url_t.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/vsprintf_variation10.php b/hphp/test/zend/good/ext-standard-strings/vsprintf_variation10.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/vsprintf_variation10.php
rename to hphp/test/zend/good/ext-standard-strings/vsprintf_variation10.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/vsprintf_variation10.php.expectf b/hphp/test/zend/good/ext-standard-strings/vsprintf_variation10.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/vsprintf_variation10.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/vsprintf_variation10.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/vsprintf_variation7.php b/hphp/test/zend/good/ext-standard-strings/vsprintf_variation7.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/vsprintf_variation7.php
rename to hphp/test/zend/good/ext-standard-strings/vsprintf_variation7.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/vsprintf_variation7.php.expectf b/hphp/test/zend/good/ext-standard-strings/vsprintf_variation7.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/vsprintf_variation7.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/vsprintf_variation7.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/vsprintf_variation9.php b/hphp/test/zend/good/ext-standard-strings/vsprintf_variation9.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/vsprintf_variation9.php
rename to hphp/test/zend/good/ext-standard-strings/vsprintf_variation9.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/vsprintf_variation9.php.expectf b/hphp/test/zend/good/ext-standard-strings/vsprintf_variation9.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/vsprintf_variation9.php.expectf
rename to hphp/test/zend/good/ext-standard-strings/vsprintf_variation9.php.expectf
diff --git a/hphp/test/zend/bad/ext-standard-strings/wordwrap_basic.php b/hphp/test/zend/good/ext-standard-strings/wordwrap_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/wordwrap_basic.php
rename to hphp/test/zend/good/ext-standard-strings/wordwrap_basic.php
diff --git a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation5.php b/hphp/test/zend/good/ext-standard-strings/wordwrap_variation5.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-strings/wordwrap_variation5.php
rename to hphp/test/zend/good/ext-standard-strings/wordwrap_variation5.php
diff --git a/hphp/test/zend/bad/ext-standard-url/bug55399.php b/hphp/test/zend/good/ext-standard-url/bug55399.php
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-url/bug55399.php
rename to hphp/test/zend/good/ext-standard-url/bug55399.php
diff --git a/hphp/test/zend/bad/ext-standard-url/bug55399.php.expectf b/hphp/test/zend/good/ext-standard-url/bug55399.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-standard-url/bug55399.php.expectf
rename to hphp/test/zend/good/ext-standard-url/bug55399.php.expectf
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_002.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_002.php.expectf
index 1307125a5..4cda5f7c3 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_002.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_002.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : string(1) "x"
 --> x://::abc/?   : bool(false)
 --> http://::?   : string(4) "http"
---> http://::#   : string(4) "http"
 --> x://::6.5   : string(1) "x"
 --> http://?:/   : string(4) "http"
 --> http://@?:/   : string(4) "http"
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_003.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_003.php.expectf
index 80f92aebe..125b9cbb6 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_003.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_003.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : NULL
 --> x://::abc/?   : bool(false)
 --> http://::?   : string(1) ":"
---> http://::#   : string(1) ":"
 --> x://::6.5   : string(1) ":"
 --> http://?:/   : string(1) "?"
 --> http://@?:/   : string(1) "?"
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_004.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_004.php.expectf
index f7a0e555b..248109a8e 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_004.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_004.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : NULL
 --> x://::abc/?   : bool(false)
 --> http://::?   : NULL
---> http://::#   : NULL
 --> x://::6.5   : int(6)
 --> http://?:/   : NULL
 --> http://@?:/   : NULL
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_005.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_005.php.expectf
index 8248b24be..0827db823 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_005.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_005.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : NULL
 --> x://::abc/?   : bool(false)
 --> http://::?   : NULL
---> http://::#   : NULL
 --> x://::6.5   : NULL
 --> http://?:/   : NULL
 --> http://@?:/   : string(0) ""
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_006.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_006.php.expectf
index 7bb7b3003..19380a2cf 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_006.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_006.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : NULL
 --> x://::abc/?   : bool(false)
 --> http://::?   : NULL
---> http://::#   : NULL
 --> x://::6.5   : NULL
 --> http://?:/   : NULL
 --> http://@?:/   : NULL
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_007.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_007.php.expectf
index 51130877d..c7e2dfe06 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_007.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_007.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : string(9) "/blah.com"
 --> x://::abc/?   : bool(false)
 --> http://::?   : NULL
---> http://::#   : NULL
 --> x://::6.5   : NULL
 --> http://?:/   : string(1) "/"
 --> http://@?:/   : string(1) "/"
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_008.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_008.php.expectf
index 3a629fa44..35c2a2e62 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_008.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_008.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : NULL
 --> x://::abc/?   : bool(false)
 --> http://::?   : NULL
---> http://::#   : NULL
 --> x://::6.5   : NULL
 --> http://?:/   : NULL
 --> http://@?:/   : NULL
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_basic_009.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_basic_009.php.expectf
index c9afa3dd4..7d1f9f6d9 100644
--- a/hphp/test/zend/good/ext-standard-url/parse_url_basic_009.php.expectf
+++ b/hphp/test/zend/good/ext-standard-url/parse_url_basic_009.php.expectf
@@ -72,7 +72,6 @@
 --> x:/blah.com   : NULL
 --> x://::abc/?   : bool(false)
 --> http://::?   : NULL
---> http://::#   : NULL
 --> x://::6.5   : NULL
 --> http://?:/   : NULL
 --> http://@?:/   : NULL
@@ -95,7 +94,6 @@
 --> http://@:/   : bool(false)
 --> http://:/   : bool(false)
 --> http://?   : bool(false)
---> http://#   : bool(false)
 --> http://?:   : bool(false)
 --> http://:?   : bool(false)
 --> http://blah.com:123456   : bool(false)
diff --git a/hphp/test/zend/good/ext-standard-url/urls.inc b/hphp/test/zend/good/ext-standard-url/urls.inc
index 4192f4a86..27521c852 100644
--- a/hphp/test/zend/good/ext-standard-url/urls.inc
+++ b/hphp/test/zend/good/ext-standard-url/urls.inc
@@ -75,7 +75,6 @@ $urls = array(
 'x:/blah.com',
 'x://::abc/?',
 'http://::?',
-'http://::#',
 'x://::6.5',
 'http://?:/',
 'http://@?:/',
@@ -100,7 +99,6 @@ $urls = array(
 'http://@:/',
 'http://:/',
 'http://?',
-'http://#',
 'http://?:',
 'http://:?',
 'http://blah.com:123456',
@@ -108,4 +106,4 @@ $urls = array(
 );
 
 
-?>
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-xmlreader/012.php b/hphp/test/zend/good/ext-xmlreader/012.php
similarity index 94%
rename from hphp/test/zend/bad/ext-xmlreader/012.php
rename to hphp/test/zend/good/ext-xmlreader/012.php
index 0ae74d559..0adc88092 100644
--- a/hphp/test/zend/bad/ext-xmlreader/012.php
+++ b/hphp/test/zend/good/ext-xmlreader/012.php
@@ -33,7 +33,7 @@ $reader->close();
 
 echo "\nUsing URI:\n";
 $reader = new XMLReader();
-$file = dirname(__FILE__) . '/_012.xml';
+$file = dirname(__FILE__) . '/012.xml';
 if (DIRECTORY_SEPARATOR == '\\') {
 	$file = str_replace('\\',"/", $file);
 }
@@ -47,7 +47,7 @@ var_dump($reader->getAttribute('baz'));
 $reader->close();
 
 $reader = new XMLReader();
-$reader->open(dirname(__FILE__) . '/_012.xml');
+$reader->open(dirname(__FILE__) . '/012.xml');
 $reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
 while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
 var_dump($reader->getAttribute('bar'));
diff --git a/hphp/test/zend/bad/ext-xmlreader/012.php.expectf b/hphp/test/zend/good/ext-xmlreader/012.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-xmlreader/012.php.expectf
rename to hphp/test/zend/good/ext-xmlreader/012.php.expectf
diff --git a/hphp/test/zend/good/tests-classes/array_conversion_keys.php b/hphp/test/zend/good/tests-classes/array_conversion_keys.php
new file mode 100644
index 000000000..26ec68710
--- /dev/null
+++ b/hphp/test/zend/good/tests-classes/array_conversion_keys.php
@@ -0,0 +1,9 @@
+<?php
+class foo
+{
+	private $private = 'private';
+	protected $protected = 'protected';
+	public $public = 'public';
+}
+var_export((array) new foo);
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/tests-classes/array_conversion_keys.php.expectf b/hphp/test/zend/good/tests-classes/array_conversion_keys.php.expectf
new file mode 100644
index 000000000..d5510995a
--- /dev/null
+++ b/hphp/test/zend/good/tests-classes/array_conversion_keys.php.expectf
@@ -0,0 +1,5 @@
+array (
+  '' . "\0" . 'foo' . "\0" . 'private' => 'private',
+  '' . "\0" . '*' . "\0" . 'protected' => 'protected',
+  'public' => 'public',
+)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang-operators/add_variationStr.php b/hphp/test/zend/good/tests-lang-operators/add_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/add_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/add_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/add_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/add_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/add_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/add_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseAnd_variationStr.php b/hphp/test/zend/good/tests-lang-operators/bitwiseAnd_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseAnd_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/bitwiseAnd_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseAnd_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/bitwiseAnd_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseAnd_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/bitwiseAnd_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseNot_variationStr.php b/hphp/test/zend/good/tests-lang-operators/bitwiseNot_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseNot_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/bitwiseNot_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseNot_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/bitwiseNot_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseNot_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/bitwiseNot_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseOr_variationStr.php b/hphp/test/zend/good/tests-lang-operators/bitwiseOr_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseOr_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/bitwiseOr_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseOr_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/bitwiseOr_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseOr_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/bitwiseOr_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php b/hphp/test/zend/good/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php
rename to hphp/test/zend/good/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php.expectf b/hphp/test/zend/good/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/bitwiseShiftLeft_variationStr_64bit.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseShiftRight_variationStr.php b/hphp/test/zend/good/tests-lang-operators/bitwiseShiftRight_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseShiftRight_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/bitwiseShiftRight_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseShiftRight_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/bitwiseShiftRight_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseShiftRight_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/bitwiseShiftRight_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseXor_variationStr.php b/hphp/test/zend/good/tests-lang-operators/bitwiseXor_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseXor_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/bitwiseXor_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/bitwiseXor_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/bitwiseXor_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/bitwiseXor_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/bitwiseXor_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/modulus_variationStr.php b/hphp/test/zend/good/tests-lang-operators/modulus_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/modulus_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/modulus_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/modulus_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/modulus_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/modulus_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/modulus_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/negate_variationStr.php b/hphp/test/zend/good/tests-lang-operators/negate_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/negate_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/negate_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/negate_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/negate_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/negate_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/negate_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_equals_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_equals_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_equals_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_equals_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_equals_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_equals_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_equals_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_equals_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_gt_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_gt_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_or_equal_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_gt_or_equal_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_or_equal_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_or_equal_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_or_equal_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_gt_or_equal_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_or_equal_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_or_equal_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_variation.php b/hphp/test/zend/good/tests-lang-operators/operator_gt_variation.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_variation.php
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_variation.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_variation.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_gt_variation.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_variation.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_variation.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_variation_64bit.php b/hphp/test/zend/good/tests-lang-operators/operator_gt_variation_64bit.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_variation_64bit.php
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_variation_64bit.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_gt_variation_64bit.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_gt_variation_64bit.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_gt_variation_64bit.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_gt_variation_64bit.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_identical_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_identical_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_identical_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_identical_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_identical_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_identical_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_identical_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_identical_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_identical_variation_64bit.php b/hphp/test/zend/good/tests-lang-operators/operator_identical_variation_64bit.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_identical_variation_64bit.php
rename to hphp/test/zend/good/tests-lang-operators/operator_identical_variation_64bit.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_identical_variation_64bit.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_identical_variation_64bit.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_identical_variation_64bit.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_identical_variation_64bit.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_lt_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_lt_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_or_equal_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_lt_or_equal_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_or_equal_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_or_equal_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_or_equal_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_lt_or_equal_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_or_equal_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_or_equal_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_variation.php b/hphp/test/zend/good/tests-lang-operators/operator_lt_variation.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_variation.php
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_variation.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_variation.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_lt_variation.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_variation.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_variation.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_variation_64bit.php b/hphp/test/zend/good/tests-lang-operators/operator_lt_variation_64bit.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_variation_64bit.php
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_variation_64bit.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_lt_variation_64bit.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_lt_variation_64bit.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_lt_variation_64bit.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_lt_variation_64bit.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_notequals_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_notequals_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_notequals_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_notequals_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_notequals_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_notequals_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_notequals_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_notequals_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_notidentical_basic.php b/hphp/test/zend/good/tests-lang-operators/operator_notidentical_basic.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_notidentical_basic.php
rename to hphp/test/zend/good/tests-lang-operators/operator_notidentical_basic.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_notidentical_basic.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_notidentical_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_notidentical_basic.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_notidentical_basic.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_notidentical_variation_64bit.php b/hphp/test/zend/good/tests-lang-operators/operator_notidentical_variation_64bit.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_notidentical_variation_64bit.php
rename to hphp/test/zend/good/tests-lang-operators/operator_notidentical_variation_64bit.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/operator_notidentical_variation_64bit.php.expectf b/hphp/test/zend/good/tests-lang-operators/operator_notidentical_variation_64bit.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/operator_notidentical_variation_64bit.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/operator_notidentical_variation_64bit.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang-operators/subtract_variationStr.php b/hphp/test/zend/good/tests-lang-operators/subtract_variationStr.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/subtract_variationStr.php
rename to hphp/test/zend/good/tests-lang-operators/subtract_variationStr.php
diff --git a/hphp/test/zend/bad/tests-lang-operators/subtract_variationStr.php.expectf b/hphp/test/zend/good/tests-lang-operators/subtract_variationStr.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang-operators/subtract_variationStr.php.expectf
rename to hphp/test/zend/good/tests-lang-operators/subtract_variationStr.php.expectf
diff --git a/hphp/test/zend/bad/tests-lang/execution_order.php b/hphp/test/zend/good/tests-lang/execution_order.php
similarity index 100%
rename from hphp/test/zend/bad/tests-lang/execution_order.php
rename to hphp/test/zend/good/tests-lang/execution_order.php
diff --git a/hphp/test/zend/bad/tests-lang/execution_order.php.expectf b/hphp/test/zend/good/tests-lang/execution_order.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-lang/execution_order.php.expectf
rename to hphp/test/zend/good/tests-lang/execution_order.php.expectf
diff --git a/hphp/test/zend/bad/tests-strings/001.php b/hphp/test/zend/good/tests-strings/001.php
similarity index 100%
rename from hphp/test/zend/bad/tests-strings/001.php
rename to hphp/test/zend/good/tests-strings/001.php
diff --git a/hphp/test/zend/bad/tests-strings/001.php.expectf b/hphp/test/zend/good/tests-strings/001.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/tests-strings/001.php.expectf
rename to hphp/test/zend/good/tests-strings/001.php.expectf
diff --git a/hphp/test/zend/bad/zend-generators/auto_incrementing_keys.php b/hphp/test/zend/good/zend-generators/auto_incrementing_keys.php
similarity index 100%
rename from hphp/test/zend/bad/zend-generators/auto_incrementing_keys.php
rename to hphp/test/zend/good/zend-generators/auto_incrementing_keys.php
diff --git a/hphp/test/zend/bad/zend-generators/auto_incrementing_keys.php.expectf b/hphp/test/zend/good/zend-generators/auto_incrementing_keys.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend-generators/auto_incrementing_keys.php.expectf
rename to hphp/test/zend/good/zend-generators/auto_incrementing_keys.php.expectf
diff --git a/hphp/test/zend/good/zend-generators/bug65161.php b/hphp/test/zend/good/zend-generators/bug65161.php
new file mode 100644
index 000000000..67a85d01a
--- /dev/null
+++ b/hphp/test/zend/good/zend-generators/bug65161.php
@@ -0,0 +1,15 @@
+<?php
+
+function autoload() {
+    foo();
+}
+spl_autoload_register('autoload');
+
+function testGenerator() {
+    new SyntaxError('param');
+    yield;
+}
+
+foreach (testGenerator() as $i);
+
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend-generators/bug65161.php.expectf b/hphp/test/zend/good/zend-generators/bug65161.php.expectf
new file mode 100644
index 000000000..651609b45
--- /dev/null
+++ b/hphp/test/zend/good/zend-generators/bug65161.php.expectf
@@ -0,0 +1 @@
+HipHop Fatal error: %s
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend-generators/generator_with_keys.php b/hphp/test/zend/good/zend-generators/generator_with_keys.php
similarity index 100%
rename from hphp/test/zend/bad/zend-generators/generator_with_keys.php
rename to hphp/test/zend/good/zend-generators/generator_with_keys.php
diff --git a/hphp/test/zend/bad/zend-generators/generator_with_keys.php.expectf b/hphp/test/zend/good/zend-generators/generator_with_keys.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend-generators/generator_with_keys.php.expectf
rename to hphp/test/zend/good/zend-generators/generator_with_keys.php.expectf
diff --git a/hphp/test/zend/bad/zend/add_003.php b/hphp/test/zend/good/zend/add_003.php
similarity index 100%
rename from hphp/test/zend/bad/zend/add_003.php
rename to hphp/test/zend/good/zend/add_003.php
diff --git a/hphp/test/zend/bad/zend/add_003.php.expectf b/hphp/test/zend/good/zend/add_003.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/add_003.php.expectf
rename to hphp/test/zend/good/zend/add_003.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug34199.php b/hphp/test/zend/good/zend/bug34199.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug34199.php
rename to hphp/test/zend/good/zend/bug34199.php
diff --git a/hphp/test/zend/bad/zend/bug34199.php.expectf b/hphp/test/zend/good/zend/bug34199.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug34199.php.expectf
rename to hphp/test/zend/good/zend/bug34199.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug38772.php b/hphp/test/zend/good/zend/bug38772.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug38772.php
rename to hphp/test/zend/good/zend/bug38772.php
diff --git a/hphp/test/zend/bad/zend/bug38772.php.expectf b/hphp/test/zend/good/zend/bug38772.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug38772.php.expectf
rename to hphp/test/zend/good/zend/bug38772.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug48912.php b/hphp/test/zend/good/zend/bug48912.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug48912.php
rename to hphp/test/zend/good/zend/bug48912.php
diff --git a/hphp/test/zend/bad/zend/bug64239_3.php b/hphp/test/zend/good/zend/bug64239_3.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug64239_3.php
rename to hphp/test/zend/good/zend/bug64239_3.php
diff --git a/hphp/test/zend/good/zend/bug65108.php b/hphp/test/zend/good/zend/bug65108.php
new file mode 100644
index 000000000..2736359f4
--- /dev/null
+++ b/hphp/test/zend/good/zend/bug65108.php
@@ -0,0 +1,21 @@
+<?php
+class C {
+	private function f() {}
+	static function __callStatic($name, $args) {}
+}
+
+class B {
+	public function B() {
+		$isCallable = is_callable(array(new C, 'f'));
+		var_dump($isCallable);
+	}
+}
+
+new B();
+
+Class E {
+   private function f() {}
+   function __call($name, $args) {}
+}
+$isCallable = is_callable(array('E', 'f'));
+var_dump($isCallable);
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/bug65108.php.expectf b/hphp/test/zend/good/zend/bug65108.php.expectf
new file mode 100644
index 000000000..1f7ce4c1e
--- /dev/null
+++ b/hphp/test/zend/good/zend/bug65108.php.expectf
@@ -0,0 +1,2 @@
+bool(false)
+bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/bug65254.php b/hphp/test/zend/good/zend/bug65254.php
new file mode 100644
index 000000000..5db76894d
--- /dev/null
+++ b/hphp/test/zend/good/zend/bug65254.php
@@ -0,0 +1,16 @@
+<?php
+function __autoload($class)
+{
+    eval("namespace ns_test; class test {}");
+
+    throw new \Exception('abcd');
+}
+
+try
+{
+    \ns_test\test::go();
+}
+catch (Exception $e)
+{
+    echo 'caught';
+}
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/bug65254.php.expectf b/hphp/test/zend/good/zend/bug65254.php.expectf
new file mode 100644
index 000000000..77264df89
--- /dev/null
+++ b/hphp/test/zend/good/zend/bug65254.php.expectf
@@ -0,0 +1 @@
+caught
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/class_alias_015.php b/hphp/test/zend/good/zend/class_alias_015.php
similarity index 100%
rename from hphp/test/zend/bad/zend/class_alias_015.php
rename to hphp/test/zend/good/zend/class_alias_015.php
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 84c9fe2a3..2b933fc64 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -208,6 +208,19 @@ bad_tests = (
     '/ext-openssl/openssl_x509_parse_basic.php',
     '/ext-standard-streams/bug61115-2.php',
     '/ext-standard-strings/moneyformat.php',
+
+    # works in interp but fails in JIT
+    '/ext-date/DateTime_add-february.php',
+    '/ext-date/gmdate_variation8.php',
+    '/ext-standard-array/array_next_error2.php',
+    '/ext-standard-array/prev_error3.php',
+    '/ext-standard-class_object/get_object_vars_variation_003.php',
+    '/ext-standard-file/pathinfo_variation1.php',
+    '/ext-standard-file/pathinfo_variaton.php',
+    '/tests-lang/038.php',
+    '/tests-lang/045.php',
+    '/zend/lsb_021.php',
+    '/zend/lsb_022.php',
 )
 
 # Random other files that zend wants
@@ -240,7 +253,6 @@ other_files = (
     '/ext-gd/src.gd2',
     '/ext-gd/src.wbmp',
     '/ext-gd/test8859.ttf',
-    '/ext-gd/test_gif.gif',
     '/ext-intl/ut_common.inc',
     '/ext-ldap/connect.inc',
     '/ext-mbstring/common.inc',
@@ -261,7 +273,6 @@ other_files = (
     '/ext-pdo/pdo_test.inc',
     '/ext-pdo_mysql/config.inc',
     '/ext-pdo_mysql/common.phpt',
-    '/ext-pdo_sqlite/config.inc',
     '/ext-pdo_sqlite/common.phpt',
     '/ext-session/save_handler.inc',
     '/ext-simplexml/bug24392.xml',
@@ -322,7 +333,6 @@ other_files = (
     '/zend/ns_027.inc',
     '/zend/ns_028.inc',
     '/zend/ns_065.inc',
-    '/zend/ns_066.inc',
     '/zend/ns_067.inc',
     '/zend/ns_069.inc',
     '/zend/unset.inc',
@@ -390,7 +400,7 @@ def walk(filename, source):
     if not '.phpt' in filename:
         return
 
-    print "Importing %s" % filename
+    print "Importing %s" % full_dest_filename
 
     def split(pattern, str):
         return re.split(r'\n\s*--'+pattern+'--\s*\n', str, 1)
@@ -655,14 +665,18 @@ if not os.path.isdir('test/zend/all'):
     else:
         print "Running all tests from test/zend/bad"
         shutil.copytree('test/zend/bad', 'test/zend/all')
+
+        for filename in other_files:
+            dest_dir = os.path.dirname('test/zend/all/'+filename)
+            if not os.path.exists(dest_dir):
+                os.makedirs(dest_dir)
+            shutil.copyfile(
+                'test/zend/good/'+filename, 
+                'test/zend/all/'+filename
+            )
 else:
     print "Running all tests from zend/all"
 
-file('test/zend/hphp_config.hdf', 'w').write('')
-file('test/zend/config.hdf', 'w').write(
-    'Eval {\n EnableObjDestructCall = true\n }'
-)
-
 stdout = subprocess.Popen(
     [
         'test/run',
@@ -683,6 +697,8 @@ results = json.loads(last_line)['results']
 
 if args.verbose:
     print results
+else:
+    print "Test run done, moving files"
 
 for test in results:
     filename = test['name']