Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Fixes for Gogo and made some changes based on feedback.