Test fixes
Removed an unneeded check
Merge pull request #239 from GrahamCampbell/hhvm

Test Fixes