Attempt to fix hhvm tests (7)