CS fixes and tidy up of tests

@jmikola it's not... adding double `\\` adds no value if next char is uppercase.