More refactoring and add FreeAppNotificationFactoryTest