Attempt to fix hhvm tests (9)