Less duplication
More test cleanup
Make private announce test more complete and fix brittle peer order