Destruct variables in separate 'var'
Made it for consistence with arguments and readability. Also found a problem with indentation in expanded constructor. Same with arguments.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Made it for consistence with arguments and readability. Also found a problem with indentation in expanded constructor. Same with arguments.