Fix tests for datasources change