test datasources bug fixes