Merge "Refactor LeaderTest"