Added test helpers. And some more tests for provider