Attempt to fix hhvm tests (2)