Apply main queue wait fix to XTHistoryDataSourceTests