Fix up provider tests