Spring cleaning
A few unrelated cleanups; please see the individual commits.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
A few unrelated cleanups; please see the individual commits.