Untangling more of variable reuse
Can't show this merge request because the source branch cleanup-3 is missing from project NHOrus/open-adventure. Close this merge request or update the source branch.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data