expanded providers and product models; added tests