Style tweaks
The commits should be atomic, so feel free to pick and choose.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
The commits should be atomic, so feel free to pick and choose.