Attempting to fix tests for latest HHVM.