Renaming in tests incomplete.