Continued fleshing out the Server tests