Updating engine to be compatible with upstream

Syntax errors after recent arc upgrade, changing to use configurable
phpunit binary as well.