Oh yes, this does seem problematic. Great catch, I think I had meant to revisit this.

The approach I took was mostly a result of me not being too familiar with the code, and just stuffing mocks everywhere. I agree that overriding the input generator should suffice, and I've got something that seems to be working. I'll post a new diff tonight or tomorrow.