Simplify test object, and introduce MarkupBuilder