changes to HtmlGenerator, RequestParser and HtmlGeneratorTest