Added unit tests for moving