Attempting to fix tests for HHVM.