Updated tests for Server(s)