Add rename op
Cleanup after tests