Improve testing of providers