Various fixes

Fixes #545
Fixes #544

More work on extended test case for zgossip.