Make the server testable
Merge pull request #19 from azotova/serverStart

Make the server testable