Updating to support HHVM
Trying to fix tests