tiny changes, still will probably need to modify testsubscribe again