more test refactoring, specifically model tests