renaming missing elements and tests