Fix unit tests for HHVM