Subscription storage now supports the new model
Cleaning up the test inits