This should make the cli easier to test