Wrote some new tests for moving