Namespace more unit tests.
Remove some now unneeded code and update a few composer.json files.