Fix XML Schema validation issues

-Updated tests