[WIP] Merge branch Mario/sandbox_fixes (S merge request)
Fixes a couple of old issues with sandbox, and adds some new stuff
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Fixes a couple of old issues with sandbox, and adds some new stuff