Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Supersedes !181 (closed) with a manual merge and clean up.