Updated the Rename Test to fix some bugs and clean up some code.