Fix tests so that we actually test a proper reconnect.
Fix code so that it actually does a proper retry test.