CS fixes and tidy up of tests

Last time I checked, PHPunit was not use use statements for its annotations like ``@expectedException`` or ``@covers``