ticket:1 changed models and tests