Minor adjustments
Return the appropriate objects when creating checks and notifications
Return NotificationPlanManager objects from ID (and clean up a dirty one from Notification)
Fill out the rest of the missing sections from the diff