CS fixes and tidy up of tests

Okay. Will change it tonight. Though according to [the manual](http://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single) it should be doubled ;)