tests: split the HTML formatting and reply building into separate test cases
Composer: move to the dedicated namespace

Also an associated header cleanup.