Finish Unit Tests for Server

This should finish up the unit tests for the server, now we should add some tests for the client and then work on the user stories and system tests.