Started refactoring the tests to Mock the world.