Work on subscription tests