Rework datasource invoke crash test