Fix integration specs for data source refactor