Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: myronmarston
This is a few refactorings that are prep steps to support #956.