Removing mock, because it's too hard to use mocked method parameters

Like #232