Simplify test code
Run tests using PHP 5.6 and HHVM