refactored mocks to use return_value.