Trying to fix various HHVM tests