Sync test expectations with test_model_management.py