Added further tests for proper escaping.