Attempt to fix hhvm tests (3)