refactor Moving tests

Close #630