Fix for generating one content
Fix tests for using ComposeXML class