Update and rename index-test-x.xml to index-x.xml