Trying to fix hhvm tests