CS fixes and tidy up of tests

Okay. I will modify CollectionTest to extend \PHPUnit_Framework_TestCase as well and will delete DoctrineTestCase then, as that one was the only usage.