Refactored response mocking. Made changed based on review