CS fixes and tidy up of tests

The benefit of using single quotes is also that even lowercase chars don't require escaping the backslashes