WIP: cleaned up another error in the tests.
WIP: fixed the heartbeat notification to work with multi-homed systems.