Mocked to run tests
Cleanup by using shim
Merge pull request #2 from hybridgroup/testable

Testable