Add backslashes
Improve test coverage