refactor Moving tests