Changes required to pass ServerConnectionTest