Attempt to fix hhvm tests (4)