More tests and bug fixes
I pulled a few commits out of the !248 (merged) saga, and added a bug fix or two. It would be easier if this was merged before !248 (merged)
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
I pulled a few commits out of the !248 (merged) saga, and added a bug fix or two. It would be easier if this was merged before !248 (merged)