Cleaned up various *.xml for testing