Minor code refactor for inlining functions.
It's just a minor code refactor, doesn't change any logic or behaviour.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
It's just a minor code refactor, doesn't change any logic or behaviour.