Change this interface to match the testable one
More unit test coverage