Add more node renaming tests