FS-1 FS-2: Review ServerConnectorTest