Pull request to fix TestDataSourceConnectionProvider