Refactored model unit tests