Handingle multiple out parameters, and out parameters in void methods.
More testing to ensure matching works as expected, and multiple mocks in a single test works.
Lots of code cleanup