- Remove some redundant code for research mode. - The international parameter in update_notification_to_sending is not needed. - Update unit tests and removed duplicates