Attempt to fix hhvm tests (5)