Fix model test for real across vendors