Once #223 is done, we can make use of it for better testing tools (like mocking helpers for the various interfaces we end up with).