Fixing Failover test that was hanging eventually