updated subscription functionality and fixed some tests