Fixed bug where there was no space after 'App Beta' in notification message
Reworked the code for NotificationMessageSource interface and implementation classes