Corrected some messed up logic in rename
Corrected rename test