Code refactored to allow for testing of master responding when ZK isn't ...

...running
final