After chatting with @benilovj, let's leave this here for now.  He'll pull this out later as part of the work on creating the integration tests.