fix up model tests
fix up model tests

praekelt/mc2,praekelt/mc2,universalcore/unicore-mc,praekelt/mc2,praekelt/mc2,praekelt/mc2,universalcore/unicore-mc,universalcore/unicore-mc,universalcore/unicore-mc