Attempt to fix hhvm tests (12)