Revert "Added interface to facilitate mocking"

This reverts commit dedd475ef9a7f3db4735b57debe312c016e051ee.
Revert "Revert "Added interface to facilitate mocking""

This reverts commit 3bf3b277dcd7534950de031c5ed8a6a6e39c24fe.