Made some changes to defend against issues connecting to the test servers.