Made provider tests robust