Fixed the phpunit config.
Merge remote-tracking branch 'origin/develop' into develop
Removed local file from version controll.