Refactored data model tests