Fixing test cases for delayed datasource.