Group tests together based on provider
Rearrange providers alphabetically

Use separate test objects for each provider test group