Revert "Fixed tests according to most recent xsd version"

This reverts commit 0ab92b3c53789f4ef6e688fa32084de04e206ed4.