Continuing to write tests for Server