I don't mind doing that. We can change the test to confirm that all the methods are invoked properly in the right order by using/extending the NoopBuilder. That was the original purpose. Let's change them and make the tests better.

I am not particularly happy about the coverage provided by those tests either so whatever we can do to increase that would be good.