Fixing failing test and rerecording mocks