server test joined together
Merge pull request #44 from rtfeldman/server-tests

server test joined together