introduce model changes. adds additional test.