Fixed rename/move. Added tests.