More tests for Server
CHANGES