Moving PSR-4 call for tests, into composer.json
Merge branch 'master' into Dev