more model test refactorings