Refactored response models, refactored tests