CS fixes and tidy up of tests

Please revert this. Unless there's a use case for this inheritance, the phpunit base testcase works fine.