We need to provide tests for this code. It will require mocking, or using the Mojo mocking, but should be done before we add more in this area.