Fixed a bug on CurrentSubscription tests and prepped for 2.1