changes to transfer/move
Fixed testing suite
Fixed testing suite
Fixed conflicts