subscription manager test improvements