Fixing failing tests and rerecording mocks