Fix broken UNIX server test
Whitespace fixes
Merge pull request #2 from stouset/refactor-servers

Fix broken UNIX server test