Fix model test concurrency issues.

(Worth seeing how hard it would be to refactor this file to use separate
collections per run...)