Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
These are some minor annoyances fixed. It's brached off of !362 (merged)