Updated mocks to reflect new output