cleanup and use TermTestBase for model tests