Fix subscriptions internally with test suite. Finally have things up and running / semi-working