Cleanup for getting a first unit test to work
Merge pull request #1 from robstryker/serverMockup

Cleanup for getting a first unit test to work