Fix tests for HHVM