Attempt to fix hhvm tests (13)