converted rested of providers, tests pass on non-min