Fix hhvm test failures

Relates to #350