Should I add tests for html-escaping here?