Fix hhvm tests