Adding in a few tests for the server