Changing xml's in tests to match the new model.
Merge remote-tracking branch 'origin/restructure' into restructure