added Test Suite
html escaping added with Apache commons