Small changes to test model class