Correcting tests, cleaning up subscription.