Tests: Some extra changes to the test suite.
Composer: Fix composer.json file.