Include index name in UpdateSettings test
Separate folders for Update and UpdateSettings