Refactored models and included test data