Updated tests for HHVM
Merged remote changes