Attempt to fix hhvm tests (6)