Fixing up the provider tests