Mocking / Unit Testing improvement

[Gareth Thomas]

Currently its mostly Integration testing. Clean up the testing project to use a mixture of Mock and Integration testing in appropriate places to make the Test project a bit lighter and easier to maintain.