Refactored some tests
Fixed test
Attempt to fix hhvm