xml schema updates, tests