Added the SubscriptionPlanType and fixed some bugs in the TimeIntervalType Integration tests