LIVEOAK-74: Update to include subscriptions. Fix failing tests.