Move GenericHTMLComposer out of init.
Get 100% coverage for the template catalog.
More coverage for configuration.
Add some unit tests for Site.