diff --git a/hphp/test/slow/ext_datetime/date.php b/hphp/test/slow/ext_datetime/date.php
index 06b787481..1a8e70711 100644
--- a/hphp/test/slow/ext_datetime/date.php
+++ b/hphp/test/slow/ext_datetime/date.php
@@ -1,98 +1,91 @@
 <?php
 
-function VDT($dt, $what) {
-  var_dump(date_format($dt, "Y-m-d H:i:s") == $what);
+date_default_timezone_set("America/Los_Angeles");
+
+function format($dt) {
+  var_dump(date_format($dt, "Y-m-d H:i:s"));
 }
 
-VDT(date_create("2006-12-12"), "2006-12-12 00:00:00");
-VDT(date_create("@1170288001"), "2007-02-01 00:00:01");
+format(date_create("2006-12-12"), "2006-12-12 00:00:00");
+format(date_create("@1170288001"), "2007-02-01 00:00:01");
 
 $dt = date_create("2006-12-12 12:34:56");
 date_date_set($dt, 2007, 11, 23);
-VDT($dt, "2007-11-23 12:34:56");
+format($dt);
 
 
 $dt = date_create("2008-08-08 00:00:00");
 date_isodate_set($dt, 2007, 35, 3);
-VDT($dt, "2007-08-29 00:00:00");
+format($dt);
 
 $dt = date_create("2006-12-12 00:00:00");
 date_modify($dt, "+1 day");
-VDT($dt, "2006-12-13 00:00:00");
+format($dt);
 
-var_dump(date_offset_get(date_create("2006-12-12")) === -28800);
-var_dump(date_offset_get(date_create("2008-08-08")) === -25200);
+var_dump(date_offset_get(date_create("2006-12-12")));
+var_dump(date_offset_get(date_create("2008-08-08")));
 
 $dt = date_create("2006-12-12 12:34:56");
 date_time_set($dt, 23, 45, 12);
-VDT($dt, "2006-12-12 23:45:12");
+format($dt);
 
 
-function VS($x, $y) {
-  var_dump($x === $y);
-  if ($x !== $y) { echo "Failed: $y\n"; }
-}
-
 $d = strtotime("2008-09-10 12:34:56");
 
-VS(date("l", $d), "Wednesday");
+var_dump(date("l", $d));
 
-VS(date("l jS \\of F Y h:i:s A", $d),
-   "Wednesday 10th of September 2008 12:34:56 PM");
+var_dump(date("l jS \\of F Y h:i:s A", $d));
 
-VS(date("l", mktime(0, 0, 0, 7, 1, 2000)), "Saturday");
+var_dump(date("l", mktime(0, 0, 0, 7, 1, 2000)));
 
-VS(date(DATE_RFC822, $d), "Wed, 10 Sep 08 12:34:56 -0700");
+var_dump(date(DATE_RFC822, $d));
 
-VS(date(DATE_ATOM, mktime(0, 0, 0, 7, 1, 2000)),
-   "2000-07-01T00:00:00-07:00");
+var_dump(date(DATE_ATOM, mktime(0, 0, 0, 7, 1, 2000)));
 
-VS(date("l \\t\\h\\e jS", $d), "Wednesday the 10th");
+var_dump(date("l \\t\\h\\e jS", $d));
 
 $tomorrow = mktime(0,0,0,
                         (int)date("m", $d),
                         (int)date("d", $d) + 1,
                         (int)date("Y", $d));
-VS($tomorrow, 1221116400);
+var_dump($tomorrow);
 
 $lastmonth = mktime(0,0,0,
                          (int)date("m", $d) - 1,
                          (int)date("d", $d),
                          (int)date("Y", $d));
-VS($lastmonth, 1218351600);
+var_dump($lastmonth);
 
 $nextyear = mktime(0,0,0,
                         (int)date("m", $d),
                         (int)date("d", $d),
                         (int)date("Y", $d) + 1);
-VS($nextyear, 1252566000);
+var_dump($nextyear);
 
 $d = strtotime("2001-03-10 05:16:18");
-VS(date("F j, Y, g:i a", $d), "March 10, 2001, 5:16 am");
-VS(date("m.d.y", $d), "03.10.01");
-VS(date("j, n, Y", $d), "10, 3, 2001");
-VS(date("Ymd", $d), "20010310");
-VS(date("h-i-s, j-m-y, it is w Day z ", $d),
-   "05-16-18, 10-03-01, 1631 1618 6 Satam01 68 ");
-VS(date("\\i\\t \\i\\s \\t\\h\\e jS \\d\\a\\y.", $d),
-   "it is the 10th day.");
-VS(date("D M j G:i:s T Y", $d), "Sat Mar 10 5:16:18 PST 2001");
-VS(date("H:m:s \\m \\i\\s\\ \\m\\o\\n\\t\\h", $d), "05:03:18 m is month");
-VS(date("H:i:s", $d), "05:16:18");
+var_dump(date("F j, Y, g:i a", $d));
+var_dump(date("m.d.y", $d));
+var_dump(date("j, n, Y", $d));
+var_dump(date("Ymd", $d));
+var_dump(date("h-i-s, j-m-y, it is w Day z ", $d));
+var_dump(date("\\i\\t \\i\\s \\t\\h\\e jS \\d\\a\\y.", $d));
+var_dump(date("D M j G:i:s T Y", $d));
+var_dump(date("H:m:s \\m \\i\\s\\ \\m\\o\\n\\t\\h", $d));
+var_dump(date("H:i:s", $d));
 
 $d = strtotime("1955-03-10 05:16:18");
-VS(date("Ymd", $d), "19550310");
+var_dump(date("Ymd", $d));
 
-VS(date("r", -5000000000), "Tue, 23 Jul 1811 07:06:40 -0800");
+var_dump(date("r", -5000000000));
 
-VS(mktime(0, 0, 0, 2, 26 - 91, 2010), 1259308800);
+var_dump(mktime(0, 0, 0, 2, 26 - 91, 2010));
 
 $d = strtotime("2008-09-10 12:34:56");
 $today = getdate($d);
 var_dump($today);
 
 $tod = gettimeofday();
-VS(count($tod), 4);
+var_dump(count($tod));
 var_dump($tod['sec'] > 1073504408);
 var_dump(gettimeofday(true) > 1073504408.23910);
 
@@ -101,4 +94,4 @@ $timestamp = strtotime("1st January 2004"); //1072915200
 // this prints the year in a two digit format
 // however, as this would start with a "0", it
 // only prints "4"
-VS(idate("y", $timestamp), 4);
+var_dump(idate("y", $timestamp));
diff --git a/hphp/test/slow/ext_datetime/date.php.expect b/hphp/test/slow/ext_datetime/date.php.expect
index b2cff208e..d6ec2393a 100644
--- a/hphp/test/slow/ext_datetime/date.php.expect
+++ b/hphp/test/slow/ext_datetime/date.php.expect
@@ -1,32 +1,32 @@
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+string(19) "2006-12-12 00:00:00"
+string(19) "2007-02-01 00:00:01"
+string(19) "2007-11-23 12:34:56"
+string(19) "2007-08-29 00:00:00"
+string(19) "2006-12-13 00:00:00"
+int(-28800)
+int(-25200)
+string(19) "2006-12-12 23:45:12"
+string(9) "Wednesday"
+string(44) "Wednesday 10th of September 2008 12:34:56 PM"
+string(8) "Saturday"
+string(29) "Wed, 10 Sep 08 12:34:56 -0700"
+string(25) "2000-07-01T00:00:00-07:00"
+string(18) "Wednesday the 10th"
+int(1221116400)
+int(1218351600)
+int(1252566000)
+string(23) "March 10, 2001, 5:16 am"
+string(8) "03.10.01"
+string(11) "10, 3, 2001"
+string(8) "20010310"
+string(43) "05-16-18, 10-03-01, 1631 1618 6 Satam01 68 "
+string(19) "it is the 10th day."
+string(27) "Sat Mar 10 5:16:18 PST 2001"
+string(19) "05:03:18 m is month"
+string(8) "05:16:18"
+string(8) "19550310"
+string(31) "Tue, 23 Jul 1811 07:06:40 -0800"
+int(1259308800)
 array(11) {
   ["seconds"]=>
   int(56)
@@ -51,7 +51,7 @@ array(11) {
   [0]=>
   int(1221075296)
 }
+int(4)
 bool(true)
 bool(true)
-bool(true)
-bool(true)
+int(4)
diff --git a/hphp/test/slow/ext_datetime/date_format.php b/hphp/test/slow/ext_datetime/date_format.php
index 6853b0ee6..047fc6aac 100644
--- a/hphp/test/slow/ext_datetime/date_format.php
+++ b/hphp/test/slow/ext_datetime/date_format.php
@@ -1,5 +1,7 @@
 <?php
 
+date_default_timezone_set("America/Los_Angeles");
+
 $dt = date_create("@1170288001");
-var_dump(date_format($dt, "Y-m-d\\TH:i:s\\Z") === "2007-02-01T00:00:01Z");
-var_dump(date_format($dt, "Y-m-d H:i:sZ") === "2007-02-01 00:00:01-28800");
+var_dump(date_format($dt, "Y-m-d\\TH:i:s\\Z"));
+var_dump(date_format($dt, "Y-m-d H:i:sZ"));
diff --git a/hphp/test/slow/ext_datetime/date_format.php.expect b/hphp/test/slow/ext_datetime/date_format.php.expect
index 053a4cc7b..9a38b4b47 100644
--- a/hphp/test/slow/ext_datetime/date_format.php.expect
+++ b/hphp/test/slow/ext_datetime/date_format.php.expect
@@ -1,2 +1,2 @@
-bool(true)
-bool(true)
+string(20) "2007-02-01T00:00:01Z"
+string(25) "2007-02-01 00:00:01-28800"
diff --git a/hphp/test/slow/ext_datetime/date_sun_info.php b/hphp/test/slow/ext_datetime/date_sun_info.php
index c01171c9d..219f4c4aa 100644
--- a/hphp/test/slow/ext_datetime/date_sun_info.php
+++ b/hphp/test/slow/ext_datetime/date_sun_info.php
@@ -1,5 +1,7 @@
 <?php
 
+date_default_timezone_set("America/Los_Angeles");
+
 var_dump(date_sun_info(strtotime("2006-12-12"), 31.7667, 35.2333));
 
 /*
diff --git a/hphp/test/slow/ext_datetime/date_timestamp.php b/hphp/test/slow/ext_datetime/date_timestamp.php
index 9d9bbff05..cdcd14ce3 100644
--- a/hphp/test/slow/ext_datetime/date_timestamp.php
+++ b/hphp/test/slow/ext_datetime/date_timestamp.php
@@ -1,11 +1,12 @@
 <?php
 
+date_default_timezone_set("America/Los_Angeles");
+
 $tz = timezone_open("America/Los_Angeles");
 $dt = date_create("2008-08-08 12:34:56", $tz);
-var_dump(date_timestamp_get($dt) === 1218224096);
+var_dump(date_timestamp_get($dt));
 
 $tz = timezone_open("America/Los_Angeles");
 $dt = date_create("2008-08-08 12:34:56", $tz);
 date_timestamp_set($dt, 1000000000);
-var_dump(date_format($dt, "Y-m-d H:i:s") === "2001-09-08 18:46:40");
-
+var_dump(date_format($dt, "Y-m-d H:i:s"));
diff --git a/hphp/test/slow/ext_datetime/date_timestamp.php.expect b/hphp/test/slow/ext_datetime/date_timestamp.php.expect
index 053a4cc7b..7595b0e30 100644
--- a/hphp/test/slow/ext_datetime/date_timestamp.php.expect
+++ b/hphp/test/slow/ext_datetime/date_timestamp.php.expect
@@ -1,2 +1,2 @@
-bool(true)
-bool(true)
+int(1218224096)
+string(19) "2001-09-08 18:46:40"
diff --git a/hphp/test/slow/ext_datetime/date_timezone.php b/hphp/test/slow/ext_datetime/date_timezone.php
index c435c0557..ea85f5985 100644
--- a/hphp/test/slow/ext_datetime/date_timezone.php
+++ b/hphp/test/slow/ext_datetime/date_timezone.php
@@ -1,30 +1,27 @@
 <?php
 
-function VS($x, $y) {
-  var_dump($x === $y);
-  if ($x !== $y) { echo "Failed: $y\n"; }
-}
+date_default_timezone_set("America/Los_Angeles");
 
 var_dump(date_default_timezone_get());
 
 var_dump(date_default_timezone_set("Asia/Shanghai"));
-var_dump(date_default_timezone_get() === "Asia/Shanghai");
+var_dump(date_default_timezone_get());
 var_dump(date_default_timezone_set("America/Los_Angeles"));
-var_dump(date_default_timezone_get() === "America/Los_Angeles");
+var_dump(date_default_timezone_get());
 
 $dt = date_create("2008-08-08 12:34:56");
-var_dump(timezone_name_get(date_timezone_get($dt)) === "America/Los_Angeles");
+var_dump(timezone_name_get(date_timezone_get($dt)));
 
 $dt = date_create("2008-08-08 12:34:56");
 date_timezone_set($dt, timezone_open("Asia/Shanghai"));
-var_dump(timezone_name_get(date_timezone_get($dt)) === "Asia/Shanghai");
+var_dump(timezone_name_get(date_timezone_get($dt)));
 var_dump(date_format($dt, 'Y-m-d H:i:s'));
 
-VS(timezone_name_from_abbr("CET"), "Europe/Berlin");
-VS(timezone_name_from_abbr("", 3600, 0), "Europe/Paris");
+var_dump(timezone_name_from_abbr("CET"));
+var_dump(timezone_name_from_abbr("", 3600, 0));
 
 $tz = timezone_open("Asia/Shanghai");
-VS(timezone_name_get($tz), "Asia/Shanghai");
+var_dump(timezone_name_get($tz));
 
 // Create two timezone objects, one for Taipei (Taiwan) and one for
 // Tokyo (Japan)
@@ -36,18 +33,18 @@ $dateTimeZoneJapan = timezone_open("Asia/Tokyo");
 $dateTimeTaipei = date_create("2008-08-08", $dateTimeZoneTaipei);
 $dateTimeJapan = date_create("2008-08-08", $dateTimeZoneJapan);
 
-VS(date_offset_get($dateTimeTaipei), 28800);
-VS(date_offset_get($dateTimeJapan), 32400);
+var_dump(date_offset_get($dateTimeTaipei));
+var_dump(date_offset_get($dateTimeJapan));
 
 $tz = timezone_open("Asia/Shanghai");
-VS(timezone_name_get($tz), "Asia/Shanghai");
+var_dump(timezone_name_get($tz));
 
 $timezone = timezone_open("CET");
 $transitions = timezone_transitions_get($timezone);
-VS($transitions[0]['ts'], -1693706400);
-VS($transitions[0]['offset'], 7200);
-VS($transitions[0]['isdst'], true);
-VS($transitions[0]['abbr'], "CEST");
+var_dump($transitions[0]['ts']);
+var_dump($transitions[0]['offset']);
+var_dump($transitions[0]['isdst']);
+var_dump($transitions[0]['abbr']);
 
-VS((bool)timezone_version_get(), true);
+var_dump((bool)timezone_version_get());
 
diff --git a/hphp/test/slow/ext_datetime/date_timezone.php.expect b/hphp/test/slow/ext_datetime/date_timezone.php.expect
index f5f987590..24d7ba2e0 100644
--- a/hphp/test/slow/ext_datetime/date_timezone.php.expect
+++ b/hphp/test/slow/ext_datetime/date_timezone.php.expect
@@ -1,19 +1,19 @@
 string(19) "America/Los_Angeles"
 bool(true)
+string(13) "Asia/Shanghai"
 bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+string(19) "America/Los_Angeles"
+string(19) "America/Los_Angeles"
+string(13) "Asia/Shanghai"
 string(19) "2008-08-09 03:34:56"
+string(13) "Europe/Berlin"
+string(12) "Europe/Paris"
+string(13) "Asia/Shanghai"
+int(28800)
+int(32400)
+string(13) "Asia/Shanghai"
+int(-1693706400)
+int(7200)
 bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+string(4) "CEST"
 bool(true)
diff --git a/hphp/test/slow/ext_datetime/gmfoo.php b/hphp/test/slow/ext_datetime/gmfoo.php
index a33b69d95..4b140dd5e 100644
--- a/hphp/test/slow/ext_datetime/gmfoo.php
+++ b/hphp/test/slow/ext_datetime/gmfoo.php
@@ -1,24 +1,21 @@
 <?php
 
-function VS($x, $y) {
-  var_dump($x === $y);
-  if ($x !== $y) { echo "Failed: $y\n"; echo "Got: $x\n"; }
-}
+date_default_timezone_set("America/Los_Angeles");
 
 $d = mktime(0, 0, 0, 1, 1, 1998);
-VS(date("M d Y H:i:s",   $d), "Jan 01 1998 00:00:00");
-VS(gmdate("M d Y H:i:s", $d), "Jan 01 1998 08:00:00");
+var_dump(date("M d Y H:i:s",   $d));
+var_dump(gmdate("M d Y H:i:s", $d));
 
 $d = gmmktime(0, 0, 0, 1, 1, 1998);
-VS(date("M d Y H:i:s",   $d), "Dec 31 1997 16:00:00");
-VS(gmdate("M d Y H:i:s", $d), "Jan 01 1998 00:00:00");
+var_dump(date("M d Y H:i:s",   $d));
+var_dump(gmdate("M d Y H:i:s", $d));
 
 setlocale(2, LC_TIME, "en_US.utf8");
 $d = mktime(20, 0, 0, 12, 31, 98);
-VS(strftime("%b %d %Y %H:%M:%S", $d),   "Dec 31 1998 20:00:00");
-VS(gmstrftime("%b %d %Y %H:%M:%S", $d), "Jan 01 1999 04:00:00");
+var_dump(strftime("%b %d %Y %H:%M:%S", $d));
+var_dump(gmstrftime("%b %d %Y %H:%M:%S", $d));
 $t = mktime(0,0,0, 6, 27, 2006);
-VS(strftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p ".
+var_dump(strftime("%a %A %b %B %c %C %d %D %e %g %G %h %H %I %j %m %M %n %p ".
               "%r %R %S %t %T %u %U %V %W %w %x %X %y %Y %Z %z %%", $t),
               "Tue Tuesday Jun June Tue 27 Jun 2006 12:00:00 AM PDT 20 27 ".
               "06/27/06 27 06 2006 Jun 00 12 178 06 00 \n AM 12:00:00 AM ".
diff --git a/hphp/test/slow/ext_datetime/gmfoo.php.expect b/hphp/test/slow/ext_datetime/gmfoo.php.expect
index fae4ed595..f5a05ffb2 100644
--- a/hphp/test/slow/ext_datetime/gmfoo.php.expect
+++ b/hphp/test/slow/ext_datetime/gmfoo.php.expect
@@ -1,7 +1,10 @@
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+string(20) "Jan 01 1998 00:00:00"
+string(20) "Jan 01 1998 08:00:00"
+string(20) "Dec 31 1997 16:00:00"
+string(20) "Jan 01 1998 00:00:00"
+string(20) "Dec 31 1998 20:00:00"
+string(20) "Jan 01 1999 04:00:00"
+string(191) "Tue Tuesday Jun June Tue 27 Jun 2006 12:00:00 AM PDT 20 27 06/27/06 27 06 2006 Jun 00 12 178 06 00 
+ AM 12:00:00 AM 00:00 00 	 00:00:00 2 26 26 26 2 06/27/2006 12:00:00 AM 06 2006 PDT -0700 %"
+string(191) "Tue Tuesday Jun June Tue 27 Jun 2006 12:00:00 AM PDT 20 27 06/27/06 27 06 2006 Jun 00 12 178 06 00 
+ AM 12:00:00 AM 00:00 00 	 00:00:00 2 26 26 26 2 06/27/2006 12:00:00 AM 06 2006 PDT -0700 %"
diff --git a/hphp/test/slow/ext_datetime/localtime.php b/hphp/test/slow/ext_datetime/localtime.php
index 133f634b4..5e51bcc07 100644
--- a/hphp/test/slow/ext_datetime/localtime.php
+++ b/hphp/test/slow/ext_datetime/localtime.php
@@ -1,4 +1,7 @@
 <?php
+
+date_default_timezone_set("America/Los_Angeles");
+
 $d = strtotime("2008-09-10 12:34:56");
 
 $localtime = localtime($d);
diff --git a/hphp/test/slow/ext_datetime/strftime.php b/hphp/test/slow/ext_datetime/strftime.php
index 7211ff3ea..0d62e9eb9 100644
--- a/hphp/test/slow/ext_datetime/strftime.php
+++ b/hphp/test/slow/ext_datetime/strftime.php
@@ -1,29 +1,14 @@
 <?php
 
-function VS($x, $y) {
-  var_dump($x === $y);
-  if ($x !== $y) { echo "Failed: $y\n"; }
-}
+date_default_timezone_set("America/Los_Angeles");
 
 $ts = mktime(0, 0, 0, 8, 5, 1998);
 
 setlocale(2, LC_TIME, "C");
-VS(strftime("%A", $ts), "Wednesday");
-
-if (setlocale(2, LC_TIME, "fi_FI")) {
-  VS(strftime(" in Finnish is %A,", $ts), " in Finnish is keskiviikko,");
-} else {
-  //SKIP("setlocale() failed");
-}
-
-if (setlocale(2, LC_TIME, "fr_FR")) {
-  VS(strftime(" in French %A and", $ts), " in French mercredi and");
-} else {
-  //SKIP("setlocale() failed");
-}
+var_dump(strftime("%A", $ts));
 
 if (setlocale(2, LC_TIME, "de_DE")) {
-  VS(strftime(" in German %A.", $ts), " in German Mittwoch.");
+  var_dump(strftime(" in German %A.", $ts));
 } else {
   //SKIP("setlocale() failed");
 }
@@ -40,10 +25,10 @@ ISOWk  M   Tu  W   Thu F   Sa  Su
 2       6   7   8   9  10  11  12
 3      13  14  15  16  17  18  19
 */
-VS(strftime("%V,%G,%Y", strtotime("12/28/2002")), "52,2002,2002");
-VS(strftime("%V,%G,%Y", strtotime("12/30/2002")), "01,2003,2002");
-VS(strftime("%V,%G,%Y", strtotime("1/3/2003")),   "01,2003,2003");
-VS(strftime("%V,%G,%Y", strtotime("1/10/2003")),  "02,2003,2003");
+var_dump(strftime("%V,%G,%Y", strtotime("12/28/2002")));
+var_dump(strftime("%V,%G,%Y", strtotime("12/30/2002")));
+var_dump(strftime("%V,%G,%Y", strtotime("1/3/2003")));
+var_dump(strftime("%V,%G,%Y", strtotime("1/10/2003")));
 
 /*
 December 2004 / January 2005
@@ -55,7 +40,7 @@ ISOWk  M   Tu  W   Thu F   Sa  Su
 1       3   4   5   6   7   8   9
 2      10  11  12  13  14  15  16
 */
-VS(strftime("%V,%G,%Y", strtotime("12/23/2004")), "52,2004,2004");
-VS(strftime("%V,%G,%Y", strtotime("12/31/2004")), "53,2004,2004");
-VS(strftime("%V,%G,%Y", strtotime("1/2/2005")),   "53,2004,2005");
-VS(strftime("%V,%G,%Y", strtotime("1/3/2005")),   "01,2005,2005");
+var_dump(strftime("%V,%G,%Y", strtotime("12/23/2004")));
+var_dump(strftime("%V,%G,%Y", strtotime("12/31/2004")));
+var_dump(strftime("%V,%G,%Y", strtotime("1/2/2005")));
+var_dump(strftime("%V,%G,%Y", strtotime("1/3/2005")));
diff --git a/hphp/test/slow/ext_datetime/strftime.php.expect b/hphp/test/slow/ext_datetime/strftime.php.expect
index 601846ec2..9c3b306d1 100644
--- a/hphp/test/slow/ext_datetime/strftime.php.expect
+++ b/hphp/test/slow/ext_datetime/strftime.php.expect
@@ -1,12 +1,10 @@
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+string(9) "Wednesday"
+string(20) " in German Mittwoch."
+string(12) "52,2002,2002"
+string(12) "01,2003,2002"
+string(12) "01,2003,2003"
+string(12) "02,2003,2003"
+string(12) "52,2004,2004"
+string(12) "53,2004,2004"
+string(12) "53,2004,2005"
+string(12) "01,2005,2005"
diff --git a/hphp/test/slow/ext_datetime/strtotime.php b/hphp/test/slow/ext_datetime/strtotime.php
index 3aa0253c3..826bfae34 100644
--- a/hphp/test/slow/ext_datetime/strtotime.php
+++ b/hphp/test/slow/ext_datetime/strtotime.php
@@ -1,20 +1,17 @@
 <?php
 
-function VS($x, $y) {
-  var_dump($x === $y);
-  if ($x !== $y) { echo "Failed: $y\n"; }
-}
+date_default_timezone_set("America/Los_Angeles");
 
 var_dump(strtotime("now") > 0);
-VS(strtotime("10 September 2000"), 968569200);
-VS(strtotime("+1 day", 968569200), 968655600);
-VS(strtotime("+1 week", 968569200), 969174000);
-VS(strtotime("+1 week 2 days 4 hours 2 seconds", 968569200), 969361202);
-VS(strtotime("next Thursday", 968569200), 968914800);
-VS(strtotime("last Monday", 968569200), 968050800);
+var_dump(strtotime("10 September 2000"));
+var_dump(strtotime("+1 day", 968569200));
+var_dump(strtotime("+1 week", 968569200));
+var_dump(strtotime("+1 week 2 days 4 hours 2 seconds", 968569200));
+var_dump(strtotime("next Thursday", 968569200));
+var_dump(strtotime("last Monday", 968569200));
 
 $str = "Not Good";
 $timestamp = strtotime($str);
-VS($timestamp, false);
-VS(strtotime(""), false);
+var_dump($timestamp);
+var_dump(strtotime(""));
 
diff --git a/hphp/test/slow/ext_datetime/strtotime.php.expect b/hphp/test/slow/ext_datetime/strtotime.php.expect
index 53973d643..1a45ad512 100644
--- a/hphp/test/slow/ext_datetime/strtotime.php.expect
+++ b/hphp/test/slow/ext_datetime/strtotime.php.expect
@@ -1,9 +1,9 @@
 bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+int(968569200)
+int(968655600)
+int(969174000)
+int(969361202)
+int(968914800)
+int(968050800)
+bool(false)
+bool(false)
diff --git a/hphp/test/slow/ext_hash/ext_hash.php b/hphp/test/slow/ext_hash/ext_hash.php
index 6bda07da2..8fa5c3475 100644
--- a/hphp/test/slow/ext_hash/ext_hash.php
+++ b/hphp/test/slow/ext_hash/ext_hash.php
@@ -1,117 +1,82 @@
 <?php
 
-function VS($x, $y) {
-  var_dump($x === $y);
-  if ($x !== $y) { echo "Failed: $y\n"; }
+// HPHP has has many version of these functions over time
+// Faceobok has impelemtnation differences
+function is_facebook() {
+  return extension_loaded("tao");
 }
-function VERIFY($x) { VS($x, true); }
 
 function brown_fox() {
-  $expected = array(
-    "1072638ba8fc6f2ff06c251b62f426fd",
-    "a1e0224d596927a56c8bae416b2ef23e",
-    "5c6ffbdd40d9556b73a21e63c3e0e904",
-    "c0854fb9fb03c41cce3802cb0d220529e6eef94e",
-    "68b1282b91de2c054c36629cb8dd447f12f096d3e3c587978dc2248444633483",
-    "b7273c05ad141ccb6696b3659e57137c453b6d64690fa7d5cf96368df4a7138703a8c6ead31727b487b3628746510391",
-    "0a8c150176c2ba391d7f1670ef4955cd99d3c3ec8cf06198cec30d436f2ac0c9b64229b5a54bdbd5563160503ce992a74be528761da9d0c48b7c74627302eb25",
-    "077a3fd0a18a01cb23c3e1bede846f99",
-    "ec457d0a974c48d5685a7efa03d137dc8bbde7e3",
-    "50c51844b845b31323765ae334349dd6a94db3e5b9624540bcbfa940f6857c3f",
-    "67b248ca0b750028e76f09f5f9b9b746f04c228ce659f75393c83ee46b82dea011f15f465a7e4f71",
-    "802dc377bf6dc4f905b90cf2f1ddb39d4958526c3772bce41c03488701630eeede851f5ddc195714ea9e35311a513e31c3b616ffce5756bd963e0fdc092b2f87",
-    "9370512795923aaeeb76fe3d8ea7433e", // tiger128,3-fb
-    "9370512795923aaeeb76fe3d8ea7433e", // tiger128,3
-    "ae3a9295275170933e43a78e3dfe76eb75396b1d", // tiger160,3
-    "ae3a9295275170933e43a78e3dfe76eb75396b1d5dd69706", // tiger192,3
-    "358e7b5fed633162893208eb1b2c1cca", // tiger128,4
-    "358e7b5fed633162893208eb1b2c1cca6b6eef15", // tiger160,4
-    "358e7b5fed633162893208eb1b2c1cca6b6eef15c60cb01a", // tiger192,4
-    "1d4ca34cc860789a2a63fab87cd6a2c3ae5ecb1df8bd3cce605ffa2de1fbd73b",
-    "c10eb0cb71a04377a0452a4aa64853996f73cac95f6ae434df8083d473fac944",
-    "5e10f17b",
-    "413a86af",
-    "4246a382",
-    "aa517f0b69b75146a39384ec92a02877",
-    "d9f46869ef2bf66602a0725c079d35a9f3ac6dd0",
-    "04934beab28037aae8fd658389626368530562b96c9aba89",
-    "41c959f1e44e931b0473c54c49080d74d49a96ea56e766af408a85fd",
-    "6c7c17d5784428d4d62b7f652223d64a30c78aa5f2c2c71ce780ec3f0d0ec28d",
-    "31147399766a068d0417390a4b9fa0c8",
-    "ad9aa7904f202cdfb1faf7d385d10e3de575f74c",
-    "1568ff7e99ca98fbeb9a2d4c0318dcc290d0eb10d064d0f6",
-    "94656ade22076dd122714b4168a2ed8228b554f70eca5728c5038579",
-    "404e1584994409ee38e0829099521168ba7c3aa1b0e82d1a72ec387fd1317ecf",
-    "bc0db0f23eabcd9d0c4d0a2e498b8c47",
-    "51341aa150d38695628491580d8d6dc9850201f7",
-    "da27cf4bdb2decd4731c69a017534535eecd6d9b9015fc41",
-    "f8a5d442ef5b82e062599fe38ddbf46999b29f0a15caa8bebabbff68",
-    "16e1688c75cf09338fce299455ec0f6f783ca1cbb2006203ae6ae98b23f9294a"
-  );
-
   $data = "The quick brown fox jumped over the lazy dog.";
-  $i = 0;
-  VS(hash("md2",        $data), $expected[$i++]);
-  VS(hash("md4",        $data), $expected[$i++]);
-  VS(hash("md5",        $data), $expected[$i++]);
-  VS(hash("sha1",       $data), $expected[$i++]);
-  VS(hash("sha256",     $data), $expected[$i++]);
-  VS(hash("sha384",     $data), $expected[$i++]);
-  VS(hash("sha512",     $data), $expected[$i++]);
-  VS(hash("ripemd128",  $data), $expected[$i++]);
-  VS(hash("ripemd160",  $data), $expected[$i++]);
-  VS(hash("ripemd256",  $data), $expected[$i++]);
-  VS(hash("ripemd320",  $data), $expected[$i++]);
-  VS(hash("whirlpool",  $data), $expected[$i++]);
-  VS(hash("tiger128,3-fb", $data), $expected[$i++]);
-  VS(hash("tiger128,3", $data), $expected[$i++]);
-  VS(hash("tiger160,3", $data), $expected[$i++]);
-  VS(hash("tiger192,3", $data), $expected[$i++]);
-  VS(hash("tiger128,4", $data), $expected[$i++]);
-  VS(hash("tiger160,4", $data), $expected[$i++]);
-  VS(hash("tiger192,4", $data), $expected[$i++]);
-  VS(hash("snefru",     $data), $expected[$i++]);
-  VS(hash("gost",       $data), $expected[$i++]);
-  VS(hash("adler32",    $data), $expected[$i++]);
-  VS(hash("crc32",      $data), $expected[$i++]);
-  VS(hash("crc32b",     $data), $expected[$i++]);
-  VS(hash("haval128,3", $data), $expected[$i++]);
-  VS(hash("haval160,3", $data), $expected[$i++]);
-  VS(hash("haval192,3", $data), $expected[$i++]);
-  VS(hash("haval224,3", $data), $expected[$i++]);
-  VS(hash("haval256,3", $data), $expected[$i++]);
-  VS(hash("haval128,4", $data), $expected[$i++]);
-  VS(hash("haval160,4", $data), $expected[$i++]);
-  VS(hash("haval192,4", $data), $expected[$i++]);
-  VS(hash("haval224,4", $data), $expected[$i++]);
-  VS(hash("haval256,4", $data), $expected[$i++]);
-  VS(hash("haval128,5", $data), $expected[$i++]);
-  VS(hash("haval160,5", $data), $expected[$i++]);
-  VS(hash("haval192,5", $data), $expected[$i++]);
-  VS(hash("haval224,5", $data), $expected[$i++]);
-  VS(hash("haval256,5", $data), $expected[$i++]);
+  var_dump(hash("md2",        $data));
+  var_dump(hash("md4",        $data));
+  var_dump(hash("md5",        $data));
+  var_dump(hash("sha1",       $data));
+  var_dump(hash("sha256",     $data));
+  var_dump(hash("sha384",     $data));
+  var_dump(hash("sha512",     $data));
+  var_dump(hash("ripemd128",  $data));
+  var_dump(hash("ripemd160",  $data));
+  var_dump(hash("ripemd256",  $data));
+  var_dump(hash("ripemd320",  $data));
+  var_dump(hash("whirlpool",  $data));
+  var_dump(hash("tiger160,3", $data));
+  var_dump(hash("tiger192,3", $data));
+  var_dump(hash("tiger128,4", $data));
+  var_dump(hash("tiger160,4", $data));
+  var_dump(hash("tiger192,4", $data));
+  var_dump(hash("snefru",     $data));
+  var_dump(hash("gost",       $data));
+  var_dump(hash("crc32",      $data));
+  var_dump(hash("haval128,3", $data));
+  var_dump(hash("haval160,3", $data));
+  var_dump(hash("haval192,3", $data));
+  var_dump(hash("haval224,3", $data));
+  var_dump(hash("haval256,3", $data));
+  var_dump(hash("haval128,4", $data));
+  var_dump(hash("haval160,4", $data));
+  var_dump(hash("haval192,4", $data));
+  var_dump(hash("haval224,4", $data));
+  var_dump(hash("haval256,4", $data));
+  var_dump(hash("haval128,5", $data));
+  var_dump(hash("haval160,5", $data));
+  var_dump(hash("haval192,5", $data));
+  var_dump(hash("haval224,5", $data));
+  var_dump(hash("haval256,5", $data));
+
+  if (is_facebook()) {
+    var_dump(
+      hash("tiger128,3-fb", $data) == '9370512795923aaeeb76fe3d8ea7433e' &&
+      hash("tiger128,3", $data) == '9370512795923aaeeb76fe3d8ea7433e'
+    );
+    var_dump(hash("adler32", $data) == '5e10f17b');
+    var_dump(hash("crc32b", $data) == '4246a382');
+  } else {
+    var_dump(
+      hash("tiger128,3", $data) == 'ae3a9295275170933e43a78e3dfe76eb'
+    );
+    var_dump(hash("adler32", $data) == '7bf1105e');
+    var_dump(hash("crc32b", $data) == '82a34642');
+  }
 }
 
 function test_hash_init() {
   $ctx = hash_init("md5");
   hash_update($ctx, "The quick brown fox ");
   hash_update($ctx, "jumped over the lazy dog.");
-  VS(hash_final($ctx), "5c6ffbdd40d9556b73a21e63c3e0e904");
+  var_dump(hash_final($ctx));
 }
 
 function test_hash_file() {
-  VS(hash_file('md5', __DIR__.'/test_file.txt'),
-    "5c6ffbdd40d9556b73a21e63c3e0e904");
-  VS(hash_hmac_file("md5", __DIR__.'/test_file.txt', "secret"),
-     "7eb2b5c37443418fc77c136dd20e859c");
-
+  var_dump(hash_file('md5', __DIR__.'/test_file.txt'));
+  var_dump(hash_hmac_file("md5", __DIR__.'/test_file.txt', "secret"));
 }
 
 function test_furchash() {
-  if (furchash_hphp_ext_supported()) {
-    VS(furchash_hphp_ext("15minutesoffame", 15, 86), 25);
+  if (is_facebook()) {
+    var_dump(furchash_hphp_ext("15minutesoffame", 15, 86) == '25');
   } else {
-    var_dump(true);
+    var_dump(furchash_hphp_ext("15minutesoffame", 15, 86) == '85');
   }
 }
 
diff --git a/hphp/test/slow/ext_hash/ext_hash.php.expect b/hphp/test/slow/ext_hash/ext_hash.php.expect
index 73db5cd05..404936c28 100644
--- a/hphp/test/slow/ext_hash/ext_hash.php.expect
+++ b/hphp/test/slow/ext_hash/ext_hash.php.expect
@@ -1,43 +1,42 @@
+string(32) "1072638ba8fc6f2ff06c251b62f426fd"
+string(32) "a1e0224d596927a56c8bae416b2ef23e"
+string(32) "5c6ffbdd40d9556b73a21e63c3e0e904"
+string(40) "c0854fb9fb03c41cce3802cb0d220529e6eef94e"
+string(64) "68b1282b91de2c054c36629cb8dd447f12f096d3e3c587978dc2248444633483"
+string(96) "b7273c05ad141ccb6696b3659e57137c453b6d64690fa7d5cf96368df4a7138703a8c6ead31727b487b3628746510391"
+string(128) "0a8c150176c2ba391d7f1670ef4955cd99d3c3ec8cf06198cec30d436f2ac0c9b64229b5a54bdbd5563160503ce992a74be528761da9d0c48b7c74627302eb25"
+string(32) "077a3fd0a18a01cb23c3e1bede846f99"
+string(40) "ec457d0a974c48d5685a7efa03d137dc8bbde7e3"
+string(64) "50c51844b845b31323765ae334349dd6a94db3e5b9624540bcbfa940f6857c3f"
+string(80) "67b248ca0b750028e76f09f5f9b9b746f04c228ce659f75393c83ee46b82dea011f15f465a7e4f71"
+string(128) "802dc377bf6dc4f905b90cf2f1ddb39d4958526c3772bce41c03488701630eeede851f5ddc195714ea9e35311a513e31c3b616ffce5756bd963e0fdc092b2f87"
+string(40) "ae3a9295275170933e43a78e3dfe76eb75396b1d"
+string(48) "ae3a9295275170933e43a78e3dfe76eb75396b1d5dd69706"
+string(32) "358e7b5fed633162893208eb1b2c1cca"
+string(40) "358e7b5fed633162893208eb1b2c1cca6b6eef15"
+string(48) "358e7b5fed633162893208eb1b2c1cca6b6eef15c60cb01a"
+string(64) "1d4ca34cc860789a2a63fab87cd6a2c3ae5ecb1df8bd3cce605ffa2de1fbd73b"
+string(64) "c10eb0cb71a04377a0452a4aa64853996f73cac95f6ae434df8083d473fac944"
+string(8) "413a86af"
+string(32) "aa517f0b69b75146a39384ec92a02877"
+string(40) "d9f46869ef2bf66602a0725c079d35a9f3ac6dd0"
+string(48) "04934beab28037aae8fd658389626368530562b96c9aba89"
+string(56) "41c959f1e44e931b0473c54c49080d74d49a96ea56e766af408a85fd"
+string(64) "6c7c17d5784428d4d62b7f652223d64a30c78aa5f2c2c71ce780ec3f0d0ec28d"
+string(32) "31147399766a068d0417390a4b9fa0c8"
+string(40) "ad9aa7904f202cdfb1faf7d385d10e3de575f74c"
+string(48) "1568ff7e99ca98fbeb9a2d4c0318dcc290d0eb10d064d0f6"
+string(56) "94656ade22076dd122714b4168a2ed8228b554f70eca5728c5038579"
+string(64) "404e1584994409ee38e0829099521168ba7c3aa1b0e82d1a72ec387fd1317ecf"
+string(32) "bc0db0f23eabcd9d0c4d0a2e498b8c47"
+string(40) "51341aa150d38695628491580d8d6dc9850201f7"
+string(48) "da27cf4bdb2decd4731c69a017534535eecd6d9b9015fc41"
+string(56) "f8a5d442ef5b82e062599fe38ddbf46999b29f0a15caa8bebabbff68"
+string(64) "16e1688c75cf09338fce299455ec0f6f783ca1cbb2006203ae6ae98b23f9294a"
 bool(true)
 bool(true)
 bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
+string(32) "5c6ffbdd40d9556b73a21e63c3e0e904"
+string(32) "5c6ffbdd40d9556b73a21e63c3e0e904"
+string(32) "7eb2b5c37443418fc77c136dd20e859c"
 bool(true)
diff --git a/hphp/test/slow/ext_network/ext_network.php b/hphp/test/slow/ext_network/ext_network.php
index de1a8bfea..0f0ee7202 100644
--- a/hphp/test/slow/ext_network/ext_network.php
+++ b/hphp/test/slow/ext_network/ext_network.php
@@ -1,56 +1,49 @@
 <?php
 
-function VS($x, $y) {
-  var_dump($x === $y);
-  if ($x !== $y) { echo "Failed: $y\n"; echo "Got: $x\n";
-                   var_dump(debug_backtrace()); }
-}
-function VERIFY($x) { VS($x != false, true); }
-
 //////////////////////////////////////////////////////////////////////
 
-VERIFY(gethostname());
+var_dump(gethostname() != false);
 
-VS(gethostbyaddr("127.0.0.1"), "localhost.localdomain");
-VS(gethostbyname("localhost"), "127.0.0.1");
-VS(gethostbynamel("localhost"), array("127.0.0.1"));
-VS(getprotobyname("tcp"), 6);
-VS(getprotobynumber(6), "tcp");
-VS(getservbyname("http", "tcp"), 80);
-VS(getservbyport(80, "tcp"), "http");
+var_dump(gethostbyaddr("127.0.0.1"));
+var_dump(gethostbyname("localhost"));
+var_dump(gethostbynamel("localhost")[0]);
+var_dump(getprotobyname("tcp"));
+var_dump(getprotobynumber(6));
+var_dump(getservbyname("http", "tcp"));
+var_dump(getservbyport(80, "tcp"));
 $packed = chr(127) . chr(0) . chr(0) . chr(1);
-VS(inet_ntop($packed), "127.0.0.1");
+var_dump(inet_ntop($packed));
 
 $packed = str_repeat(chr(0), 15) . chr(1);
-VS(inet_ntop($packed), "::1");
+var_dump(inet_ntop($packed));
 
 $packed = chr(127) . chr(0) . chr(0) . chr(1);
-VS(inet_pton("127.0.0.1"), $packed);
+var_dump(inet_pton("127.0.0.1"));
 
 $packed = str_repeat(chr(0), 15) . chr(1);
-VS(inet_pton("::1"), $packed);
-VS(inet_pton("::1"), hex2bin("00000000000000000000000000000001"));
+var_dump(inet_pton("::1"));
+var_dump(inet_pton("::1"));
 
-VS(ip2long("127.0.0.1"), 2130706433);
-VS(long2ip(2130706433), "127.0.0.1");
+var_dump(ip2long("127.0.0.1"));
+var_dump(long2ip(2130706433));
 
-VERIFY(dns_check_record("facebook.com"));
-VERIFY(checkdnsrr("facebook.com"));
+var_dump(dns_check_record("facebook.com"));
+var_dump(checkdnsrr("facebook.com"));
 
 $x = dns_get_record("facebook.com", DNS_A);
-VERIFY(!empty($x));
+var_dump(!empty($x));
 
-VERIFY(dns_get_mx("facebook.com", $hosts));
-VERIFY(!empty($hosts));
+var_dump(dns_get_mx("facebook.com", $hosts));
+var_dump(!empty($hosts));
 
-VERIFY(getmxrr("facebook.com", $hosts));
-VERIFY(!empty($hosts));
+var_dump(getmxrr("facebook.com", $hosts));
+var_dump(!empty($hosts));
 
 $f = fsockopen("facebook.com", 80);
-VERIFY($f);
+var_dump($f);
 fputs($f, "GET / HTTP/1.0\n\n");
 $r = fread($f, 15);
-VERIFY(!empty($r));
+var_dump(!empty($r));
 
 $f = fsockopen("ssl://www.facebook.com", 443);
 fwrite($f,
@@ -63,32 +56,32 @@ while (!feof($f)) {
   $line = fgets($f, 128);
   $response .= $line;
 }
-VERIFY(!empty($response));
+var_dump(!empty($response));
 
-VS(socket_get_status(new stdclass), false);
+var_dump(socket_get_status(new stdclass));
 
 $f = fsockopen("facebook.com", 80);
-VERIFY($f);
+var_dump($f);
 socket_set_blocking($f, 0);
 
 $f = fsockopen("facebook.com", 80);
-VERIFY($f);
+var_dump($f);
 socket_set_timeout($f, 0);
 
 header("Location: http://www.facebook.com");
 header("Location: http://www.facebook.com");
-VS(headers_list(), null);
+var_dump(headers_list());
 
 header("Location: http://www.facebook.com");
-VERIFY(!headers_sent());
+var_dump(!headers_sent());
 
 header_remove("name");
 header_remove();
 
-VERIFY(!setcookie("name", "value"));
-VERIFY(!setcookie("name", "value", 253402300800));
+var_dump(!setcookie("name", "value"));
+var_dump(!setcookie("name", "value", 253402300800));
 
-VERIFY(!setrawcookie("name", "value"));
+var_dump(!setrawcookie("name", "value"));
 
 define_syslog_variables();
 
diff --git a/hphp/test/slow/ext_network/ext_network.php.expect b/hphp/test/slow/ext_network/ext_network.php.expect
index e7038bc35..af08b1449 100644
Binary files a/hphp/test/slow/ext_network/ext_network.php.expect and b/hphp/test/slow/ext_network/ext_network.php.expect differ
diff --git a/hphp/test/slow/ext_options/ext_options.php b/hphp/test/slow/ext_options/ext_options.php
index 1f5b17842..e3125af05 100644
--- a/hphp/test/slow/ext_options/ext_options.php
+++ b/hphp/test/slow/ext_options/ext_options.php
@@ -3,7 +3,6 @@
 assert_options(1);
 var_dump(dl(""));
 
-var_dump(extension_loaded("phpmcc"));
 var_dump(extension_loaded("bcmath"));
 var_dump(extension_loaded("curl"));
 var_dump(extension_loaded("simplexml"));
diff --git a/hphp/test/slow/ext_options/ext_options.php.expect b/hphp/test/slow/ext_options/ext_options.php.expect
index 23307a1f9..ee20a94e8 100644
--- a/hphp/test/slow/ext_options/ext_options.php.expect
+++ b/hphp/test/slow/ext_options/ext_options.php.expect
@@ -3,7 +3,6 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-bool(true)
 bool(false)
 array(0) {
 }