Merge "Create common superclass for old and new provider tests" into main