moving the test to model, where it makes more sense