Fix serialisation for GH-186 @wip
Add more stanzas for gh-186 @wip
Add json method for serialisation of stanzas for gh-186 @wip
Update test output formatting @minor