Fixed bugs with failover/failback exercise