PR 2280 followups
Created by: myronmarston
@eugeneius -- can you review my refactoring here and confirm my refactoring here is functionality equivalent to what you had before?
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: myronmarston
@eugeneius -- can you review my refactoring here and confirm my refactoring here is functionality equivalent to what you had before?