Minor fixes to DataSource and tests