Updates to XMLIO & tests and DrinksReportFlow & tests