Added a few more tests and options to toXml (closes #14)