Remove a couple string variables that were used only once and use the string literal directly.
behaviour. Add a test case.