Fix ModelOrResultTest
Merge branch 'fix-test'