Refactor for Atlas renaming test