all non subscription tests passing
reverting unnecessary abstracting