Added tests for escaping