Refactor Model tests