Made sure that phpunit exist status is reflected in the make
Merge branch 'setup' into testing