passed tests for model
merged conflict