Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Reordered and regrouped the items in the middle to look like this:
or this (when no switching/merging/rebasing is allowed)