Refactored model specs