Further work on subscriptions, plus tweaks to subscription test.