I could swear I commited this before! Anyways, here is the fix again for the failing mini model tests.
Merge branch 'master', remote-tracking branch 'origin'