Intermediate changes

commit_hash:6fb24458a96f300f8c26c5a2e44bb97b05841ee9

55 files changed, 2 insertions, 57 deletions

diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yqls
index c11cb23385..ef5ed8cef0 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yqls
index 515e2a8b12..d3d5cf2670 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yqls
index 7000919e30..8c041349bc 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
@@ -19,4 +18,4 @@
 (let world (Write! world res_sink (Key) resKey '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yqls
index df5d2e57d3..fe5fcc2d53 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yqls
index 024634d7eb..55a248a197 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yqls
index 9675c04f53..1b5bd24226 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yqls
index b2eb3de6c7..6096d045cd 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yqls
index 8b92075b05..fda59e3949 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yqls
index 42f0cd50ae..58430aaa17 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yqls
index 5b2af85cb4..dd8204f3a6 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yqls
index 596bee4b54..ba710af244 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yqls
index f8370b3e2c..50b79a13ab 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yqls
index a66f831ef6..30759f695d 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yqls
index 572fd9c8d0..15eec4d42f 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yqls
index 17ec1f51cd..1b63f130fc 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yqls
index 89673e7537..cbd1c0b90c 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yqls
index 3737607dce..9ca47db91e 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yqls
index 1cdfd95b7f..f588693ee3 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yqls
index 90491b076c..b4f0451c6d 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yqls
index 8b12566a00..fa5a24a94c 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yqls
index 839f2ed8d3..cc98ba7a22 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yqls
index 2795d9997f..3ff4241839 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yqls
index 90aee42e16..5e62809947 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yqls
index b919f533a1..db15e2a595 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yqls
index df1a292312..6382d1d3d2 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yqls
index 9269a50494..b55474d3c4 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yqls
index 050155a6db..f05404e5e8 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yqls
index acfd645ceb..c3fd88c138 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yqls
index 59f97eb433..897becfd9f 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yqls
index b4c026e19c..f2d1dc360e 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yqls
index f5e9ad153a..872a3dbca4 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yqls
index 9102141861..1ef77dede2 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yqls
index a01d9945a1..3246851f3f 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yqls
index d9995c0132..d162ca0716 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yqls
index 5c485228a8..241f779233 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yqls
index 679e76e8a7..9534a59466 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yqls
index 1812f117fc..d7cf953a50 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yqls
index ea1208275f..b3d6be1c33 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yqls
index b8f1654265..072f140d31 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yqls
index 26cd669b15..01ac647b56 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yqls
index 6bc3bebb6d..294cfb47eb 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yqls
index f47017b3ef..56436edeb8 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yqls
index e2210338a8..df1a5a5c88 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yqls
index cc34073cf6..89cb675c8e 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yqls
index 0c9357e089..4eb3d22ff2 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yqls
index 066f6ba058..0319ffd1d5 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yqls
index 5a1c0a2978..0a446452f7 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yqls
index 8a27049c3b..19c63fb9c2 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yqls
index bf01c0edec..7bdf9ea7d5 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yqls
index a2498d8c6d..5bb791744b 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yqls
index 2d0136c397..39dfb00fe7 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yqls
index 90c461e142..372e8756e7 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
@@ -19,4 +18,4 @@
 (let world (Write! world res_sink (Key) resKey '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yqls
index e341371bfe..cac888a44f 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import agg_module '"/lib/yql/aggregate.yqls")
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Decode.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Decode.yqls
index 91217d5557..8f709b76e0 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Decode.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Decode.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import aggregate_module '"/lib/yql/aggregate.yqls")
 (import window_module '"/lib/yql/window.yqls")
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yqls b/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yqls
index 431c462e10..73cf3fcf2f 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yqls
@@ -1,7 +1,6 @@
 # program
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import sqr_module '"/lib/yql/sqr.yql")
 (let mySqr (bind sqr_module 'sqr))