Fixed tests to pass on hhvm