Fixing tests with composer

Conflicts:
	Tests/testkernel/TestKernel.php
Merge branch 'feature/fix-tests'