Attempt to fix hhvm tests (14)