Adds more tests to server and addresses most of the tests