More Refactor

 - Allow the use of Mock objects