Make tests simpler.

Use fewer mocks and still get the same/better coverage.