Fix tests in hhvm