Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Revert !12 (merged), and fix the incorrect reference to collection variables
collection