Finish renaming in tests