Refactored the model tests, all passing