cleaned up tests in waterxml and waterxml_tests