Rename works now, added test to main and unit tester