More renaming tests pass