fixing test..imroving rename operation..