CS fixes and tidy up of tests

Is `\\` actually required in our coding standards?