Fixed tests for HHVM (trying again).