subscription store improvements and tests