Merge "Refactor LeaderElectionScenarioTests"