this should unblock you hopefully :)

I've commented out a bunch of tests, but it should be relatively straightforward to fix them.

I don't love the answer(idx) solution, it might be better to make a custom ArgumentMatcher which does exactly the same thing as CapturingMatcher but doesn't use mockito capturing so it yells at you less.