Minor provider/test refactoring