Merge "Add an active/standby scenario test"