Improve code-coverage for data-provider