Renaming & updating test