I think that tests that work more realistically like these are a great idea, but I also think it'd be pretty low priority to redo the existing tests in this style. It's great that we have tests that cover this part of the code path, but I don't think it's critical that *all* of the tests do so.

That said, it could make sense to improve the other tests as they are touched.