Resolved conflict in test_model.py from merge.