Rename NotificationSubscription to ReportSubscription
Fix failing calendar specs that had magically slipped into the past