Add TODO note about perhaps replacing our mock with the use of flexmock. Not worth adding this dependency just yet, only when we feel pain in mocking later