Repackage model tests into models