Attempt to fix hhvm tests