Add validations on notifications and tests