Fix up the tests, refactor for clarity
Merge pull request #3 from mdevilliers/HA

High Availability