Merge pull request #38 from m1ch1/test

Add single server testcases.