Mostly addition of tests

Heh yeah well in XML's defense, I actually was hating the conversion libraries which added all these extra keys and made my tests fail. I will apologize to XML next time I see it.