Updated reference to phpunit
Merge