CS fixes and tidy up of tests

Can you also use single quotes here?