Fleshing out server a little bit more. Added test.