Notes
Add a test case for federation link re-establishment
Refactor / Tidy