Fixed datasource tests for Issue #20946