Fixed tests according to most recent xsd version