Attempt to fix hhvm tests (8)