Converted manual mocking to use Mock

lots of delta, only one new test