updated tests for new model class