Moving tests to model folder