Fix tests for rename.