CS fixes and tidy up of tests

I suggest keeping the single backslash. It makes things more readable IMO