Clean up tests
Avoid QuorumManager getting in the way during live.stop()
Merge pull request #953 from FranciscoBorges/master

Keep the quorum manager from failing over too fast.