Convert rename tests to use modify. Remove "rename".
6 files changed