pre index-v1 fixes
With the new index-v1 nearing completion, this is the last round of prep work and fixes before that lands.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
With the new index-v1 nearing completion, this is the last round of prep work and fixes before that lands.