Intermediate changes

commit_hash:6fb24458a96f300f8c26c5a2e44bb97b05841ee9

1796 files changed, 6104 insertions, 26921 deletions

diff --git a/yql/essentials/tests/common/test_framework/test_file_common.py b/yql/essentials/tests/common/test_framework/test_file_common.py
index 84bb0cd50d..37d008759f 100644
--- a/yql/essentials/tests/common/test_framework/test_file_common.py
+++ b/yql/essentials/tests/common/test_framework/test_file_common.py
@@ -7,11 +7,13 @@ import cyson
 import yql.essentials.providers.common.proto.gateways_config_pb2 as gateways_config_pb2
 
 from google.protobuf import text_format
-from yql_utils import execute_sql, get_supported_providers, get_tables, get_files, get_http_files, \
+from yql_utils import execute, get_supported_providers, get_tables, get_files, get_http_files, \
     get_pragmas, KSV_ATTR, is_xfail, get_param, YQLExecResult, yql_binary_path, do_custom_error_check
 from yqlrun import YQLRun
 
-from test_utils import get_parameters_json, DATA_PATH, replace_vars
+from test_utils import get_parameters_json, replace_vars
+# FIXME dq usage
+from test_utils import DATA_PATH
 
 
 def get_gateways_config(http_files, yql_http_file_server, force_blocks=False, is_hybrid=False, allow_llvm=True):
@@ -54,10 +56,10 @@ def check_provider(provider, config):
         pytest.skip('%s provider is not supported here' % provider)
 
 
-def get_sql_query(provider, suite, case, config, data_path=None):
+# FIXME make data_path required (dq usage)
+def get_sql_query(provider, suite, case, config, data_path=None, template='.sql'):
     if data_path is None:
         data_path = DATA_PATH
-
     pragmas = get_pragmas(config)
 
     if get_param('TARGET_PLATFORM'):
@@ -67,7 +69,7 @@ def get_sql_query(provider, suite, case, config, data_path=None):
     if get_param('TARGET_PLATFORM') and is_xfail(config):
         pytest.skip('xfail is not supported on non-default target platform')
 
-    program_sql = os.path.join(data_path, suite, '%s.sql' % case)
+    program_sql = os.path.join(data_path, suite, '%s%s' % (case, template))
 
     with codecs.open(program_sql, encoding='utf-8') as program_file_descr:
         sql_query = program_file_descr.read()
@@ -88,12 +90,14 @@ def get_sql_query(provider, suite, case, config, data_path=None):
 
 
 def run_file_no_cache(provider, suite, case, cfg, config, yql_http_file_server,
-                      yqlrun_binary=None, extra_args=[], force_blocks=False, allow_llvm=True, data_path=None):
+                      yqlrun_binary=None, extra_args=[], force_blocks=False, allow_llvm=True, data_path=None,
+                      run_sql=True):
     check_provider(provider, config)
+    # FIXME dq usage
     if data_path is None:
         data_path = DATA_PATH
 
-    sql_query = get_sql_query(provider, suite, case, config, data_path)
+    sql_query = get_sql_query(provider, suite, case, config, data_path, template='.sql' if run_sql else '.yqls')
     sql_query = replace_vars(sql_query, "yqlrun_var")
 
     xfail = is_xfail(config)
@@ -123,7 +127,7 @@ def run_file_no_cache(provider, suite, case, cfg, config, yql_http_file_server,
         udfs_dir=yql_binary_path('yql/essentials/tests/common/test_framework/udfs_deps')
     )
 
-    res, tables_res = execute_sql(
+    res, tables_res = execute(
         yqlrun,
         program=sql_query,
         input_tables=in_tables,
@@ -131,6 +135,7 @@ def run_file_no_cache(provider, suite, case, cfg, config, yql_http_file_server,
         files=files,
         urls=http_files_urls,
         check_error=not xfail,
+        run_sql=run_sql,
         verbose=True,
         parameters=parameters)
 
@@ -156,12 +161,12 @@ def run_file_no_cache(provider, suite, case, cfg, config, yql_http_file_server,
 
 
 def run_file(provider, suite, case, cfg, config, yql_http_file_server, yqlrun_binary=None,
-             extra_args=[], force_blocks=False, allow_llvm=True, data_path=None):
+             extra_args=[], force_blocks=False, allow_llvm=True, data_path=None, run_sql=True):
     if (suite, case, cfg) not in run_file.cache:
         run_file.cache[(suite, case, cfg)] = \
             run_file_no_cache(provider, suite, case, cfg, config, yql_http_file_server,
                               yqlrun_binary, extra_args, force_blocks=force_blocks, allow_llvm=allow_llvm,
-                              data_path=data_path)
+                              data_path=data_path, run_sql=run_sql)
 
     return run_file.cache[(suite, case, cfg)]
 
diff --git a/yql/essentials/tests/common/test_framework/test_utils.py b/yql/essentials/tests/common/test_framework/test_utils.py
index 450b5d3139..1063c6e07b 100644
--- a/yql/essentials/tests/common/test_framework/test_utils.py
+++ b/yql/essentials/tests/common/test_framework/test_utils.py
@@ -9,6 +9,7 @@ from yql_utils import get_param as yql_get_param
 from google.protobuf import text_format
 import yql.essentials.providers.common.proto.gateways_config_pb2 as gateways_config_pb2
 
+# FIXME: remove usage from dq_file/hybrid_file/kqp_yt_file
 DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 try:
     SQLRUN_PATH = yatest.common.binary_path('yql/essentials/tools/sql2yql/sql2yql')
@@ -56,9 +57,8 @@ def recursive_glob(root, begin_template=None, end_template=None):
             yield os.path.relpath(path, root)
 
 
-def pytest_generate_tests_by_template(template, metafunc, data_path=None):
-    if data_path is None:
-        data_path = DATA_PATH
+def pytest_generate_tests_by_template(template, metafunc, data_path):
+    assert data_path is not None
 
     argvalues = []
 
@@ -72,8 +72,7 @@ def pytest_generate_tests_by_template(template, metafunc, data_path=None):
 
 
 def pytest_generate_tests_for_run(metafunc, template='.sql', suites=None, currentPart=0, partsCount=1, data_path=None):
-    if data_path is None:
-        data_path = DATA_PATH
+    assert data_path is not None
     argvalues = []
 
     if not suites:
@@ -108,8 +107,13 @@ def pytest_generate_tests_for_run(metafunc, template='.sql', suites=None, curren
     )
 
 
-def pytest_generate_tests_for_part(metafunc, currentPart, partsCount, data_path=None):
-    return pytest_generate_tests_for_run(metafunc, currentPart=currentPart, partsCount=partsCount, data_path=data_path)
+# FIXME make data_path required (dq usage)
+def pytest_generate_tests_for_part(metafunc, currentPart, partsCount, data_path=None, template='.sql'):
+    if data_path is None:
+        data_path = DATA_PATH
+
+    return pytest_generate_tests_for_run(metafunc, currentPart=currentPart, partsCount=partsCount,
+                                         data_path=data_path, template=template)
 
 
 def get_cfg_file(cfg, case):
@@ -128,6 +132,7 @@ def validate_cfg(result):
             "udf",
             "providers",
             "res",
+            "mount",
             "canonize_peephole",
             "canonize_lineage",
             "peephole_use_blocks",
@@ -143,6 +148,7 @@ def validate_cfg(result):
             ), "Unknown command in .cfg: %s" % (r[0])
 
 
+# FIXME make data_path required (dq usage)
 def get_config(suite, case, cfg, data_path=None):
     if data_path is None:
         data_path = DATA_PATH
@@ -168,6 +174,7 @@ def load_json_file_strip_comments(path):
         return '\n'.join([line for line in file.readlines() if not line.startswith('#')])
 
 
+# FIXME make data_path required (dq usage)
 def get_parameters_files(suite, config, data_path=None):
     if data_path is None:
         data_path = DATA_PATH
@@ -182,7 +189,8 @@ def get_parameters_files(suite, config, data_path=None):
     return result
 
 
-def get_parameters_json(suite, config, data_path=None):
+def get_parameters_json(suite, config, data_path):
+    assert data_path is not None
     parameters_files = get_parameters_files(suite, config, data_path)
     data = {}
     for p in parameters_files:
diff --git a/yql/essentials/tests/common/test_framework/yql_utils.py b/yql/essentials/tests/common/test_framework/yql_utils.py
index dd0be012d5..efc4005f27 100644
--- a/yql/essentials/tests/common/test_framework/yql_utils.py
+++ b/yql/essentials/tests/common/test_framework/yql_utils.py
@@ -964,12 +964,13 @@ def normalize_result(res, sort):
     res = replace_vals(res)
     for r in res:
         for data in r[b'Write']:
-            if sort and b'Data' in data:
+            is_list = (b'Type' in data) and (data[b'Type'][0] == b'ListType')
+            if is_list and sort and b'Data' in data:
                 data[b'Data'] = sorted(data[b'Data'])
             if b'Ref' in data:
                 data[b'Ref'] = []
                 data[b'Truncated'] = True
-            if b'Data' in data and len(data[b'Data']) == 0:
+            if is_list and b'Data' in data and len(data[b'Data']) == 0:
                 del data[b'Data']
     return res
 
diff --git a/yql/essentials/tests/s-expressions/minirun/part0/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part0/canondata/result.json
new file mode 100644
index 0000000000..e706bb19be
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part0/canondata/result.json
@@ -0,0 +1,660 @@
+{
+    "test.test[Aggregation-AggrCount-default.txt-Debug]": [
+        {
+            "checksum": "348ce954da6ea849a3db74e0bd015ab4",
+            "size": 987,
+            "uri": "https://{canondata_backend}/1942671/fe442fb9178873beea37ece387e67a5d541a25b2/resource.tar.gz#test.test_Aggregation-AggrCount-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-AggrCount-default.txt-Results]": [
+        {
+            "checksum": "c6ad07bd410591fa3e941f0cf861a266",
+            "size": 2030,
+            "uri": "https://{canondata_backend}/1942671/fe442fb9178873beea37ece387e67a5d541a25b2/resource.tar.gz#test.test_Aggregation-AggrCount-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverDataIntegralTypes-default.txt-Debug]": [
+        {
+            "checksum": "3e14e8d406c411303507f2cf4de9c93a",
+            "size": 1994,
+            "uri": "https://{canondata_backend}/1936997/5cfcd369a9e94883eed40562597362fea146c091/resource.tar.gz#test.test_Casts-AlterToOverDataIntegralTypes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverDataIntegralTypes-default.txt-Results]": [
+        {
+            "checksum": "c24cb74865544961c84db46a774cccc5",
+            "size": 2915,
+            "uri": "https://{canondata_backend}/1936997/5cfcd369a9e94883eed40562597362fea146c091/resource.tar.gz#test.test_Casts-AlterToOverDataIntegralTypes-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-SafeCastOverVariant-default.txt-Debug]": [
+        {
+            "checksum": "da4c842a6b28abcac67b7facc33a5f56",
+            "size": 832,
+            "uri": "https://{canondata_backend}/1936997/5cfcd369a9e94883eed40562597362fea146c091/resource.tar.gz#test.test_Casts-SafeCastOverVariant-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverVariant-default.txt-Results]": [
+        {
+            "checksum": "da85667a4585e4f0d4be5905f7239e65",
+            "size": 3562,
+            "uri": "https://{canondata_backend}/1936997/5cfcd369a9e94883eed40562597362fea146c091/resource.tar.gz#test.test_Casts-SafeCastOverVariant-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-StrictCastOverTuple-default.txt-Debug]": [
+        {
+            "checksum": "af9865228db0ebcea62a9f6e5bd89032",
+            "size": 803,
+            "uri": "https://{canondata_backend}/1936997/5cfcd369a9e94883eed40562597362fea146c091/resource.tar.gz#test.test_Casts-StrictCastOverTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-StrictCastOverTuple-default.txt-Results]": [
+        {
+            "checksum": "6392e1661628f2b40d1821f2dea492e2",
+            "size": 4349,
+            "uri": "https://{canondata_backend}/1936997/5cfcd369a9e94883eed40562597362fea146c091/resource.tar.gz#test.test_Casts-StrictCastOverTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-ExtractRenameFromFlatMapOverJoin-default.txt-Debug]": [
+        {
+            "checksum": "5859d0703bd1e22d8431b55b5d1a5413",
+            "size": 1209,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-ExtractRenameFromFlatMapOverJoin-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-ExtractRenameFromFlatMapOverJoin-default.txt-Results]": [
+        {
+            "checksum": "471286c5c36d1242559c42e47c331072",
+            "size": 2850,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-ExtractRenameFromFlatMapOverJoin-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasOne2-default.txt-Debug]": [
+        {
+            "checksum": "0090e23be3e25de39049da36c874f152",
+            "size": 2234,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasOne2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasOne2-default.txt-Results]": [
+        {
+            "checksum": "838dfa8f8fe2222319e23a66215dbc24",
+            "size": 25904,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasOne2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemDiffIntTypes-default.txt-Debug]": [
+        {
+            "checksum": "6a1094e276b6d73239fad88b3ff6a973",
+            "size": 2090,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-JoinInMemDiffIntTypes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemDiffIntTypes-default.txt-Results]": [
+        {
+            "checksum": "75bb43e5e77f6d59db19d026ba4e47f9",
+            "size": 20375,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-JoinInMemDiffIntTypes-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemRename-default.txt-Debug]": [
+        {
+            "checksum": "e197f3772235dc15f529a1834e5bee94",
+            "size": 626,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-JoinInMemRename-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemRename-default.txt-Results]": [
+        {
+            "checksum": "fdd30a8eeb58ab6d6b0494effb48bb9e",
+            "size": 1639,
+            "uri": "https://{canondata_backend}/1889210/9f4b906f09e498ba6ae471f1757ad6c2e977b007/resource.tar.gz#test.test_EquiJoin-JoinInMemRename-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByIf-default.txt-Debug]": [
+        {
+            "checksum": "e828d461bd8c86f54368812537bd34e7",
+            "size": 153,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-AutoConvertByIf-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByIf-default.txt-Results]": [
+        {
+            "checksum": "266d3d58384d9117e53b25643a355f09",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-AutoConvertByIf-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverStruct-default.txt-Debug]": [
+        {
+            "checksum": "b5c4f6ea743e985800104474596bcd80",
+            "size": 336,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverStruct-default.txt-Results]": [
+        {
+            "checksum": "bde2e92f20ef7573eadf6a1a93dd9973",
+            "size": 377,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverVariantTuple-default.txt-Debug]": [
+        {
+            "checksum": "09a57350002fc99ca8f8a3d22904e5d3",
+            "size": 382,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverVariantTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverVariantTuple-default.txt-Results]": [
+        {
+            "checksum": "bde2e92f20ef7573eadf6a1a93dd9973",
+            "size": 377,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverVariantTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideStructLiteral-default.txt-Debug]": [
+        {
+            "checksum": "6d0b456ba2ff28d478758a9f11092c8e",
+            "size": 223,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-InsideStructLiteral-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideStructLiteral-default.txt-Results]": [
+        {
+            "checksum": "a2aee12534075828fb589086a114c483",
+            "size": 809,
+            "uri": "https://{canondata_backend}/1936273/767cc549d869c7fc8721256f1f0c9924048d05e8/resource.tar.gz#test.test_ImplictCasts-InsideStructLiteral-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-BitCore-default.txt-Debug]": [
+        {
+            "checksum": "3fab26087d7f76a6ef31ed20f9ec0573",
+            "size": 2021,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-BitCore-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-BitCore-default.txt-Results]": [
+        {
+            "checksum": "35cecef4cdd5e75ae9060c89f7af2f9c",
+            "size": 3977,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-BitCore-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ByteAt-default.txt-Debug]": [
+        {
+            "checksum": "3c52cc6b1f28e6abc90ff3dbca194790",
+            "size": 499,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ByteAt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ByteAt-default.txt-Results]": [
+        {
+            "checksum": "d04caa38a4a951dc51ff1e3b7fa5958d",
+            "size": 1380,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ByteAt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-CompareTuple-default.txt-Debug]": [
+        {
+            "checksum": "42c02780450ed7517d7d573913543f3c",
+            "size": 8737,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-CompareTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-CompareTuple-default.txt-Results]": [
+        {
+            "checksum": "58a4179f2099a8e42bd2fbff10a7d7d1",
+            "size": 29124,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-CompareTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ExtractMembers-default.txt-Debug]": [
+        {
+            "checksum": "354a35c988b8d3d41ad6a4d87b845793",
+            "size": 360,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ExtractMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ExtractMembers-default.txt-Results]": [
+        {
+            "checksum": "e6f9df4d297eb4316d6f39f395cbd660",
+            "size": 2096,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ExtractMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-FilterWithLimit-default.txt-Debug]": [
+        {
+            "checksum": "77c632051d3b4219314faf8e3a0eeac7",
+            "size": 662,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-FilterWithLimit-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-FilterWithLimit-default.txt-Results]": [
+        {
+            "checksum": "20a9333aea6df656bea89a334219de49",
+            "size": 1058,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-FilterWithLimit-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-SkipNullMembers-default.txt-Debug]": [
+        {
+            "checksum": "12f52978e1e69045fe274a997971a4af",
+            "size": 285,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-SkipNullMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-SkipNullMembers-default.txt-Results]": [
+        {
+            "checksum": "4e16b79d899dfd4d72d7a38e5df02e03",
+            "size": 1146,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-SkipNullMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StaticMap-default.txt-Debug]": [
+        {
+            "checksum": "ad5bc89eb5924fa7d1a7fc6257d3ef2f",
+            "size": 258,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-StaticMap-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StaticMap-default.txt-Results]": [
+        {
+            "checksum": "2ec19a36de7d880778bd85a4510fd8bb",
+            "size": 1257,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-StaticMap-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ToDictOptTuple-default.txt-Debug]": [
+        {
+            "checksum": "0e1a9a2d03d0da197c07289644a4edf4",
+            "size": 3685,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ToDictOptTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ToDictOptTuple-default.txt-Results]": [
+        {
+            "checksum": "c9276902f22b0ea7e9474cf0c01778ce",
+            "size": 10210,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ToDictOptTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ToOptional-default.txt-Debug]": [
+        {
+            "checksum": "8ed6c8b9d421e0a5891a3e690ae25453",
+            "size": 706,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ToOptional-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ToOptional-default.txt-Results]": [
+        {
+            "checksum": "7af4b51278da06d4ffb0345b0bed35bd",
+            "size": 1718,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-ToOptional-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Top-default.txt-Debug]": [
+        {
+            "checksum": "8fd129047d9dab4a27584f9cdd2d9e33",
+            "size": 1283,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-Top-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Top-default.txt-Results]": [
+        {
+            "checksum": "c4f62b4cb6edf6e41ef023233bfc1514",
+            "size": 8908,
+            "uri": "https://{canondata_backend}/1871002/8daca6f2a7b63a0a94f426a2b401ad3af26d4985/resource.tar.gz#test.test_InMem-Top-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-MapJoinCore-default.txt-Debug]": [
+        {
+            "checksum": "136337792b264bf9182f021ade5fd776",
+            "size": 2190,
+            "uri": "https://{canondata_backend}/1937424/e13c08fed65f363cbbcce431215b367ee9a42d8c/resource.tar.gz#test.test_Join-MapJoinCore-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-MapJoinCore-default.txt-Results]": [
+        {
+            "checksum": "430a30b31726d29d8fad3e5c9cfa4e82",
+            "size": 12820,
+            "uri": "https://{canondata_backend}/1937424/e13c08fed65f363cbbcce431215b367ee9a42d8c/resource.tar.gz#test.test_Join-MapJoinCore-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Compare_By_Opts-default.txt-Debug]": [
+        {
+            "checksum": "eb542509979a08a5d3e297575fb3c3c1",
+            "size": 1998,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Compare_By_Opts-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Compare_By_Opts-default.txt-Results]": [
+        {
+            "checksum": "bac537c8695ea98ad5bdad03e9f07cb5",
+            "size": 1336,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Compare_By_Opts-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count-default.txt-Debug]": [
+        {
+            "checksum": "71abacccc6c8eb5c46c92d4a5808458c",
+            "size": 673,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Distinct_Count-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count-default.txt-Results]": [
+        {
+            "checksum": "c187891e293159fefd11ffd094848441",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Distinct_Count-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_Opt-default.txt-Debug]": [
+        {
+            "checksum": "8601b8afd6b4e47f9809afe5e7bceb63",
+            "size": 744,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_Opt-default.txt-Results]": [
+        {
+            "checksum": "55d0e8d7bf60080cd8c59b3012ead903",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List_Max_By_Opt-default.txt-Debug]": [
+        {
+            "checksum": "d7ff9ebcfad1e52c68c530ddbfad638b",
+            "size": 1685,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_List_Max_By_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List_Max_By_Opt-default.txt-Results]": [
+        {
+            "checksum": "4c3cb50affd223b128f8fec2a56fc25d",
+            "size": 1102,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_List_Max_By_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List_Min_By_Opt-default.txt-Debug]": [
+        {
+            "checksum": "7412537ba370ac5138c3f943c13a25a2",
+            "size": 1696,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_List_Min_By_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List_Min_By_Opt-default.txt-Results]": [
+        {
+            "checksum": "1438b5ba5092343edc10ff1cd95ef655",
+            "size": 1139,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_List_Min_By_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Sum-default.txt-Debug]": [
+        {
+            "checksum": "f20f874ee266def3835b19e953e61f00",
+            "size": 772,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Sum-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Sum-default.txt-Results]": [
+        {
+            "checksum": "781b9bd26de69a5eab7f452dbdcdc270",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Agg_Sum-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Sqr-default.txt-Debug]": [
+        {
+            "checksum": "bb13dc6af6326fbbaa3b5a434075d75d",
+            "size": 143,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Sqr-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Sqr-default.txt-Results]": [
+        {
+            "checksum": "7c71183e79e5afa1b8a714c74d98cb7b",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1920236/3e58aed13b6b38f5bbc88f895ab020f1b61c4b4a/resource.tar.gz#test.test_Lib-Sqr-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-CoalesceOverNothing-default.txt-Debug]": [
+        {
+            "checksum": "5ed0cbabb4c4b1f5d782221532d6f0db",
+            "size": 246,
+            "uri": "https://{canondata_backend}/1775319/0bf6bca4e7b00695a7263d9f95d017c68369def6/resource.tar.gz#test.test_Optimizers-CoalesceOverNothing-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-CoalesceOverNothing-default.txt-Results]": [
+        {
+            "checksum": "6297faf8ded545547ea7ae55b2f2d9f7",
+            "size": 664,
+            "uri": "https://{canondata_backend}/1775319/0bf6bca4e7b00695a7263d9f95d017c68369def6/resource.tar.gz#test.test_Optimizers-CoalesceOverNothing-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ConsumeOrMoveForwardList-default.txt-Debug]": [
+        {
+            "checksum": "8782a174aa0ce81da6b63f12f7bf1561",
+            "size": 1362,
+            "uri": "https://{canondata_backend}/1942415/dda303d5560de96164c07547a71cc2e97b529694/resource.tar.gz#test.test_Optimizers-ConsumeOrMoveForwardList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ConsumeOrMoveForwardList-default.txt-Results]": [
+        {
+            "checksum": "7d8c1692a3064a47fe10aeac0e866fd4",
+            "size": 2282,
+            "uri": "https://{canondata_backend}/1942415/dda303d5560de96164c07547a71cc2e97b529694/resource.tar.gz#test.test_Optimizers-ConsumeOrMoveForwardList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1ConstMax-default.txt-Debug]": [
+        {
+            "checksum": "6e79688f37080930d3bde6daecbcfe1c",
+            "size": 206,
+            "uri": "https://{canondata_backend}/1784826/4b801372850f54ca77db06af932b96509ec9846f/resource.tar.gz#test.test_Optimizers-Fold1ConstMax-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1ConstMax-default.txt-Results]": [
+        {
+            "checksum": "424004a8c197c2ab08ecff3028213629",
+            "size": 337,
+            "uri": "https://{canondata_backend}/1784826/4b801372850f54ca77db06af932b96509ec9846f/resource.tar.gz#test.test_Optimizers-Fold1ConstMax-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1EmptyTuple-default.txt-Debug]": [
+        {
+            "checksum": "3bd3672c51a84bc9b52ee82c28df12b7",
+            "size": 123,
+            "uri": "https://{canondata_backend}/1784826/4b801372850f54ca77db06af932b96509ec9846f/resource.tar.gz#test.test_Optimizers-Fold1EmptyTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1EmptyTuple-default.txt-Results]": [
+        {
+            "checksum": "626b22246d29e7119c71437a850d927e",
+            "size": 431,
+            "uri": "https://{canondata_backend}/1784826/4b801372850f54ca77db06af932b96509ec9846f/resource.tar.gz#test.test_Optimizers-Fold1EmptyTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1OverOptional-default.txt-Debug]": [
+        {
+            "checksum": "c9cce6d6059f8998a2241e9d1f94b173",
+            "size": 152,
+            "uri": "https://{canondata_backend}/1784826/4b801372850f54ca77db06af932b96509ec9846f/resource.tar.gz#test.test_Optimizers-Fold1OverOptional-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1OverOptional-default.txt-Results]": [
+        {
+            "checksum": "a1b8741cb50618383b3332c3f33e9ca8",
+            "size": 338,
+            "uri": "https://{canondata_backend}/1784826/4b801372850f54ca77db06af932b96509ec9846f/resource.tar.gz#test.test_Optimizers-Fold1OverOptional-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatmapsWithInnerVisit-default.txt-Debug]": [
+        {
+            "checksum": "7de8f5dff2acf4e8097e18e14f22bf1f",
+            "size": 1520,
+            "uri": "https://{canondata_backend}/1937492/8941ce002fc59a16634bdbab68109c87ae6290f7/resource.tar.gz#test.test_Optimizers-FuseFlatmapsWithInnerVisit-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatmapsWithInnerVisit-default.txt-Results]": [
+        {
+            "checksum": "1bc859b7e31bb0d0e0fde5b95fd880d4",
+            "size": 2872,
+            "uri": "https://{canondata_backend}/1937492/8941ce002fc59a16634bdbab68109c87ae6290f7/resource.tar.gz#test.test_Optimizers-FuseFlatmapsWithInnerVisit-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MapNextWithUnusedNext-default.txt-Debug]": [
+        {
+            "checksum": "3d477ff86757a6540939750edeadeefc",
+            "size": 251,
+            "uri": "https://{canondata_backend}/1775059/859a07feef8e40497c12c615a8aa01c1439f1d8d/resource.tar.gz#test.test_Optimizers-MapNextWithUnusedNext-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MapNextWithUnusedNext-default.txt-Results]": [
+        {
+            "checksum": "070faf1e84d06645430e078755482894",
+            "size": 407,
+            "uri": "https://{canondata_backend}/1775059/859a07feef8e40497c12c615a8aa01c1439f1d8d/resource.tar.gz#test.test_Optimizers-MapNextWithUnusedNext-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverExtend-default.txt-Debug]": [
+        {
+            "checksum": "76333be4dfb2c9d2aece0f4d25053fc2",
+            "size": 504,
+            "uri": "https://{canondata_backend}/1775059/859a07feef8e40497c12c615a8aa01c1439f1d8d/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverExtend-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverExtend-default.txt-Results]": [
+        {
+            "checksum": "d26e7be91bdee4db7fd087c41cb7ca8b",
+            "size": 879,
+            "uri": "https://{canondata_backend}/1775059/859a07feef8e40497c12c615a8aa01c1439f1d8d/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverExtend-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Pure-PureNonList-default.txt-Debug]": [
+        {
+            "checksum": "945b27d67b88cbf719544cd33ed18e31",
+            "size": 124,
+            "uri": "https://{canondata_backend}/1597364/dfa07448335607cfc36c902b927d09d6420389b3/resource.tar.gz#test.test_Pure-PureNonList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-PureNonList-default.txt-Results]": [
+        {
+            "checksum": "8df5f6b388bfdc1b15ce906b7cff0ab8",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1597364/dfa07448335607cfc36c902b927d09d6420389b3/resource.tar.gz#test.test_Pure-PureNonList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Pure-PureUdf--Debug]": [
+        {
+            "checksum": "7b91edf62d0fe30db89a1ae6bc9778fb",
+            "size": 304,
+            "uri": "https://{canondata_backend}/1597364/dfa07448335607cfc36c902b927d09d6420389b3/resource.tar.gz#test.test_Pure-PureUdf--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-PureUdf--Results]": [
+        {
+            "checksum": "5ad274bdd4b0c8e73d0fe47aedb71505",
+            "size": 211,
+            "uri": "https://{canondata_backend}/1597364/dfa07448335607cfc36c902b927d09d6420389b3/resource.tar.gz#test.test_Pure-PureUdf--Results_/results.txt"
+        }
+    ],
+    "test.test[Result-ParseType-default.txt-Debug]": [
+        {
+            "checksum": "17e35092168a9449a6c3f11ef1dee3f6",
+            "size": 222,
+            "uri": "https://{canondata_backend}/1773845/47d05aaff5652f090f0ac883c382597c1403fa9c/resource.tar.gz#test.test_Result-ParseType-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-ParseType-default.txt-Results]": [
+        {
+            "checksum": "79fbf2e450b506123f665b824de350f4",
+            "size": 188,
+            "uri": "https://{canondata_backend}/1773845/47d05aaff5652f090f0ac883c382597c1403fa9c/resource.tar.gz#test.test_Result-ParseType-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-TypeStructs-default.txt-Debug]": [
+        {
+            "checksum": "d98dcff8a87b0a7e2cd67342731121c6",
+            "size": 698,
+            "uri": "https://{canondata_backend}/1773845/47d05aaff5652f090f0ac883c382597c1403fa9c/resource.tar.gz#test.test_Result-TypeStructs-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-TypeStructs-default.txt-Results]": [
+        {
+            "checksum": "00c4c32f8f0e073636c962cdba77e3c8",
+            "size": 537,
+            "uri": "https://{canondata_backend}/1773845/47d05aaff5652f090f0ac883c382597c1403fa9c/resource.tar.gz#test.test_Result-TypeStructs-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-CachedUdfType-default.txt-Debug]": [
+        {
+            "checksum": "cbcc98274bcf92e8e29da94030809c6b",
+            "size": 304,
+            "uri": "https://{canondata_backend}/1689644/1ff2092d4f0beacca8acd85bad021a2f943d1a32/resource.tar.gz#test.test_Udf-CachedUdfType-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-CachedUdfType-default.txt-Results]": [
+        {
+            "checksum": "ae1cad92bc95b11411f6001e23b7787f",
+            "size": 211,
+            "uri": "https://{canondata_backend}/1689644/1ff2092d4f0beacca8acd85bad021a2f943d1a32/resource.tar.gz#test.test_Udf-CachedUdfType-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-CallableAsLambda--Debug]": [
+        {
+            "checksum": "01eb39fb0c44b6213fa32e844dd988f7",
+            "size": 388,
+            "uri": "https://{canondata_backend}/1689644/1ff2092d4f0beacca8acd85bad021a2f943d1a32/resource.tar.gz#test.test_Udf-CallableAsLambda--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-CallableAsLambda--Results]": [
+        {
+            "checksum": "7499114caaa924c8255b21473e397712",
+            "size": 358,
+            "uri": "https://{canondata_backend}/1689644/1ff2092d4f0beacca8acd85bad021a2f943d1a32/resource.tar.gz#test.test_Udf-CallableAsLambda--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonCallableAsArg--Debug]": [
+        {
+            "checksum": "cdb69ab1ced7ca1347084ee992071cc2",
+            "size": 516,
+            "uri": "https://{canondata_backend}/1946324/b29ab2acc30ef11f39db667fad4c20dee6bc4217/resource.tar.gz#test.test_Udf-PythonCallableAsArg--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonCallableAsArg--Results]": [
+        {
+            "checksum": "46636753497021dfa7ac3ea5454fdefe",
+            "size": 215,
+            "uri": "https://{canondata_backend}/1946324/b29ab2acc30ef11f39db667fad4c20dee6bc4217/resource.tar.gz#test.test_Udf-PythonCallableAsArg--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonGenerator--Debug]": [
+        {
+            "checksum": "be3ebf782e8f59950c8bece567cf0aef",
+            "size": 324,
+            "uri": "https://{canondata_backend}/1946324/b29ab2acc30ef11f39db667fad4c20dee6bc4217/resource.tar.gz#test.test_Udf-PythonGenerator--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonGenerator--Results]": [
+        {
+            "checksum": "449d62fa0820fe5b2ae08079521c833b",
+            "size": 385,
+            "uri": "https://{canondata_backend}/1946324/b29ab2acc30ef11f39db667fad4c20dee6bc4217/resource.tar.gz#test.test_Udf-PythonGenerator--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonSum--Debug]": [
+        {
+            "checksum": "46a06fa8427fdaafe8c37ce503785df3",
+            "size": 307,
+            "uri": "https://{canondata_backend}/1946324/b29ab2acc30ef11f39db667fad4c20dee6bc4217/resource.tar.gz#test.test_Udf-PythonSum--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonSum--Results]": [
+        {
+            "checksum": "037b1e62ff6fd310f8bd2a9091fd8b2c",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1946324/b29ab2acc30ef11f39db667fad4c20dee6bc4217/resource.tar.gz#test.test_Udf-PythonSum--Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part0/test.py b/yql/essentials/tests/s-expressions/minirun/part0/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part0/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part0/ya.make b/yql/essentials/tests/s-expressions/minirun/part0/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part0/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part1/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part1/canondata/result.json
new file mode 100644
index 0000000000..f1b81dcdc3
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part1/canondata/result.json
@@ -0,0 +1,618 @@
+{
+    "test.test[Aggregation-InMemAggregateZeroOpt-default.txt-Debug]": [
+        {
+            "checksum": "8e3d302b8598cfcc3e43a66f336ee40f",
+            "size": 655,
+            "uri": "https://{canondata_backend}/1597364/2bcf682be46fd123dd8441bdc3a8569ce29c838a/resource.tar.gz#test.test_Aggregation-InMemAggregateZeroOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-InMemAggregateZeroOpt-default.txt-Results]": [
+        {
+            "checksum": "c5ee4e2565a943034859f1ec55ab07c6",
+            "size": 1093,
+            "uri": "https://{canondata_backend}/1597364/2bcf682be46fd123dd8441bdc3a8569ce29c838a/resource.tar.gz#test.test_Aggregation-InMemAggregateZeroOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-StrictCastOverStruct-default.txt-Debug]": [
+        {
+            "checksum": "2ba7618bbf70bc6e62ce5fc113352f77",
+            "size": 586,
+            "uri": "https://{canondata_backend}/1597364/81ce83bb4966d7426a9fa84ab77a6c2fa8a05166/resource.tar.gz#test.test_Casts-StrictCastOverStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-StrictCastOverStruct-default.txt-Results]": [
+        {
+            "checksum": "62885a3264adeaa68b32bfeeb7569ad1",
+            "size": 2514,
+            "uri": "https://{canondata_backend}/1597364/81ce83bb4966d7426a9fa84ab77a6c2fa8a05166/resource.tar.gz#test.test_Casts-StrictCastOverStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-TryRemoveAllOptionals-default.txt-Debug]": [
+        {
+            "checksum": "45aae5387413cd4e31ab1dd35081a907",
+            "size": 1192,
+            "uri": "https://{canondata_backend}/1597364/81ce83bb4966d7426a9fa84ab77a6c2fa8a05166/resource.tar.gz#test.test_Casts-TryRemoveAllOptionals-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-TryRemoveAllOptionals-default.txt-Results]": [
+        {
+            "checksum": "35c7f43ec2451310880e2b30a7a16edc",
+            "size": 9425,
+            "uri": "https://{canondata_backend}/1597364/81ce83bb4966d7426a9fa84ab77a6c2fa8a05166/resource.tar.gz#test.test_Casts-TryRemoveAllOptionals-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-TryRemoveAllOptionals2-default.txt-Debug]": [
+        {
+            "checksum": "f00373f666b1e40ead215cfaa44fa4bb",
+            "size": 651,
+            "uri": "https://{canondata_backend}/1597364/81ce83bb4966d7426a9fa84ab77a6c2fa8a05166/resource.tar.gz#test.test_Casts-TryRemoveAllOptionals2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-TryRemoveAllOptionals2-default.txt-Results]": [
+        {
+            "checksum": "8b6dc3f1d6c3a4e75f63ba2f11e3b1be",
+            "size": 3791,
+            "uri": "https://{canondata_backend}/1597364/81ce83bb4966d7426a9fa84ab77a6c2fa8a05166/resource.tar.gz#test.test_Casts-TryRemoveAllOptionals2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem3-default.txt-Debug]": [
+        {
+            "checksum": "e4274547415f2e44ccb19513f1a8f79e",
+            "size": 4398,
+            "uri": "https://{canondata_backend}/1936947/62171abf656db12ca1b69b4d811bd0059b3611ba/resource.tar.gz#test.test_EquiJoin-JoinInMem3-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem3-default.txt-Results]": [
+        {
+            "checksum": "be41cc809f4ca33e5d4f4d61591e1540",
+            "size": 117937,
+            "uri": "https://{canondata_backend}/1936947/62171abf656db12ca1b69b4d811bd0059b3611ba/resource.tar.gz#test.test_EquiJoin-JoinInMem3-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoinAny-InMemAnyAny-default.txt-Debug]": [
+        {
+            "checksum": "feb19d6e9257b37ba33d183cd38ddbb7",
+            "size": 2655,
+            "uri": "https://{canondata_backend}/1775319/ddee4ad6702eb67ca39bb992c078f3c600ce95d2/resource.tar.gz#test.test_EquiJoinAny-InMemAnyAny-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoinAny-InMemAnyAny-default.txt-Results]": [
+        {
+            "checksum": "d59a7ea35cd54f221f01f9d401900bee",
+            "size": 15978,
+            "uri": "https://{canondata_backend}/1775319/ddee4ad6702eb67ca39bb992c078f3c600ce95d2/resource.tar.gz#test.test_EquiJoinAny-InMemAnyAny-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByMinusContent-default.txt-Debug]": [
+        {
+            "checksum": "feb33bef94e42b4fa952479e100c1ad1",
+            "size": 813,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-AutoConvertByMinusContent-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByMinusContent-default.txt-Results]": [
+        {
+            "checksum": "aff8ac146956fe58f745b4beabc73d31",
+            "size": 2090,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-AutoConvertByMinusContent-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertCoalesceSrtucts-default.txt-Debug]": [
+        {
+            "checksum": "5d7c1ff4f7cab4b39a9cf2cf032496dc",
+            "size": 149,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-AutoConvertCoalesceSrtucts-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertCoalesceSrtucts-default.txt-Results]": [
+        {
+            "checksum": "b6a462a9d7e7f1743984cca2b3ff1f2f",
+            "size": 667,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-AutoConvertCoalesceSrtucts-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverDataIntegralTypes-default.txt-Debug]": [
+        {
+            "checksum": "511778d83bf9cf223a6a4dd436ddf685",
+            "size": 972,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverDataIntegralTypes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverDataIntegralTypes-default.txt-Results]": [
+        {
+            "checksum": "57ed845daaf399fc2fc3c1099d96ebb7",
+            "size": 1708,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverDataIntegralTypes-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverDict-default.txt-Debug]": [
+        {
+            "checksum": "294e6661d2a32ce8ed55abf7476d6493",
+            "size": 304,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverDict-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverDict-default.txt-Results]": [
+        {
+            "checksum": "bde2e92f20ef7573eadf6a1a93dd9973",
+            "size": 377,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverDict-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverList-default.txt-Debug]": [
+        {
+            "checksum": "271bfb5b91d06164caf8617cfaf9582c",
+            "size": 287,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverList-default.txt-Results]": [
+        {
+            "checksum": "bde2e92f20ef7573eadf6a1a93dd9973",
+            "size": 377,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideList-default.txt-Debug]": [
+        {
+            "checksum": "0e27c0a9225b59f3c8b59eb92e52a5cc",
+            "size": 163,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-InsideList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideList-default.txt-Results]": [
+        {
+            "checksum": "e61c5538c4507ef978ea38772b2280fc",
+            "size": 551,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-InsideList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideVariant-default.txt-Debug]": [
+        {
+            "checksum": "2350278201200873bf565d22c7338fd5",
+            "size": 1691,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-InsideVariant-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideVariant-default.txt-Results]": [
+        {
+            "checksum": "86247de11438fb1f79352b800a4692c0",
+            "size": 4959,
+            "uri": "https://{canondata_backend}/1031349/b6049faba257d4cdd36d3b2b943cf86baa69f286/resource.tar.gz#test.test_ImplictCasts-InsideVariant-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-FlatMapFiltersSortedList-default.txt-Debug]": [
+        {
+            "checksum": "5d85e12932de4e33d9fcb1c17a0d32fc",
+            "size": 512,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-FlatMapFiltersSortedList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-FlatMapFiltersSortedList-default.txt-Results]": [
+        {
+            "checksum": "0a24411e081f1844b03e85935583b58c",
+            "size": 533,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-FlatMapFiltersSortedList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-FoldMap-default.txt-Debug]": [
+        {
+            "checksum": "9650c60e2059dddfefa11ff743ac652a",
+            "size": 502,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-FoldMap-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-FoldMap-default.txt-Results]": [
+        {
+            "checksum": "2c540a5c41be99b332b8dab463c4bebd",
+            "size": 1557,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-FoldMap-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Merge-default.txt-Debug]": [
+        {
+            "checksum": "3405b7b2495d4ba017a21484e27e6cb0",
+            "size": 1091,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-Merge-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Merge-default.txt-Results]": [
+        {
+            "checksum": "156af5ea2b0f6dc5ab901704b40af318",
+            "size": 5700,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-Merge-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-NthOpt-default.txt-Debug]": [
+        {
+            "checksum": "a176b72f52fa6861a290d25d7c7ee4d3",
+            "size": 482,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-NthOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-NthOpt-default.txt-Results]": [
+        {
+            "checksum": "ac4176372c113532ce007d91bf7161a5",
+            "size": 470,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-NthOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-SortOpt-default.txt-Debug]": [
+        {
+            "checksum": "9fbb32a041b37041134d0c6ac117eb19",
+            "size": 431,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-SortOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-SortOpt-default.txt-Results]": [
+        {
+            "checksum": "826c279747cdba7e3dad26dd8be2b4aa",
+            "size": 1071,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-SortOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamFlatMap-default.txt-Debug]": [
+        {
+            "checksum": "22e931ba877816f7d86fa8120295284d",
+            "size": 806,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-StreamFlatMap-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamFlatMap-default.txt-Results]": [
+        {
+            "checksum": "498cc9e7bdf36befab6e9a04fc99eaa3",
+            "size": 1910,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-StreamFlatMap-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-TimezoneIdName-default.txt-Debug]": [
+        {
+            "checksum": "edc46a4258aa20213079311a704039c1",
+            "size": 166,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-TimezoneIdName-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-TimezoneIdName-default.txt-Results]": [
+        {
+            "checksum": "64ea9b021f092e0c5740e5110bfa041a",
+            "size": 349,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-TimezoneIdName-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ToBytes-default.txt-Debug]": [
+        {
+            "checksum": "3de5949e356b72b32126d81e82f9af8f",
+            "size": 7490,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-ToBytes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ToBytes-default.txt-Results]": [
+        {
+            "checksum": "b165b883b69e36d48edeaf65efdbe984",
+            "size": 22898,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-ToBytes-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ToDict-default.txt-Debug]": [
+        {
+            "checksum": "07116b8b6ef129ed705c34164f4f634d",
+            "size": 2447,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-ToDict-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ToDict-default.txt-Results]": [
+        {
+            "checksum": "25200a6c3bbf17909a005361e4cbd77a",
+            "size": 5118,
+            "uri": "https://{canondata_backend}/1936842/a6f11bff17dc55e100673be2d9ae0d94460a6a8c/resource.tar.gz#test.test_InMem-ToDict-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-EmptyLeftJoin-default.txt-Debug]": [
+        {
+            "checksum": "523f1588ca2bfb6f30cedbf10817ae6b",
+            "size": 527,
+            "uri": "https://{canondata_backend}/1130705/3227cce0fc38e2985a21517caea75140d9008755/resource.tar.gz#test.test_Join-EmptyLeftJoin-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-EmptyLeftJoin-default.txt-Results]": [
+        {
+            "checksum": "6288cd522443e0c2b30bcbe3f10d3e7b",
+            "size": 1771,
+            "uri": "https://{canondata_backend}/1130705/3227cce0fc38e2985a21517caea75140d9008755/resource.tar.gz#test.test_Join-EmptyLeftJoin-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-MapJoinCoreOnStrings-default.txt-Debug]": [
+        {
+            "checksum": "838725c83a0ca095dfbcc175ae572000",
+            "size": 2318,
+            "uri": "https://{canondata_backend}/1130705/3227cce0fc38e2985a21517caea75140d9008755/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-MapJoinCoreOnStrings-default.txt-Results]": [
+        {
+            "checksum": "2beda402113f5fd50b7ef8c03e559935",
+            "size": 13477,
+            "uri": "https://{canondata_backend}/1130705/3227cce0fc38e2985a21517caea75140d9008755/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Avg-default.txt-Debug]": [
+        {
+            "checksum": "e41ec0c2a6d6381331f30630ba800c1d",
+            "size": 921,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Avg-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Avg-default.txt-Results]": [
+        {
+            "checksum": "91b62a829395f54e8e7fef2a7f1f803d",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Avg-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Some_Opt-default.txt-Debug]": [
+        {
+            "checksum": "f7eb07941d5e38ba7b31d10d106ec877",
+            "size": 670,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Distinct_Some_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Some_Opt-default.txt-Results]": [
+        {
+            "checksum": "2530d160761f4a55cad8b485a2163583",
+            "size": 1409,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Distinct_Some_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Max-default.txt-Debug]": [
+        {
+            "checksum": "62cc0cf61edd5c239504a8c8a776dce5",
+            "size": 714,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Max-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Max-default.txt-Results]": [
+        {
+            "checksum": "3affccca1b12590589082884e01f1cee",
+            "size": 1163,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Max-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Max_By-default.txt-Debug]": [
+        {
+            "checksum": "410dbf6a8ae3f91e10952e2a69294246",
+            "size": 900,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Max_By-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Max_By-default.txt-Results]": [
+        {
+            "checksum": "eabb34dd822bd20c5796843aab80ebfa",
+            "size": 857,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Max_By-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Min-default.txt-Debug]": [
+        {
+            "checksum": "17475fa60f85fc0c8180a43ebe3a204d",
+            "size": 714,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Min-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Min-default.txt-Results]": [
+        {
+            "checksum": "f0157b60a5793373734a6a225702985d",
+            "size": 1163,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Min-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Min_Opt-default.txt-Debug]": [
+        {
+            "checksum": "1783757cf33e94ce89f62e15c56d9a31",
+            "size": 761,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Min_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Min_Opt-default.txt-Results]": [
+        {
+            "checksum": "9b75f62b1135e975c2e6c6c345da327e",
+            "size": 1408,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Min_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Sum_If-default.txt-Debug]": [
+        {
+            "checksum": "f021a8cd5657d308697c655b819f3e1d",
+            "size": 1131,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Sum_If-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Sum_If-default.txt-Results]": [
+        {
+            "checksum": "6dcf332d203d36b0ddd1d578173bd407",
+            "size": 1410,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Agg_Sum_If-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Decode-default.txt-Debug]": [
+        {
+            "checksum": "91eb549142ab9467b805791b4ad3466d",
+            "size": 1019,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Decode-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Decode-default.txt-Results]": [
+        {
+            "checksum": "e3f843a019473a68d9d97e0c9b14e33b",
+            "size": 2010,
+            "uri": "https://{canondata_backend}/1920236/9cf7ab0c138aea9052533cb379b54a91b72b9201/resource.tar.gz#test.test_Lib-Decode-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-CoalesceWithBoolOverAnd-default.txt-Debug]": [
+        {
+            "checksum": "2867480d23b79419d730c0a0616e9e7f",
+            "size": 257,
+            "uri": "https://{canondata_backend}/1942415/eebbef9cf2ee8abf76f588f07d94daf451e6731a/resource.tar.gz#test.test_Optimizers-CoalesceWithBoolOverAnd-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-CoalesceWithBoolOverAnd-default.txt-Results]": [
+        {
+            "checksum": "c9d1de383b72fda4093e207a50f76887",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1942415/eebbef9cf2ee8abf76f588f07d94daf451e6731a/resource.tar.gz#test.test_Optimizers-CoalesceWithBoolOverAnd-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-DoubleSort-default.txt-Debug]": [
+        {
+            "checksum": "03a2e9bc660b2f2ce49beb9e285f6554",
+            "size": 219,
+            "uri": "https://{canondata_backend}/1942415/eebbef9cf2ee8abf76f588f07d94daf451e6731a/resource.tar.gz#test.test_Optimizers-DoubleSort-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-DoubleSort-default.txt-Results]": [
+        {
+            "checksum": "91a753e2598fd470d7cc6611dcd261d2",
+            "size": 383,
+            "uri": "https://{canondata_backend}/1942415/eebbef9cf2ee8abf76f588f07d94daf451e6731a/resource.tar.gz#test.test_Optimizers-DoubleSort-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-EquivNestedLambdaOuterSameLevel-default.txt-Debug]": [
+        {
+            "checksum": "fda32b39d057f86b5d9075891ce4ab6e",
+            "size": 343,
+            "uri": "https://{canondata_backend}/1942415/eebbef9cf2ee8abf76f588f07d94daf451e6731a/resource.tar.gz#test.test_Optimizers-EquivNestedLambdaOuterSameLevel-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-EquivNestedLambdaOuterSameLevel-default.txt-Results]": [
+        {
+            "checksum": "fad3f94032b86a36636766c06077c172",
+            "size": 923,
+            "uri": "https://{canondata_backend}/1942415/eebbef9cf2ee8abf76f588f07d94daf451e6731a/resource.tar.gz#test.test_Optimizers-EquivNestedLambdaOuterSameLevel-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ExtractPredicateFromFlatmapOverListIf-default.txt-Debug]": [
+        {
+            "checksum": "5e328120c9dcb2b85c750a61a0041b56",
+            "size": 540,
+            "uri": "https://{canondata_backend}/1942278/856ec05e0552b2b0562275a3565f416725a42820/resource.tar.gz#test.test_Optimizers-ExtractPredicateFromFlatmapOverListIf-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ExtractPredicateFromFlatmapOverListIf-default.txt-Results]": [
+        {
+            "checksum": "6cf008c0c7553de324396daef358a071",
+            "size": 5676,
+            "uri": "https://{canondata_backend}/1942278/856ec05e0552b2b0562275a3565f416725a42820/resource.tar.gz#test.test_Optimizers-ExtractPredicateFromFlatmapOverListIf-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1OneItemStruct-default.txt-Debug]": [
+        {
+            "checksum": "9d742a222f48b9a4fb6cbf33340a146f",
+            "size": 292,
+            "uri": "https://{canondata_backend}/1781765/5c369b30a820f6ee50c14a37e597552badb8e6cf/resource.tar.gz#test.test_Optimizers-Fold1OneItemStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1OneItemStruct-default.txt-Results]": [
+        {
+            "checksum": "1d2b16511b74f4513a22bcad5b7f1792",
+            "size": 666,
+            "uri": "https://{canondata_backend}/1781765/5c369b30a820f6ee50c14a37e597552badb8e6cf/resource.tar.gz#test.test_Optimizers-Fold1OneItemStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FoldOneItemStruct-default.txt-Debug]": [
+        {
+            "checksum": "5ace175106c4421312777a35fe222453",
+            "size": 251,
+            "uri": "https://{canondata_backend}/1781765/5c369b30a820f6ee50c14a37e597552badb8e6cf/resource.tar.gz#test.test_Optimizers-FoldOneItemStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FoldOneItemStruct-default.txt-Results]": [
+        {
+            "checksum": "bbdcd789f923716356b3ee1821550104",
+            "size": 498,
+            "uri": "https://{canondata_backend}/1781765/5c369b30a820f6ee50c14a37e597552badb8e6cf/resource.tar.gz#test.test_Optimizers-FoldOneItemStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FoldOneItemTuple-default.txt-Debug]": [
+        {
+            "checksum": "76e6c6a19c119957718b9fa18476a7b0",
+            "size": 225,
+            "uri": "https://{canondata_backend}/1781765/5c369b30a820f6ee50c14a37e597552badb8e6cf/resource.tar.gz#test.test_Optimizers-FoldOneItemTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FoldOneItemTuple-default.txt-Results]": [
+        {
+            "checksum": "261b19ada33049d68492dfab80d69329",
+            "size": 396,
+            "uri": "https://{canondata_backend}/1781765/5c369b30a820f6ee50c14a37e597552badb8e6cf/resource.tar.gz#test.test_Optimizers-FoldOneItemTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSkip-default.txt-Debug]": [
+        {
+            "checksum": "8f67a7dd7ca70ff488b74662d73cea75",
+            "size": 150,
+            "uri": "https://{canondata_backend}/1775059/60d3783e71327a4ad8c7c214c319a056d03c678e/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSkip-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSkip-default.txt-Results]": [
+        {
+            "checksum": "4095d45be79acbf1044fdbcfaacb2302",
+            "size": 660,
+            "uri": "https://{canondata_backend}/1775059/60d3783e71327a4ad8c7c214c319a056d03c678e/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSkip-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ReverseAfterSort-default.txt-Debug]": [
+        {
+            "checksum": "409f0c02310d84c0a0894705fb5b9126",
+            "size": 451,
+            "uri": "https://{canondata_backend}/1775059/60d3783e71327a4ad8c7c214c319a056d03c678e/resource.tar.gz#test.test_Optimizers-ReverseAfterSort-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ReverseAfterSort-default.txt-Results]": [
+        {
+            "checksum": "037daa6e4730115dce34a1daa0aafce1",
+            "size": 1073,
+            "uri": "https://{canondata_backend}/1775059/60d3783e71327a4ad8c7c214c319a056d03c678e/resource.tar.gz#test.test_Optimizers-ReverseAfterSort-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-SortAfterReverse-default.txt-Debug]": [
+        {
+            "checksum": "91971376d8c511dac891d9c1aea6abc4",
+            "size": 219,
+            "uri": "https://{canondata_backend}/1937424/3fa0838c58e0529381593f7f5e7f1aa2df931e99/resource.tar.gz#test.test_Optimizers-SortAfterReverse-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-SortAfterReverse-default.txt-Results]": [
+        {
+            "checksum": "91a753e2598fd470d7cc6611dcd261d2",
+            "size": 383,
+            "uri": "https://{canondata_backend}/1937424/3fa0838c58e0529381593f7f5e7f1aa2df931e99/resource.tar.gz#test.test_Optimizers-SortAfterReverse-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Visit1-default.txt-Debug]": [
+        {
+            "checksum": "57cb362dd360f03c40c3ba8db1e84a95",
+            "size": 303,
+            "uri": "https://{canondata_backend}/1937424/3fa0838c58e0529381593f7f5e7f1aa2df931e99/resource.tar.gz#test.test_Optimizers-Visit1-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Visit1-default.txt-Results]": [
+        {
+            "checksum": "8be65ce33e1aaaa8103a1c454f436161",
+            "size": 708,
+            "uri": "https://{canondata_backend}/1937424/3fa0838c58e0529381593f7f5e7f1aa2df931e99/resource.tar.gz#test.test_Optimizers-Visit1-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-Resource-default.txt-Debug]": [
+        {
+            "checksum": "1879e2fd09f62180fc43c9b463356e2c",
+            "size": 208,
+            "uri": "https://{canondata_backend}/1942415/054c1d7fd20b3e982e839abb8377408e17c953e1/resource.tar.gz#test.test_Result-Resource-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-Resource-default.txt-Results]": [
+        {
+            "checksum": "d0792df44311fc0d07e513f31b6d9f41",
+            "size": 587,
+            "uri": "https://{canondata_backend}/1942415/054c1d7fd20b3e982e839abb8377408e17c953e1/resource.tar.gz#test.test_Result-Resource-default.txt-Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part1/test.py b/yql/essentials/tests/s-expressions/minirun/part1/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part1/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part1/ya.make b/yql/essentials/tests/s-expressions/minirun/part1/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part1/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part2/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part2/canondata/result.json
new file mode 100644
index 0000000000..d12c6b84e9
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part2/canondata/result.json
@@ -0,0 +1,478 @@
+{
+    "test.test[Builtins-DivePrefixMembers-default.txt-Debug]": [
+        {
+            "checksum": "f42d528d2da99d2b2ea49c0e047dde7c",
+            "size": 688,
+            "uri": "https://{canondata_backend}/1777230/91c005adfc44ce9a8b38ed55006e56a37435e80f/resource.tar.gz#test.test_Builtins-DivePrefixMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Builtins-DivePrefixMembers-default.txt-Results]": [
+        {
+            "checksum": "3b1615e85ca2b1dde924bec42d7c63a1",
+            "size": 4398,
+            "uri": "https://{canondata_backend}/1777230/91c005adfc44ce9a8b38ed55006e56a37435e80f/resource.tar.gz#test.test_Builtins-DivePrefixMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-HasNullFalse-default.txt-Debug]": [
+        {
+            "checksum": "98699ba3540a4463ea8a696196176bf8",
+            "size": 716,
+            "uri": "https://{canondata_backend}/1924537/579a960ba1b66b847e55e1ed318e79b78828333e/resource.tar.gz#test.test_Casts-HasNullFalse-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-HasNullFalse-default.txt-Results]": [
+        {
+            "checksum": "bb5b8fc01886d51a73c96d5177218aa9",
+            "size": 2215,
+            "uri": "https://{canondata_backend}/1924537/579a960ba1b66b847e55e1ed318e79b78828333e/resource.tar.gz#test.test_Casts-HasNullFalse-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem-default.txt-Debug]": [
+        {
+            "checksum": "434832b49a1987d8fbca76fe75132fcd",
+            "size": 1958,
+            "uri": "https://{canondata_backend}/1923547/349cf3f30db41de3651666444aca39a55be49a59/resource.tar.gz#test.test_EquiJoin-JoinInMem-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem-default.txt-Results]": [
+        {
+            "checksum": "9eba1266b2a59750d5a70287636dbb6e",
+            "size": 20776,
+            "uri": "https://{canondata_backend}/1923547/349cf3f30db41de3651666444aca39a55be49a59/resource.tar.gz#test.test_EquiJoin-JoinInMem-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[File-FilePathFromRoot-default.txt-Debug]": [
+        {
+            "checksum": "201cff54baa3514b381a62835abf7dcc",
+            "size": 129,
+            "uri": "https://{canondata_backend}/1871102/aff404a698ac51e73b2a2f886656c7a05d645a23/resource.tar.gz#test.test_File-FilePathFromRoot-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-FilePathFromRoot-default.txt-Results]": [
+        {
+            "checksum": "ecbcc1d6719333bb4260332482b8841c",
+            "size": 110,
+            "uri": "https://{canondata_backend}/1871102/aff404a698ac51e73b2a2f886656c7a05d645a23/resource.tar.gz#test.test_File-FilePathFromRoot-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-Compare-default.txt-Debug]": [
+        {
+            "checksum": "210dec6671b24a5f1a8dbdce68bb42f8",
+            "size": 902,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-Compare-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-Compare-default.txt-Results]": [
+        {
+            "checksum": "28441a839394a78bc0667a52f784d461",
+            "size": 2243,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-Compare-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverTuple-default.txt-Debug]": [
+        {
+            "checksum": "26aaa6487fa228dfe991c4a68574a236",
+            "size": 361,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverTuple-default.txt-Results]": [
+        {
+            "checksum": "bde2e92f20ef7573eadf6a1a93dd9973",
+            "size": 377,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideOpt-default.txt-Debug]": [
+        {
+            "checksum": "6f470c8e84f5c511906dca2cc0c0f9ba",
+            "size": 159,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-InsideOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideOpt-default.txt-Results]": [
+        {
+            "checksum": "b0ed415ddb14fe3de41a8ae66ee668e6",
+            "size": 555,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-InsideOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideStruct-default.txt-Debug]": [
+        {
+            "checksum": "a7f2d2630b095714ce9e2d3db6b84bc1",
+            "size": 197,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-InsideStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideStruct-default.txt-Results]": [
+        {
+            "checksum": "410ec645513e2397900d8d6d8a92e9c6",
+            "size": 984,
+            "uri": "https://{canondata_backend}/1031349/7b982bd0be0f116bb163ea43c437413557f6e291/resource.tar.gz#test.test_ImplictCasts-InsideStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-DictOpt-default.txt-Debug]": [
+        {
+            "checksum": "25939fea1280b80ef675715fc405c01b",
+            "size": 1323,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-DictOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-DictOpt-default.txt-Results]": [
+        {
+            "checksum": "70dd5171be230c82b7e91a5fd813306b",
+            "size": 1377,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-DictOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-GroupOpt-default.txt-Debug]": [
+        {
+            "checksum": "a10f2e2f54bf88c0f7deee85054a517e",
+            "size": 475,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-GroupOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-GroupOpt-default.txt-Results]": [
+        {
+            "checksum": "e90df24b80edb3b0961bcccbc5f64ce0",
+            "size": 2122,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-GroupOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-PartitionsByKeys-default.txt-Debug]": [
+        {
+            "checksum": "a77db6752c6ee71b9151bc753af74d7b",
+            "size": 529,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-PartitionsByKeys-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-PartitionsByKeys-default.txt-Results]": [
+        {
+            "checksum": "3159d6b27773bf2c0b434a77a64b62b2",
+            "size": 337,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-PartitionsByKeys-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-SqlAccess-default.txt-Debug]": [
+        {
+            "checksum": "33e9e235d96ee49356566d345818c2e5",
+            "size": 3155,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-SqlAccess-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-SqlAccess-default.txt-Results]": [
+        {
+            "checksum": "c17583c199ae96955a9c058f0d082a05",
+            "size": 10926,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-SqlAccess-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StringWith-default.txt-Debug]": [
+        {
+            "checksum": "61e802538d20e9c04910aa85f1c7117c",
+            "size": 1241,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-StringWith-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StringWith-default.txt-Results]": [
+        {
+            "checksum": "f8fc405d800f15034674def453e78991",
+            "size": 3804,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-StringWith-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Way--Debug]": [
+        {
+            "checksum": "775fae5f7c3711a48785a19a36573d4a",
+            "size": 2233,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-Way--Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Way--Results]": [
+        {
+            "checksum": "02c162ffaea71f157d395dd2e38c052c",
+            "size": 4692,
+            "uri": "https://{canondata_backend}/1936842/368acf4cf667995c3d31a4f33918657e066ad262/resource.tar.gz#test.test_InMem-Way--Results_/results.txt"
+        }
+    ],
+    "test.test[Join-CommonJoinCore-default.txt-Debug]": [
+        {
+            "checksum": "445f05d7bd3058ce581e08a4840da91c",
+            "size": 5495,
+            "uri": "https://{canondata_backend}/1925842/e859ad3c8be21e6459a5c12ccc9f1dd242d26ef8/resource.tar.gz#test.test_Join-CommonJoinCore-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-CommonJoinCore-default.txt-Results]": [
+        {
+            "checksum": "598a41131b912387ae809a38868c909d",
+            "size": 59842,
+            "uri": "https://{canondata_backend}/1925842/e859ad3c8be21e6459a5c12ccc9f1dd242d26ef8/resource.tar.gz#test.test_Join-CommonJoinCore-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-CommonJoinCore_Flow-default.txt-Debug]": [
+        {
+            "checksum": "de539e210c3e67de5186c2aea357b2e6",
+            "size": 4919,
+            "uri": "https://{canondata_backend}/1925842/e859ad3c8be21e6459a5c12ccc9f1dd242d26ef8/resource.tar.gz#test.test_Join-CommonJoinCore_Flow-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-CommonJoinCore_Flow-default.txt-Results]": [
+        {
+            "checksum": "598a41131b912387ae809a38868c909d",
+            "size": 59842,
+            "uri": "https://{canondata_backend}/1925842/e859ad3c8be21e6459a5c12ccc9f1dd242d26ef8/resource.tar.gz#test.test_Join-CommonJoinCore_Flow-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Avg_Opt-default.txt-Debug]": [
+        {
+            "checksum": "a534778101bc96e5d5f7fe5db6b2318b",
+            "size": 1205,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_Avg_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Avg_Opt-default.txt-Results]": [
+        {
+            "checksum": "b1577af2f3a3ff77fb4fa6b7985b6c13",
+            "size": 1408,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_Avg_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Bool_Xor_Opt-default.txt-Debug]": [
+        {
+            "checksum": "0a8ef6e6b4baba9e0384f59f79e38570",
+            "size": 936,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_Bool_Xor_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Bool_Xor_Opt-default.txt-Results]": [
+        {
+            "checksum": "0352164c79066f363d2a2b723227bb6d",
+            "size": 1775,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_Bool_Xor_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Sum_Opt-default.txt-Debug]": [
+        {
+            "checksum": "930312bd4223ef47a60d65312d15b9a4",
+            "size": 748,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_Distinct_Sum_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Sum_Opt-default.txt-Results]": [
+        {
+            "checksum": "28a6427b299b51ec70beb4495b5aa3a0",
+            "size": 1408,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_Distinct_Sum_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List-default.txt-Debug]": [
+        {
+            "checksum": "d6580af0455c6bbd16d6362cce4207e6",
+            "size": 745,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List-default.txt-Results]": [
+        {
+            "checksum": "7fbb97b82c72fe0656ba4e6fbfc30ede",
+            "size": 1562,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List_Limit-default.txt-Debug]": [
+        {
+            "checksum": "19c02b7f9732bc9c5030bf1cf94bfd26",
+            "size": 925,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List_Limit-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List_Limit-default.txt-Results]": [
+        {
+            "checksum": "bc9dcbb8efbd4610960139263425e88f",
+            "size": 1463,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List_Limit-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List_Max_By-default.txt-Debug]": [
+        {
+            "checksum": "71d27a5d9b2403101b516401f5fe9762",
+            "size": 1277,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List_Max_By-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List_Max_By-default.txt-Results]": [
+        {
+            "checksum": "9d18d0fc31711505b885565e0d6d09c2",
+            "size": 1139,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List_Max_By-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List_Opt-default.txt-Debug]": [
+        {
+            "checksum": "dc7101dd14dd7e8634e5fbd1639c81ab",
+            "size": 793,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List_Opt-default.txt-Results]": [
+        {
+            "checksum": "9840f8ebcdca0530e6bdb3c4effc6a1e",
+            "size": 1493,
+            "uri": "https://{canondata_backend}/1871182/84581e63a5f6db4ad6cf7ece2c0e84d2f71a0c9b/resource.tar.gz#test.test_Lib-Agg_List_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-CoalesceWithBoolOverOr-default.txt-Debug]": [
+        {
+            "checksum": "8cbcbb684dcb6ff4272fd49a4836138c",
+            "size": 256,
+            "uri": "https://{canondata_backend}/1130705/3d94ebda38245f52f894464b0264731c615a6af4/resource.tar.gz#test.test_Optimizers-CoalesceWithBoolOverOr-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-CoalesceWithBoolOverOr-default.txt-Results]": [
+        {
+            "checksum": "c9d1de383b72fda4093e207a50f76887",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1130705/3d94ebda38245f52f894464b0264731c615a6af4/resource.tar.gz#test.test_Optimizers-CoalesceWithBoolOverOr-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FlatMapWithVariantItemAfterSwitch-default.txt-Debug]": [
+        {
+            "checksum": "28116293f01ae30be7b2602aa81c6cdb",
+            "size": 1195,
+            "uri": "https://{canondata_backend}/1781765/0df49ddef5fd4c53c706602819e514ef0dcda6a1/resource.tar.gz#test.test_Optimizers-FlatMapWithVariantItemAfterSwitch-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FlatMapWithVariantItemAfterSwitch-default.txt-Results]": [
+        {
+            "checksum": "34b6b6874ee817d1ef82d38566ec1aa9",
+            "size": 4524,
+            "uri": "https://{canondata_backend}/1781765/0df49ddef5fd4c53c706602819e514ef0dcda6a1/resource.tar.gz#test.test_Optimizers-FlatMapWithVariantItemAfterSwitch-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FoldEmptyStruct-default.txt-Debug]": [
+        {
+            "checksum": "bd59e53ece9c473e1b64264195f5e795",
+            "size": 123,
+            "uri": "https://{canondata_backend}/1781765/0df49ddef5fd4c53c706602819e514ef0dcda6a1/resource.tar.gz#test.test_Optimizers-FoldEmptyStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FoldEmptyStruct-default.txt-Results]": [
+        {
+            "checksum": "fb631aeea475fa7070172695fefeeb07",
+            "size": 288,
+            "uri": "https://{canondata_backend}/1781765/0df49ddef5fd4c53c706602819e514ef0dcda6a1/resource.tar.gz#test.test_Optimizers-FoldEmptyStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-LengthAfterAsList-default.txt-Debug]": [
+        {
+            "checksum": "6c2ed65c4d06b480a4502cd2ce19ef40",
+            "size": 124,
+            "uri": "https://{canondata_backend}/1916746/375f927958ed009a9e721a24a1b3c973eccb278a/resource.tar.gz#test.test_Optimizers-LengthAfterAsList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-LengthAfterAsList-default.txt-Results]": [
+        {
+            "checksum": "dcf7bb626dea71d0affb6a29eb3b2263",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1916746/375f927958ed009a9e721a24a1b3c973eccb278a/resource.tar.gz#test.test_Optimizers-LengthAfterAsList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSort1-default.txt-Debug]": [
+        {
+            "checksum": "2691b5fad5bb366418268b3914bcdf0b",
+            "size": 241,
+            "uri": "https://{canondata_backend}/1775319/1b77f6a2ced99cb43171907f99fa05c5976782c8/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSort1-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSort1-default.txt-Results]": [
+        {
+            "checksum": "0d36c48bd6ba5875ce384e9b29dde401",
+            "size": 733,
+            "uri": "https://{canondata_backend}/1775319/1b77f6a2ced99cb43171907f99fa05c5976782c8/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSort1-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-PushDownToFlow-default.txt-Debug]": [
+        {
+            "checksum": "ed25dda0682388131b4840cbc338e1d3",
+            "size": 224,
+            "uri": "https://{canondata_backend}/1775319/1b77f6a2ced99cb43171907f99fa05c5976782c8/resource.tar.gz#test.test_Optimizers-PushDownToFlow-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-PushDownToFlow-default.txt-Results]": [
+        {
+            "checksum": "8c58e995a6c70e7cd40d207b9a3d79c1",
+            "size": 925,
+            "uri": "https://{canondata_backend}/1775319/1b77f6a2ced99cb43171907f99fa05c5976782c8/resource.tar.gz#test.test_Optimizers-PushDownToFlow-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-SwitchToVisit-default.txt-Debug]": [
+        {
+            "checksum": "6dd3ffb32813fd8ceea115ddfe1b6049",
+            "size": 10398,
+            "uri": "https://{canondata_backend}/1775319/33a5822ce446b927422bf7000874d92357a831a4/resource.tar.gz#test.test_Optimizers-SwitchToVisit-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-SwitchToVisit-default.txt-Results]": [
+        {
+            "checksum": "a2a96711dea7913b83b729efc2e9b21c",
+            "size": 100790,
+            "uri": "https://{canondata_backend}/1775319/33a5822ce446b927422bf7000874d92357a831a4/resource.tar.gz#test.test_Optimizers-SwitchToVisit-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-TakeWhileOverLiterals-default.txt-Debug]": [
+        {
+            "checksum": "f4cdabe92df30a6521d6bec3695d7033",
+            "size": 575,
+            "uri": "https://{canondata_backend}/1775319/33a5822ce446b927422bf7000874d92357a831a4/resource.tar.gz#test.test_Optimizers-TakeWhileOverLiterals-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-TakeWhileOverLiterals-default.txt-Results]": [
+        {
+            "checksum": "d15868ec42931e799f31d03a394fc69a",
+            "size": 1750,
+            "uri": "https://{canondata_backend}/1775319/33a5822ce446b927422bf7000874d92357a831a4/resource.tar.gz#test.test_Optimizers-TakeWhileOverLiterals-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-VariantItemOverVisit-default.txt-Debug]": [
+        {
+            "checksum": "e1d2ba84468970a557ab99b92d5cf8a5",
+            "size": 549,
+            "uri": "https://{canondata_backend}/1775319/33a5822ce446b927422bf7000874d92357a831a4/resource.tar.gz#test.test_Optimizers-VariantItemOverVisit-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-VariantItemOverVisit-default.txt-Results]": [
+        {
+            "checksum": "10fb805c808c42f87b8f01a7a058fc67",
+            "size": 736,
+            "uri": "https://{canondata_backend}/1775319/33a5822ce446b927422bf7000874d92357a831a4/resource.tar.gz#test.test_Optimizers-VariantItemOverVisit-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-ResultColumnsPrefixes-default.txt-Debug]": [
+        {
+            "checksum": "15dbd6b216a71754f94c3cac2bfd07a4",
+            "size": 345,
+            "uri": "https://{canondata_backend}/1871002/edcb7a475cd238b4256032e362f6f6e3c46dfa70/resource.tar.gz#test.test_Result-ResultColumnsPrefixes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-ResultColumnsPrefixes-default.txt-Results]": [
+        {
+            "checksum": "929a80aae7775277134c6a24ecda4db9",
+            "size": 1391,
+            "uri": "https://{canondata_backend}/1871002/edcb7a475cd238b4256032e362f6f6e3c46dfa70/resource.tar.gz#test.test_Result-ResultColumnsPrefixes-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-TypeOf-default.txt-Debug]": [
+        {
+            "checksum": "78de9c5f7480f0acb1a1bb90850d76cd",
+            "size": 485,
+            "uri": "https://{canondata_backend}/1871002/edcb7a475cd238b4256032e362f6f6e3c46dfa70/resource.tar.gz#test.test_Result-TypeOf-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-TypeOf-default.txt-Results]": [
+        {
+            "checksum": "f3ea89e74067ce6c9cc11e1e2dd4cffb",
+            "size": 309,
+            "uri": "https://{canondata_backend}/1871002/edcb7a475cd238b4256032e362f6f6e3c46dfa70/resource.tar.gz#test.test_Result-TypeOf-default.txt-Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part2/test.py b/yql/essentials/tests/s-expressions/minirun/part2/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part2/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part2/ya.make b/yql/essentials/tests/s-expressions/minirun/part2/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part2/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part3/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part3/canondata/result.json
new file mode 100644
index 0000000000..ac537c9293
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part3/canondata/result.json
@@ -0,0 +1,450 @@
+{
+    "test.test[Aggregation-InMemAggregate-default.txt-Debug]": [
+        {
+            "checksum": "0c05f5207a3c98cdf59568fd79e8c817",
+            "size": 1204,
+            "uri": "https://{canondata_backend}/1942671/2f56b3d0b7380c392cd083e01b7b35c665b9756b/resource.tar.gz#test.test_Aggregation-InMemAggregate-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-InMemAggregate-default.txt-Results]": [
+        {
+            "checksum": "6fdabfe49c2d06a909de853dd7f169d4",
+            "size": 3660,
+            "uri": "https://{canondata_backend}/1942671/2f56b3d0b7380c392cd083e01b7b35c665b9756b/resource.tar.gz#test.test_Aggregation-InMemAggregate-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Builtins-FlattenMembersOptional2-default.txt-Debug]": [
+        {
+            "checksum": "88b6f9b45da96b0e57f26338eb01b668",
+            "size": 649,
+            "uri": "https://{canondata_backend}/1031349/0f0797c477ee3637f2371dfb4f180178d8214f43/resource.tar.gz#test.test_Builtins-FlattenMembersOptional2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Builtins-FlattenMembersOptional2-default.txt-Results]": [
+        {
+            "checksum": "f49e0a84cec2ce8d58fd3ea5727d65c8",
+            "size": 4510,
+            "uri": "https://{canondata_backend}/1031349/0f0797c477ee3637f2371dfb4f180178d8214f43/resource.tar.gz#test.test_Builtins-FlattenMembersOptional2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverNull-default.txt-Debug]": [
+        {
+            "checksum": "75fa1b1412e6eae45a8d3fa42da8a0ff",
+            "size": 764,
+            "uri": "https://{canondata_backend}/1784117/e7f6ba422788af6faabe2ec5d05a2e934d400d52/resource.tar.gz#test.test_Casts-AlterToOverNull-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverNull-default.txt-Results]": [
+        {
+            "checksum": "591531ecb987a3194b6b6ebbc8fb77ed",
+            "size": 1003,
+            "uri": "https://{canondata_backend}/1784117/e7f6ba422788af6faabe2ec5d05a2e934d400d52/resource.tar.gz#test.test_Casts-AlterToOverNull-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-SafeCastOverTuple-default.txt-Debug]": [
+        {
+            "checksum": "ebabddb8639c4a51cc09832bada10722",
+            "size": 778,
+            "uri": "https://{canondata_backend}/1784117/e7f6ba422788af6faabe2ec5d05a2e934d400d52/resource.tar.gz#test.test_Casts-SafeCastOverTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverTuple-default.txt-Results]": [
+        {
+            "checksum": "d62c7f784e888494d3dc0f2f2ea790c1",
+            "size": 4081,
+            "uri": "https://{canondata_backend}/1784117/e7f6ba422788af6faabe2ec5d05a2e934d400d52/resource.tar.gz#test.test_Casts-SafeCastOverTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoinAny-InMemAnyAll-default.txt-Debug]": [
+        {
+            "checksum": "9026902211561616be298f1c0852ccb2",
+            "size": 2640,
+            "uri": "https://{canondata_backend}/1916746/61a1061b37817f7862d2acf7ec91bdccd5249d4a/resource.tar.gz#test.test_EquiJoinAny-InMemAnyAll-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoinAny-InMemAnyAll-default.txt-Results]": [
+        {
+            "checksum": "9622654c37c53ce3f8cb98a286b28808",
+            "size": 19782,
+            "uri": "https://{canondata_backend}/1916746/61a1061b37817f7862d2acf7ec91bdccd5249d4a/resource.tar.gz#test.test_EquiJoinAny-InMemAnyAll-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[File-FileContent-default.txt-Debug]": [
+        {
+            "checksum": "4f38962ec30d5beeedbe954eb7f10d0e",
+            "size": 126,
+            "uri": "https://{canondata_backend}/1931696/b24ebc93e17f754edda6c52efc10a6f3f4e13daa/resource.tar.gz#test.test_File-FileContent-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-FileContent-default.txt-Results]": [
+        {
+            "checksum": "6efd98784eadfc271e8bae143645dd61",
+            "size": 127,
+            "uri": "https://{canondata_backend}/1931696/b24ebc93e17f754edda6c52efc10a6f3f4e13daa/resource.tar.gz#test.test_File-FileContent-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverData-default.txt-Debug]": [
+        {
+            "checksum": "4ba8656d7aff9df7ffac6d5218315bee",
+            "size": 397,
+            "uri": "https://{canondata_backend}/1031349/eacf8abb99af3cddc69b4a84bdd7267a3a8506f4/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverData-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverData-default.txt-Results]": [
+        {
+            "checksum": "43517af3654b9c247b0d3a50aec189b4",
+            "size": 542,
+            "uri": "https://{canondata_backend}/1031349/eacf8abb99af3cddc69b4a84bdd7267a3a8506f4/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverData-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideListLiteral-default.txt-Debug]": [
+        {
+            "checksum": "a181e5117be901eaec8b141829e0f660",
+            "size": 199,
+            "uri": "https://{canondata_backend}/1031349/eacf8abb99af3cddc69b4a84bdd7267a3a8506f4/resource.tar.gz#test.test_ImplictCasts-InsideListLiteral-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideListLiteral-default.txt-Results]": [
+        {
+            "checksum": "57d285f21f1d9851175371eccf937f1e",
+            "size": 626,
+            "uri": "https://{canondata_backend}/1031349/eacf8abb99af3cddc69b4a84bdd7267a3a8506f4/resource.tar.gz#test.test_ImplictCasts-InsideListLiteral-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-CompareStruct-default.txt-Debug]": [
+        {
+            "checksum": "ddbd91cb710e80c408ef629b99e5aed7",
+            "size": 3699,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-CompareStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-CompareStruct-default.txt-Results]": [
+        {
+            "checksum": "385b585a34aee2d41b929ad78dfabdb4",
+            "size": 9876,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-CompareStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-DiffKeyTypeContains-default.txt-Debug]": [
+        {
+            "checksum": "540816fa89a76f255c5cd07f9fb1b6ef",
+            "size": 3846,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-DiffKeyTypeContains-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-DiffKeyTypeContains-default.txt-Results]": [
+        {
+            "checksum": "7ae2de50f3685078ddc9008479a90e22",
+            "size": 2801,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-DiffKeyTypeContains-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Hopping-default.txt-Debug]": [
+        {
+            "checksum": "636d984952b667eda36e939ba0c6f5bc",
+            "size": 1871,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Hopping-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Hopping-default.txt-Results]": [
+        {
+            "checksum": "26e8eee9a3004c1efa71f33802996cc6",
+            "size": 3331,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Hopping-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Mux-default.txt-Debug]": [
+        {
+            "checksum": "2adce37be1ea4ea467c6bba1fff45d1b",
+            "size": 397,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Mux-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Mux-default.txt-Results]": [
+        {
+            "checksum": "c8a8b2ff78e9ba480df1e4faf68d4545",
+            "size": 4016,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Mux-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Queue-default.txt-Debug]": [
+        {
+            "checksum": "d9554d97e40327e2e0e59de498c2a7e2",
+            "size": 611,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Queue-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Queue-default.txt-Results]": [
+        {
+            "checksum": "f9757f1c9f7342ab794f829f8828f11d",
+            "size": 2804,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Queue-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-QueueMixedTypes-default.txt-Debug]": [
+        {
+            "checksum": "2606a7648965c0491aa608feab97b6c8",
+            "size": 797,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-QueueMixedTypes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-QueueMixedTypes-default.txt-Results]": [
+        {
+            "checksum": "54c9be73bae3dac8cbb0b93a1c846615",
+            "size": 3472,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-QueueMixedTypes-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Switch-default.txt-Debug]": [
+        {
+            "checksum": "e2957814e9420212228866fa42b097d1",
+            "size": 1848,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Switch-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Switch-default.txt-Results]": [
+        {
+            "checksum": "44f1fad8aea6c27e7fe07c1eac22a012",
+            "size": 9137,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Switch-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ToDictOverOptList-default.txt-Debug]": [
+        {
+            "checksum": "db2478a16411daa44187b3dd49c6a04b",
+            "size": 2475,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-ToDictOverOptList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ToDictOverOptList-default.txt-Results]": [
+        {
+            "checksum": "1351e18c6524ff1257a43bc958df0af8",
+            "size": 5950,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-ToDictOverOptList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Visit--Debug]": [
+        {
+            "checksum": "272f22dd4c28d43b03060c493ce96436",
+            "size": 3063,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Visit--Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Visit--Results]": [
+        {
+            "checksum": "015113a265c782e56ee395d5c8a5eb7f",
+            "size": 5516,
+            "uri": "https://{canondata_backend}/1936842/adb6621ea582bf3dea04cd9842f6c1b6c2cfa21a/resource.tar.gz#test.test_InMem-Visit--Results_/results.txt"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedRight-default.txt-Debug]": [
+        {
+            "checksum": "28e090318468f760b7863d4c2d58c5bb",
+            "size": 5526,
+            "uri": "https://{canondata_backend}/1937424/0eb11c0845c8ff0d22604c1066442d2aefb08368/resource.tar.gz#test.test_Join-CommonJoinCoreSortedRight-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedRight-default.txt-Results]": [
+        {
+            "checksum": "01006ad0acd079b98fbb9559fdb7b773",
+            "size": 54516,
+            "uri": "https://{canondata_backend}/1937424/0eb11c0845c8ff0d22604c1066442d2aefb08368/resource.tar.gz#test.test_Join-CommonJoinCoreSortedRight-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedRight_Flow-default.txt-Debug]": [
+        {
+            "checksum": "89a6bb767d2298f4cb98d8f942fda8eb",
+            "size": 4950,
+            "uri": "https://{canondata_backend}/1937424/0eb11c0845c8ff0d22604c1066442d2aefb08368/resource.tar.gz#test.test_Join-CommonJoinCoreSortedRight_Flow-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedRight_Flow-default.txt-Results]": [
+        {
+            "checksum": "01006ad0acd079b98fbb9559fdb7b773",
+            "size": 54516,
+            "uri": "https://{canondata_backend}/1937424/0eb11c0845c8ff0d22604c1066442d2aefb08368/resource.tar.gz#test.test_Join-CommonJoinCoreSortedRight_Flow-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-MapJoinCoreOnStrings_Flow-default.txt-Debug]": [
+        {
+            "checksum": "ed226a5fa4451667327e4b4869a8f604",
+            "size": 2055,
+            "uri": "https://{canondata_backend}/1937424/0eb11c0845c8ff0d22604c1066442d2aefb08368/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings_Flow-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-MapJoinCoreOnStrings_Flow-default.txt-Results]": [
+        {
+            "checksum": "2beda402113f5fd50b7ef8c03e559935",
+            "size": 13477,
+            "uri": "https://{canondata_backend}/1937424/0eb11c0845c8ff0d22604c1066442d2aefb08368/resource.tar.gz#test.test_Join-MapJoinCoreOnStrings_Flow-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Avg_If-default.txt-Debug]": [
+        {
+            "checksum": "ecea49bdc7380bac3269d48582aaca45",
+            "size": 1520,
+            "uri": "https://{canondata_backend}/1920236/6d035827417d2f9a3d08823932c89cc47edcd7c8/resource.tar.gz#test.test_Lib-Agg_Avg_If-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Avg_If-default.txt-Results]": [
+        {
+            "checksum": "ca073cc9e25266b0c9813bcd9ef0c914",
+            "size": 1411,
+            "uri": "https://{canondata_backend}/1920236/6d035827417d2f9a3d08823932c89cc47edcd7c8/resource.tar.gz#test.test_Lib-Agg_Avg_If-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Count_All_Opt-default.txt-Debug]": [
+        {
+            "checksum": "8a5d600961d9a900346ac57ef2c3bd20",
+            "size": 792,
+            "uri": "https://{canondata_backend}/1920236/6d035827417d2f9a3d08823932c89cc47edcd7c8/resource.tar.gz#test.test_Lib-Agg_Count_All_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Count_All_Opt-default.txt-Results]": [
+        {
+            "checksum": "72edcf318b915eb7fe583d5f6ca27110",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1920236/6d035827417d2f9a3d08823932c89cc47edcd7c8/resource.tar.gz#test.test_Lib-Agg_Count_All_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Condense1OneItemTuple-default.txt-Debug]": [
+        {
+            "checksum": "913e1f6de776aea9ccde8e4631f02e4e",
+            "size": 316,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-Condense1OneItemTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Condense1OneItemTuple-default.txt-Results]": [
+        {
+            "checksum": "c8ec123f40a66415e1898ad4eadc525a",
+            "size": 548,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-Condense1OneItemTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenFold1-default.txt-Debug]": [
+        {
+            "checksum": "f888efddb98f420dd91d57b4f4f0fb12",
+            "size": 201,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-ConstMapThenFold1-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenFold1-default.txt-Results]": [
+        {
+            "checksum": "61c52fb8f7c38d8b01db8b669ba26984",
+            "size": 337,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-ConstMapThenFold1-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-EquivNestedLambdaOneLevel-default.txt-Debug]": [
+        {
+            "checksum": "48b52762c30c3ac1c7cb82d6edfb0f66",
+            "size": 387,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-EquivNestedLambdaOneLevel-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-EquivNestedLambdaOneLevel-default.txt-Results]": [
+        {
+            "checksum": "d344ef9ad84bfd64a628ce21cb4c93df",
+            "size": 412,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-EquivNestedLambdaOneLevel-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-EquivNodesInLambdas-default.txt-Debug]": [
+        {
+            "checksum": "d577900b008002df0b0c859204302370",
+            "size": 334,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-EquivNodesInLambdas-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-EquivNodesInLambdas-default.txt-Results]": [
+        {
+            "checksum": "213bba219d7927be8e036abad1039060",
+            "size": 424,
+            "uri": "https://{canondata_backend}/1937429/9bd57c62717ec072303750ac6d2edfdd4edd5095/resource.tar.gz#test.test_Optimizers-EquivNodesInLambdas-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FoldConstMin-default.txt-Debug]": [
+        {
+            "checksum": "3c2b17df9dc483f63373b713e8ffcf10",
+            "size": 142,
+            "uri": "https://{canondata_backend}/1942415/cf787cadf523ee7c252f75800ada66b82ac2375a/resource.tar.gz#test.test_Optimizers-FoldConstMin-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FoldConstMin-default.txt-Results]": [
+        {
+            "checksum": "145f06c15c2ee3864535d71dc0dad42b",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1942415/cf787cadf523ee7c252f75800ada66b82ac2375a/resource.tar.gz#test.test_Optimizers-FoldConstMin-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FoldEmptyTuple-default.txt-Debug]": [
+        {
+            "checksum": "46a2c7d6801efa3326a4cdede323d683",
+            "size": 116,
+            "uri": "https://{canondata_backend}/1942415/cf787cadf523ee7c252f75800ada66b82ac2375a/resource.tar.gz#test.test_Optimizers-FoldEmptyTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FoldEmptyTuple-default.txt-Results]": [
+        {
+            "checksum": "83161130f1532e693a1fdb7431cb9665",
+            "size": 287,
+            "uri": "https://{canondata_backend}/1942415/cf787cadf523ee7c252f75800ada66b82ac2375a/resource.tar.gz#test.test_Optimizers-FoldEmptyTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-LengthAfterList-default.txt-Debug]": [
+        {
+            "checksum": "6c2ed65c4d06b480a4502cd2ce19ef40",
+            "size": 124,
+            "uri": "https://{canondata_backend}/1031349/de1275760530cb37ff3ca2d7aa0c26a1e7476b02/resource.tar.gz#test.test_Optimizers-LengthAfterList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-LengthAfterList-default.txt-Results]": [
+        {
+            "checksum": "dcf7bb626dea71d0affb6a29eb3b2263",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1031349/de1275760530cb37ff3ca2d7aa0c26a1e7476b02/resource.tar.gz#test.test_Optimizers-LengthAfterList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-Pickle-default.txt-Debug]": [
+        {
+            "checksum": "ff0f81f90265c0afaa74303e7198d058",
+            "size": 2093,
+            "uri": "https://{canondata_backend}/1871002/d94679331c7c020e7f96d20ab51a13038ca79b4c/resource.tar.gz#test.test_Result-Pickle-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-Pickle-default.txt-Results]": [
+        {
+            "checksum": "4d5981076ff41c5c14b250f6fa24ff81",
+            "size": 19384,
+            "uri": "https://{canondata_backend}/1871002/d94679331c7c020e7f96d20ab51a13038ca79b4c/resource.tar.gz#test.test_Result-Pickle-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-PureWithType-default.txt-Debug]": [
+        {
+            "checksum": "517bf0ede740a4444d092f7a2f0d60c4",
+            "size": 455,
+            "uri": "https://{canondata_backend}/1871002/d94679331c7c020e7f96d20ab51a13038ca79b4c/resource.tar.gz#test.test_Result-PureWithType-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-PureWithType-default.txt-Results]": [
+        {
+            "checksum": "9d96a40d7cf9a28e42f079249122a596",
+            "size": 2923,
+            "uri": "https://{canondata_backend}/1871002/d94679331c7c020e7f96d20ab51a13038ca79b4c/resource.tar.gz#test.test_Result-PureWithType-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonGeneratorWithClosure--Debug]": [
+        {
+            "checksum": "85b78069df05fd08f35f70878a7e5cef",
+            "size": 414,
+            "uri": "https://{canondata_backend}/1600758/4248636efdaa36f150a17c3f1e81c0728d33ae03/resource.tar.gz#test.test_Udf-PythonGeneratorWithClosure--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonGeneratorWithClosure--Results]": [
+        {
+            "checksum": "449d62fa0820fe5b2ae08079521c833b",
+            "size": 385,
+            "uri": "https://{canondata_backend}/1600758/4248636efdaa36f150a17c3f1e81c0728d33ae03/resource.tar.gz#test.test_Udf-PythonGeneratorWithClosure--Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part3/test.py b/yql/essentials/tests/s-expressions/minirun/part3/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part3/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part3/ya.make b/yql/essentials/tests/s-expressions/minirun/part3/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part3/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part4/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part4/canondata/result.json
new file mode 100644
index 0000000000..3dc42f8f1d
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part4/canondata/result.json
@@ -0,0 +1,520 @@
+{
+    "test.test[Aggregation-InMemAggregateWithParents-default.txt-Debug]": [
+        {
+            "checksum": "a4519ab2961c4987e74e1b8c412b6a94",
+            "size": 1416,
+            "uri": "https://{canondata_backend}/1814674/847e947fdcb430ffb93faab5ab87a49e509d4e97/resource.tar.gz#test.test_Aggregation-InMemAggregateWithParents-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-InMemAggregateWithParents-default.txt-Results]": [
+        {
+            "checksum": "6fdabfe49c2d06a909de853dd7f169d4",
+            "size": 3660,
+            "uri": "https://{canondata_backend}/1814674/847e947fdcb430ffb93faab5ab87a49e509d4e97/resource.tar.gz#test.test_Aggregation-InMemAggregateWithParents-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToEnormousList-default.txt-Debug]": [
+        {
+            "checksum": "844dc8f17557566103ac3586255fed72",
+            "size": 357,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToEnormousList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToEnormousList-default.txt-Results]": [
+        {
+            "checksum": "da76c781c0023e83cba6d304b8c6f08d",
+            "size": 854,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToEnormousList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverList-default.txt-Debug]": [
+        {
+            "checksum": "fee28918f1b631a9950714f5c7d85340",
+            "size": 633,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToOverList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverList-default.txt-Results]": [
+        {
+            "checksum": "df090798c00cc1699fa8f61dc9005ef0",
+            "size": 1039,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToOverList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverTuple-default.txt-Debug]": [
+        {
+            "checksum": "9cc249cd06066a7a7cbf890a0a9194cf",
+            "size": 446,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToOverTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverTuple-default.txt-Results]": [
+        {
+            "checksum": "611661fc03be1123e1a7c215e66109b2",
+            "size": 1104,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToOverTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverVariant-default.txt-Debug]": [
+        {
+            "checksum": "7adca8cd79926e641ea06cf35a50422d",
+            "size": 1077,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToOverVariant-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverVariant-default.txt-Results]": [
+        {
+            "checksum": "65db95c397a9ad0eb4b4e4af2eba0fd1",
+            "size": 3140,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-AlterToOverVariant-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-SafeCastOverNull-default.txt-Debug]": [
+        {
+            "checksum": "4c62404166d0aaa81eb8b5e976abdeef",
+            "size": 507,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-SafeCastOverNull-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverNull-default.txt-Results]": [
+        {
+            "checksum": "9b042a72917b21e06c35fe4f2ff60d77",
+            "size": 1295,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-SafeCastOverNull-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-StrictCastOverNull-default.txt-Debug]": [
+        {
+            "checksum": "bf7612f0b9b219c52f48d7e212168df0",
+            "size": 397,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-StrictCastOverNull-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-StrictCastOverNull-default.txt-Results]": [
+        {
+            "checksum": "b559f28501fd7ec32c797dc549748048",
+            "size": 911,
+            "uri": "https://{canondata_backend}/1936997/a400f47e72eaca0f926e35a277eaf69711d3f99e/resource.tar.gz#test.test_Casts-StrictCastOverNull-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemOpt2-default.txt-Debug]": [
+        {
+            "checksum": "b4df235708ba2ab7c5251919316326af",
+            "size": 2232,
+            "uri": "https://{canondata_backend}/1889210/5c2acb2c9f2e0d2f4f4d705892a3ab630912bc20/resource.tar.gz#test.test_EquiJoin-JoinInMemOpt2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemOpt2-default.txt-Results]": [
+        {
+            "checksum": "713a5069d4ccf1b6db18370d0305f335",
+            "size": 28772,
+            "uri": "https://{canondata_backend}/1889210/5c2acb2c9f2e0d2f4f4d705892a3ab630912bc20/resource.tar.gz#test.test_EquiJoin-JoinInMemOpt2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoinAny-InMemAllAny-default.txt-Debug]": [
+        {
+            "checksum": "4914057d49c995ebffe00db6b51b033a",
+            "size": 2641,
+            "uri": "https://{canondata_backend}/1924537/bad9853055d46d07eb2e44a6051f8d54dc4ac884/resource.tar.gz#test.test_EquiJoinAny-InMemAllAny-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoinAny-InMemAllAny-default.txt-Results]": [
+        {
+            "checksum": "16255e914bb11aa4483343d6d62e9fca",
+            "size": 19746,
+            "uri": "https://{canondata_backend}/1924537/bad9853055d46d07eb2e44a6051f8d54dc4ac884/resource.tar.gz#test.test_EquiJoinAny-InMemAllAny-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AsListInferCommonTypeOpt-default.txt-Debug]": [
+        {
+            "checksum": "491c85541495f58dbb9a3ce9b6280e9b",
+            "size": 585,
+            "uri": "https://{canondata_backend}/1031349/59cbdd8ee5bde3a5c921f7ce556748bd876c92cf/resource.tar.gz#test.test_ImplictCasts-AsListInferCommonTypeOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AsListInferCommonTypeOpt-default.txt-Results]": [
+        {
+            "checksum": "107ee57a08089670895cf3bd854b344f",
+            "size": 3963,
+            "uri": "https://{canondata_backend}/1031349/59cbdd8ee5bde3a5c921f7ce556748bd876c92cf/resource.tar.gz#test.test_ImplictCasts-AsListInferCommonTypeOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvert-default.txt-Debug]": [
+        {
+            "checksum": "ce54e6f69f4c42bdcfa42676d84d2130",
+            "size": 799,
+            "uri": "https://{canondata_backend}/1031349/59cbdd8ee5bde3a5c921f7ce556748bd876c92cf/resource.tar.gz#test.test_ImplictCasts-AutoConvert-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvert-default.txt-Results]": [
+        {
+            "checksum": "63e8b141993f2bdaa8f3028a42d56c18",
+            "size": 2150,
+            "uri": "https://{canondata_backend}/1031349/59cbdd8ee5bde3a5c921f7ce556748bd876c92cf/resource.tar.gz#test.test_ImplictCasts-AutoConvert-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-Take-default.txt-Debug]": [
+        {
+            "checksum": "227b719461dc3bfe2345c39fc93fa17f",
+            "size": 133,
+            "uri": "https://{canondata_backend}/1031349/59cbdd8ee5bde3a5c921f7ce556748bd876c92cf/resource.tar.gz#test.test_ImplictCasts-Take-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-Take-default.txt-Results]": [
+        {
+            "checksum": "7641b5513492d33316ea8ef4ce5f643a",
+            "size": 333,
+            "uri": "https://{canondata_backend}/1031349/59cbdd8ee5bde3a5c921f7ce556748bd876c92cf/resource.tar.gz#test.test_ImplictCasts-Take-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-AggrMinMaxTuple-default.txt-Debug]": [
+        {
+            "checksum": "13334dbd30562f95ae28d2a308edd7d9",
+            "size": 2673,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-AggrMinMaxTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-AggrMinMaxTuple-default.txt-Results]": [
+        {
+            "checksum": "67759cfa9f63dd71a50cce1748224a34",
+            "size": 12747,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-AggrMinMaxTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-DictOptTuple-default.txt-Debug]": [
+        {
+            "checksum": "f9f02027d043822c2fb37934b093476d",
+            "size": 1124,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-DictOptTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-DictOptTuple-default.txt-Results]": [
+        {
+            "checksum": "29a5e18928855f6ba2deaffd72fb6b30",
+            "size": 720,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-DictOptTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Fold1Map-default.txt-Debug]": [
+        {
+            "checksum": "67094f831e14cc16b097c0fdbc221b5e",
+            "size": 666,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-Fold1Map-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Fold1Map-default.txt-Results]": [
+        {
+            "checksum": "5762ee3d5c7a37e0f1338d7b5889c627",
+            "size": 1888,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-Fold1Map-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Guess--Debug]": [
+        {
+            "checksum": "e5de3161e4711a3c53bd376c30d7c95e",
+            "size": 2451,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-Guess--Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Guess--Results]": [
+        {
+            "checksum": "fc47126a8b1b886f259ce727cb6f1007",
+            "size": 6752,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-Guess--Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ListFromRangeForDates-default.txt-Debug]": [
+        {
+            "checksum": "9eb52e1fd2ea6bda896e831fdf864f27",
+            "size": 807,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-ListFromRangeForDates-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ListFromRangeForDates-default.txt-Results]": [
+        {
+            "checksum": "9b24bf438a46d153b8207559786b7241",
+            "size": 2973,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-ListFromRangeForDates-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-QueueCheckDependent-default.txt-Debug]": [
+        {
+            "checksum": "9313e51d89791e5cdef431e993455255",
+            "size": 928,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-QueueCheckDependent-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-QueueCheckDependent-default.txt-Results]": [
+        {
+            "checksum": "e5ffd2d32d3c0778359739860c59c0e6",
+            "size": 3536,
+            "uri": "https://{canondata_backend}/1937424/d5a759bb3d448219023419bd81b51a83c51e7fb9/resource.tar.gz#test.test_InMem-QueueCheckDependent-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-JoinInMem-default.txt-Debug]": [
+        {
+            "checksum": "e6b5e48ad161fb0a8d3a05e57ce9c95c",
+            "size": 690,
+            "uri": "https://{canondata_backend}/1130705/e73f43ad34e61bf8b5619a38d27d41ab843ac3b9/resource.tar.gz#test.test_Join-JoinInMem-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-JoinInMem-default.txt-Results]": [
+        {
+            "checksum": "6d77f65ff11492109e43f0c3b95d7ece",
+            "size": 8134,
+            "uri": "https://{canondata_backend}/1130705/e73f43ad34e61bf8b5619a38d27d41ab843ac3b9/resource.tar.gz#test.test_Join-JoinInMem-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-MapJoinCore_Flow-default.txt-Debug]": [
+        {
+            "checksum": "b7e8e5238a0bf2628179fa6dc1b9351f",
+            "size": 1925,
+            "uri": "https://{canondata_backend}/1130705/e73f43ad34e61bf8b5619a38d27d41ab843ac3b9/resource.tar.gz#test.test_Join-MapJoinCore_Flow-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-MapJoinCore_Flow-default.txt-Results]": [
+        {
+            "checksum": "430a30b31726d29d8fad3e5c9cfa4e82",
+            "size": 12820,
+            "uri": "https://{canondata_backend}/1130705/e73f43ad34e61bf8b5619a38d27d41ab843ac3b9/resource.tar.gz#test.test_Join-MapJoinCore_Flow-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Avg_If_Opt-default.txt-Debug]": [
+        {
+            "checksum": "9364ee71fe2c6d3d43c77e9376021eda",
+            "size": 1581,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Avg_If_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Avg_If_Opt-default.txt-Results]": [
+        {
+            "checksum": "4c0ac723deaee29609ff3b0583fee20c",
+            "size": 1408,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Avg_If_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Count_If-default.txt-Debug]": [
+        {
+            "checksum": "133410faef060de91d69b8093a037fbb",
+            "size": 773,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Count_If-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Count_If-default.txt-Results]": [
+        {
+            "checksum": "3a28afa3342f3f7f536e0fdaf3a6b7e8",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Count_If-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_All-default.txt-Debug]": [
+        {
+            "checksum": "24f14395c33b8b7daddf2d9b97fbde3b",
+            "size": 694,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_All-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_All-default.txt-Results]": [
+        {
+            "checksum": "c187891e293159fefd11ffd094848441",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_All-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Sum-default.txt-Debug]": [
+        {
+            "checksum": "5ba5df7b47c6ced4aec9df3308b7f74d",
+            "size": 724,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Distinct_Sum-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Sum-default.txt-Results]": [
+        {
+            "checksum": "41b149e889f004dc4b654093538f33cc",
+            "size": 1163,
+            "uri": "https://{canondata_backend}/1937367/e7d6d19ea7ee7c5806bee8c9385e1cc4786aeeac/resource.tar.gz#test.test_Lib-Agg_Distinct_Sum-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-CoalesceOverJust-default.txt-Debug]": [
+        {
+            "checksum": "31ad2e7b9bd00c12a1a6b0586446046d",
+            "size": 200,
+            "uri": "https://{canondata_backend}/1942415/d03b8c817b5b1ba48f23edb9224bea1830a021ab/resource.tar.gz#test.test_Optimizers-CoalesceOverJust-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-CoalesceOverJust-default.txt-Results]": [
+        {
+            "checksum": "98a9328a394069b5f24b9609bd8c248b",
+            "size": 500,
+            "uri": "https://{canondata_backend}/1942415/d03b8c817b5b1ba48f23edb9224bea1830a021ab/resource.tar.gz#test.test_Optimizers-CoalesceOverJust-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-CoalesceWithBoolOverNot-default.txt-Debug]": [
+        {
+            "checksum": "799a32e2434bf06dae80eae8688368d6",
+            "size": 211,
+            "uri": "https://{canondata_backend}/1942415/664f4a9aeb313f8a0676c1fd9dc02884879fb2d9/resource.tar.gz#test.test_Optimizers-CoalesceWithBoolOverNot-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-CoalesceWithBoolOverNot-default.txt-Results]": [
+        {
+            "checksum": "c8d52d4d8691df818f7e26878ca4da82",
+            "size": 211,
+            "uri": "https://{canondata_backend}/1942415/664f4a9aeb313f8a0676c1fd9dc02884879fb2d9/resource.tar.gz#test.test_Optimizers-CoalesceWithBoolOverNot-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-EquivLambda-default.txt-Debug]": [
+        {
+            "checksum": "7ee9ed3f7d075df6d313e29c9edc824c",
+            "size": 278,
+            "uri": "https://{canondata_backend}/1942415/664f4a9aeb313f8a0676c1fd9dc02884879fb2d9/resource.tar.gz#test.test_Optimizers-EquivLambda-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-EquivLambda-default.txt-Results]": [
+        {
+            "checksum": "83c765eefca6c995351678930e3e8832",
+            "size": 416,
+            "uri": "https://{canondata_backend}/1942415/664f4a9aeb313f8a0676c1fd9dc02884879fb2d9/resource.tar.gz#test.test_Optimizers-EquivLambda-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-InnerLambda-default.txt-Debug]": [
+        {
+            "checksum": "24d656328a388a40a58b46286694d0e4",
+            "size": 250,
+            "uri": "https://{canondata_backend}/1031349/f0a5517218de1b3746ab4d5dca2787a40bb6ce38/resource.tar.gz#test.test_Optimizers-InnerLambda-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-InnerLambda-default.txt-Results]": [
+        {
+            "checksum": "32aa85b15cbcdad411bd8dd53a3c1ec2",
+            "size": 412,
+            "uri": "https://{canondata_backend}/1031349/f0a5517218de1b3746ab4d5dca2787a40bb6ce38/resource.tar.gz#test.test_Optimizers-InnerLambda-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MemberOverJustOrNothingWithNulls-default.txt-Debug]": [
+        {
+            "checksum": "88216f0abb4c1cfd8363944b71638cd9",
+            "size": 181,
+            "uri": "https://{canondata_backend}/1937367/b1382249c125d5ce281920d100a7d42d26fd00fa/resource.tar.gz#test.test_Optimizers-MemberOverJustOrNothingWithNulls-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MemberOverJustOrNothingWithNulls-default.txt-Results]": [
+        {
+            "checksum": "f93ec5bf36709a45ae4174e0fc252786",
+            "size": 310,
+            "uri": "https://{canondata_backend}/1937367/b1382249c125d5ce281920d100a7d42d26fd00fa/resource.tar.gz#test.test_Optimizers-MemberOverJustOrNothingWithNulls-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSort-default.txt-Debug]": [
+        {
+            "checksum": "acd9f75d4a39c2195751ac4abc4947c7",
+            "size": 241,
+            "uri": "https://{canondata_backend}/1937367/b1382249c125d5ce281920d100a7d42d26fd00fa/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSort-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSort-default.txt-Results]": [
+        {
+            "checksum": "c797528b8353e91f46b25d3fbe9fd592",
+            "size": 733,
+            "uri": "https://{canondata_backend}/1937367/b1382249c125d5ce281920d100a7d42d26fd00fa/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSort-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-SkipOverExtend-default.txt-Debug]": [
+        {
+            "checksum": "8364f39fc3f72b62cbd4d90a1ece0e46",
+            "size": 272,
+            "uri": "https://{canondata_backend}/1937424/b4387d8dab07e4227ff0822824f09a218e37d711/resource.tar.gz#test.test_Optimizers-SkipOverExtend-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-SkipOverExtend-default.txt-Results]": [
+        {
+            "checksum": "35deb33ad3d18ee45d04cc4910862ef7",
+            "size": 722,
+            "uri": "https://{canondata_backend}/1937424/b4387d8dab07e4227ff0822824f09a218e37d711/resource.tar.gz#test.test_Optimizers-SkipOverExtend-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Pure-PureLongList-default.txt-Debug]": [
+        {
+            "checksum": "1feb4f7e55b3f7ecbeaad0aa72df52f0",
+            "size": 3904,
+            "uri": "https://{canondata_backend}/1784826/97cba5f0cabdf400e2b4adf4a863ab1ab6535557/resource.tar.gz#test.test_Pure-PureLongList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-PureLongList-default.txt-Results]": [
+        {
+            "checksum": "fc465f08013509b96d66516bfe4dacf7",
+            "size": 25346,
+            "uri": "https://{canondata_backend}/1784826/97cba5f0cabdf400e2b4adf4a863ab1ab6535557/resource.tar.gz#test.test_Pure-PureLongList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Pure-PureStructList-default.txt-Debug]": [
+        {
+            "checksum": "9cac8905aae97b2f7bff329a4cf7f861",
+            "size": 279,
+            "uri": "https://{canondata_backend}/1784826/97cba5f0cabdf400e2b4adf4a863ab1ab6535557/resource.tar.gz#test.test_Pure-PureStructList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-PureStructList-default.txt-Results]": [
+        {
+            "checksum": "ed5f43db3012542ed34f87c52db3c184",
+            "size": 1371,
+            "uri": "https://{canondata_backend}/1784826/97cba5f0cabdf400e2b4adf4a863ab1ab6535557/resource.tar.gz#test.test_Pure-PureStructList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-TypeReflection-default.txt-Debug]": [
+        {
+            "checksum": "2803a201a609a72609f05586bb5a62a8",
+            "size": 786,
+            "uri": "https://{canondata_backend}/212715/e720d461e2c1b9046ffaa2fe1c1bebf888b9480f/resource.tar.gz#test.test_Result-TypeReflection-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-TypeReflection-default.txt-Results]": [
+        {
+            "checksum": "0aa207601a44f90bb338e5400efa3dca",
+            "size": 772,
+            "uri": "https://{canondata_backend}/212715/e720d461e2c1b9046ffaa2fe1c1bebf888b9480f/resource.tar.gz#test.test_Result-TypeReflection-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonGeneratorExprWithClosure--Debug]": [
+        {
+            "checksum": "3bb0b7f01a452e8b442e65a76096447b",
+            "size": 404,
+            "uri": "https://{canondata_backend}/1784826/954ce243c2caa105c0f2c9151f7e92ff1362cfb9/resource.tar.gz#test.test_Udf-PythonGeneratorExprWithClosure--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonGeneratorExprWithClosure--Results]": [
+        {
+            "checksum": "449d62fa0820fe5b2ae08079521c833b",
+            "size": 385,
+            "uri": "https://{canondata_backend}/1784826/954ce243c2caa105c0f2c9151f7e92ff1362cfb9/resource.tar.gz#test.test_Udf-PythonGeneratorExprWithClosure--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonPartialCall--Debug]": [
+        {
+            "checksum": "8019d91b3c55ada93d3d788a7afb73c7",
+            "size": 340,
+            "uri": "https://{canondata_backend}/1784826/954ce243c2caa105c0f2c9151f7e92ff1362cfb9/resource.tar.gz#test.test_Udf-PythonPartialCall--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonPartialCall--Results]": [
+        {
+            "checksum": "069f9233f1cb34fae701e6a23fec17ef",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1784826/954ce243c2caa105c0f2c9151f7e92ff1362cfb9/resource.tar.gz#test.test_Udf-PythonPartialCall--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonStruct--Debug]": [
+        {
+            "checksum": "5d2ccef5fafdaef33c6b0bc8a165d31a",
+            "size": 526,
+            "uri": "https://{canondata_backend}/1880306/ff0c10fe102aa5e6029b752ce9e7eb625b537269/resource.tar.gz#test.test_Udf-PythonStruct--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonStruct--Results]": [
+        {
+            "checksum": "06e63916b6df54f05cbc698ec99a6e03",
+            "size": 762,
+            "uri": "https://{canondata_backend}/1880306/ff0c10fe102aa5e6029b752ce9e7eb625b537269/resource.tar.gz#test.test_Udf-PythonStruct--Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part4/test.py b/yql/essentials/tests/s-expressions/minirun/part4/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part4/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part4/ya.make b/yql/essentials/tests/s-expressions/minirun/part4/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part4/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part5/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part5/canondata/result.json
new file mode 100644
index 0000000000..1d881da999
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part5/canondata/result.json
@@ -0,0 +1,649 @@
+{
+    "test.test[Builtins-DivePrefixMembersOpt-default.txt-Debug]": [
+        {
+            "checksum": "7c408ddcedc1deae859a58f6f29ff7fd",
+            "size": 443,
+            "uri": "https://{canondata_backend}/1031349/e1832e7080027dace8ce8c36f6d21a73f1577db4/resource.tar.gz#test.test_Builtins-DivePrefixMembersOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Builtins-DivePrefixMembersOpt-default.txt-Results]": [
+        {
+            "checksum": "6e26cbc39556c41bf9c60d2154e6c25a",
+            "size": 2810,
+            "uri": "https://{canondata_backend}/1031349/e1832e7080027dace8ce8c36f6d21a73f1577db4/resource.tar.gz#test.test_Builtins-DivePrefixMembersOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverDataTypes-default.txt-Debug]": [
+        {
+            "checksum": "251f00afec54bdd073072f07a89535fa",
+            "size": 1730,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-AlterToOverDataTypes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverDataTypes-default.txt-Results]": [
+        {
+            "checksum": "a5d7ab6adb09f302ecf6bca76f6bc205",
+            "size": 2301,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-AlterToOverDataTypes-default.txt-Results_/results.txt"
+        },
+        {
+            "uri": "file://test.test_Casts-AlterToOverDataTypes-default.txt-Results_/extracted"
+        }
+    ],
+    "test.test[Casts-SafeCastOverDict-default.txt-Debug]": [
+        {
+            "checksum": "895fb7078050148780d423e66c788df2",
+            "size": 478,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-SafeCastOverDict-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverDict-default.txt-Results]": [
+        {
+            "checksum": "745372396fb7d01f1a7060012147847e",
+            "size": 1318,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-SafeCastOverDict-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-SafeCastOverStream-default.txt-Debug]": [
+        {
+            "checksum": "8e57db3c902993544c20383559e19f6e",
+            "size": 521,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-SafeCastOverStream-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverStream-default.txt-Results]": [
+        {
+            "checksum": "d9ac55524ade8eee55ac1789bd0b6546",
+            "size": 1011,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-SafeCastOverStream-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-StrictCastOverList-default.txt-Debug]": [
+        {
+            "checksum": "3b78a77b592d794bd213a59f042d96a0",
+            "size": 517,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-StrictCastOverList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-StrictCastOverList-default.txt-Results]": [
+        {
+            "checksum": "3ba9cb4d283b991104dfb43fbb15c53b",
+            "size": 1233,
+            "uri": "https://{canondata_backend}/1597364/fd940ea52d3311cfd8557f831519e56e523d45f2/resource.tar.gz#test.test_Casts-StrictCastOverList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-EquiConvertToCommonTypeAlias-default.txt-Debug]": [
+        {
+            "checksum": "33dd18888c7e8ddda6d47f524ab90a63",
+            "size": 570,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-EquiConvertToCommonTypeAlias-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-EquiConvertToCommonTypeAlias-default.txt-Results]": [
+        {
+            "checksum": "b0f65bbacd7624e94be115d020d49278",
+            "size": 2720,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-EquiConvertToCommonTypeAlias-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemOpt1Opt2-default.txt-Debug]": [
+        {
+            "checksum": "6fab425c7eb72691262bf6b82c6f60fb",
+            "size": 2498,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemOpt1Opt2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemOpt1Opt2-default.txt-Results]": [
+        {
+            "checksum": "ef02b2222b900ba693fc1ab61d98191a",
+            "size": 41196,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemOpt1Opt2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumns-default.txt-Debug]": [
+        {
+            "checksum": "b8c571eda5a44e97927960f24e1dc670",
+            "size": 2489,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumns-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumns-default.txt-Results]": [
+        {
+            "checksum": "2f4ec878fc6f00b7eef52601c2819584",
+            "size": 28393,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumns-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumnsOpt1Opt2-default.txt-Debug]": [
+        {
+            "checksum": "080b8d1371ff507cb3451af6fc970f69",
+            "size": 2615,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumnsOpt1Opt2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumnsOpt1Opt2-default.txt-Results]": [
+        {
+            "checksum": "838b54bf989c6b4157420bc95e4133ad",
+            "size": 36697,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumnsOpt1Opt2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumnsOpt2-default.txt-Debug]": [
+        {
+            "checksum": "cfcda3eb16754f8b76ff9ff602347b6e",
+            "size": 2573,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumnsOpt2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumnsOpt2-default.txt-Results]": [
+        {
+            "checksum": "f73d046e5a60e87ff904422496e34fb5",
+            "size": 32713,
+            "uri": "https://{canondata_backend}/1942525/ebc309da64241c6f5f13249c90361edaa566a9cc/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumnsOpt2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[File-DifferentAliasesToOneFile--Debug]": [
+        {
+            "checksum": "ac5ed6f88340ca9a9e370e22c4ef1f2b",
+            "size": 217,
+            "uri": "https://{canondata_backend}/1871102/6baaf80ad19c5b6d33ed112a17fece03f35f78da/resource.tar.gz#test.test_File-DifferentAliasesToOneFile--Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-DifferentAliasesToOneFile--Results]": [
+        {
+            "checksum": "528de4fc5fb2a7cc06883cb6e39a1aec",
+            "size": 760,
+            "uri": "https://{canondata_backend}/1871102/6baaf80ad19c5b6d33ed112a17fece03f35f78da/resource.tar.gz#test.test_File-DifferentAliasesToOneFile--Results_/results.txt"
+        }
+    ],
+    "test.test[File-HomeFiles-default.txt-Debug]": [
+        {
+            "checksum": "e0943cab3ffff47c694ed3b06c6b5113",
+            "size": 285,
+            "uri": "https://{canondata_backend}/1871102/6baaf80ad19c5b6d33ed112a17fece03f35f78da/resource.tar.gz#test.test_File-HomeFiles-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-HomeFiles-default.txt-Results]": [
+        {
+            "checksum": "a388508a1483275fb187640eb5373cb4",
+            "size": 1880,
+            "uri": "https://{canondata_backend}/1871102/6baaf80ad19c5b6d33ed112a17fece03f35f78da/resource.tar.gz#test.test_File-HomeFiles-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByBinContent-default.txt-Debug]": [
+        {
+            "checksum": "7efe6169525ae0354ed58b759ac834a1",
+            "size": 642,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-AutoConvertByBinContent-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByBinContent-default.txt-Results]": [
+        {
+            "checksum": "3176dc6094278d128ee401b0d12592fc",
+            "size": 1986,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-AutoConvertByBinContent-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByContent-default.txt-Debug]": [
+        {
+            "checksum": "7efe6169525ae0354ed58b759ac834a1",
+            "size": 642,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-AutoConvertByContent-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByContent-default.txt-Results]": [
+        {
+            "checksum": "3176dc6094278d128ee401b0d12592fc",
+            "size": 1986,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-AutoConvertByContent-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByPlusContent-default.txt-Debug]": [
+        {
+            "checksum": "7efe6169525ae0354ed58b759ac834a1",
+            "size": 642,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-AutoConvertByPlusContent-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertByPlusContent-default.txt-Results]": [
+        {
+            "checksum": "3176dc6094278d128ee401b0d12592fc",
+            "size": 1986,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-AutoConvertByPlusContent-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideVariantLiteral-default.txt-Debug]": [
+        {
+            "checksum": "2922683ee7b685f7a84d6cedb953fada",
+            "size": 764,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-InsideVariantLiteral-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideVariantLiteral-default.txt-Results]": [
+        {
+            "checksum": "86247de11438fb1f79352b800a4692c0",
+            "size": 4959,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-InsideVariantLiteral-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-NarrowStruct-default.txt-Debug]": [
+        {
+            "checksum": "a7f2d2630b095714ce9e2d3db6b84bc1",
+            "size": 197,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-NarrowStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-NarrowStruct-default.txt-Results]": [
+        {
+            "checksum": "410ec645513e2397900d8d6d8a92e9c6",
+            "size": 984,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-NarrowStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-Substring-default.txt-Debug]": [
+        {
+            "checksum": "fd04387caba906d735a63e851835c5e3",
+            "size": 176,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-Substring-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-Substring-default.txt-Results]": [
+        {
+            "checksum": "931465ecfa1dea17f4eba4bdc257df5f",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1937492/ece2134471eafcc2931a0ee897e1543bb6e03f35/resource.tar.gz#test.test_ImplictCasts-Substring-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Collect-default.txt-Debug]": [
+        {
+            "checksum": "9fcf4cb8789d9a54a945e2e2ca7cf8dd",
+            "size": 233,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-Collect-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Collect-default.txt-Results]": [
+        {
+            "checksum": "deef6c2b0dec2f8d8702fb0db3d29b29",
+            "size": 734,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-Collect-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-CompareStruct2-default.txt-Debug]": [
+        {
+            "checksum": "aafd80cf90a10b7f60253789bfaa813e",
+            "size": 807,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-CompareStruct2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-CompareStruct2-default.txt-Results]": [
+        {
+            "checksum": "847a482fcf89d73082779a461718c96d",
+            "size": 1751,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-CompareStruct2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Fold-default.txt-Debug]": [
+        {
+            "checksum": "3cf721a14fa47fd67c1967d58d82a7c2",
+            "size": 714,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-Fold-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Fold-default.txt-Results]": [
+        {
+            "checksum": "43fd80e99df7150ab020b72357b7a943",
+            "size": 1876,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-Fold-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ListExtendMany-default.txt-Debug]": [
+        {
+            "checksum": "f29c9b840ae38e9e53230071e5129ac4",
+            "size": 419,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-ListExtendMany-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ListExtendMany-default.txt-Results]": [
+        {
+            "checksum": "40a0b638b6c372369a17e1336d61d4ec",
+            "size": 1350,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-ListExtendMany-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-PartitionByKey-default.txt-Debug]": [
+        {
+            "checksum": "c63882b73a4fac4cbc12304f6aee8172",
+            "size": 515,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-PartitionByKey-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-PartitionByKey-default.txt-Results]": [
+        {
+            "checksum": "4d3de795072fd8f1b3505f6275bc1b93",
+            "size": 277,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-PartitionByKey-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-PartitionsByKeysSorted-default.txt-Debug]": [
+        {
+            "checksum": "db16717b129d3e97effa8f51b1852fc0",
+            "size": 558,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-PartitionsByKeysSorted-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-PartitionsByKeysSorted-default.txt-Results]": [
+        {
+            "checksum": "20b62fca5b0e72f0ca2df54d7d61a5e2",
+            "size": 337,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-PartitionsByKeysSorted-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamSkip-default.txt-Debug]": [
+        {
+            "checksum": "d613fb24f11373190c70d53e4f325452",
+            "size": 309,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-StreamSkip-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamSkip-default.txt-Results]": [
+        {
+            "checksum": "b22b2afad209a6f5c5605672f32220e5",
+            "size": 672,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-StreamSkip-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamTake-default.txt-Debug]": [
+        {
+            "checksum": "d077c95962aacbbc0c88d372a434e0df",
+            "size": 310,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-StreamTake-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamTake-default.txt-Results]": [
+        {
+            "checksum": "7a7dc6469a6022c82707d46fce459e6f",
+            "size": 644,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-StreamTake-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ToDictOpt-default.txt-Debug]": [
+        {
+            "checksum": "6325bcb6f8b15acbaa07f6d758f18d9c",
+            "size": 3046,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-ToDictOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ToDictOpt-default.txt-Results]": [
+        {
+            "checksum": "5aacc0817d9e6b724761e94a014baf62",
+            "size": 7210,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-ToDictOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-VariantItem-default.txt-Debug]": [
+        {
+            "checksum": "2767a5a09cb3ec23c8a2f338591d87f3",
+            "size": 2165,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-VariantItem-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-VariantItem-default.txt-Results]": [
+        {
+            "checksum": "f458335f540625f7a52a836296063ad1",
+            "size": 4708,
+            "uri": "https://{canondata_backend}/1936842/0e8399ea57053215a346dc8ce52f4206386c19fb/resource.tar.gz#test.test_InMem-VariantItem-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Count_All-default.txt-Debug]": [
+        {
+            "checksum": "8e710aa2072e0a17092c668139405ddc",
+            "size": 524,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Count_All-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Count_All-default.txt-Results]": [
+        {
+            "checksum": "910c2b7da651b3862a0087b2111123ce",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Count_All-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Count_Opt-default.txt-Debug]": [
+        {
+            "checksum": "af717e576876c21c009a50e0c181af1d",
+            "size": 792,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Count_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Count_Opt-default.txt-Results]": [
+        {
+            "checksum": "55d0e8d7bf60080cd8c59b3012ead903",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Count_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_All_Opt-default.txt-Debug]": [
+        {
+            "checksum": "e12984d056becea79b3fcb39497b3d69",
+            "size": 742,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_All_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_All_Opt-default.txt-Results]": [
+        {
+            "checksum": "c187891e293159fefd11ffd094848441",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_All_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Max-default.txt-Debug]": [
+        {
+            "checksum": "75383210ad15bdd7b3bb1b8d331d7b8a",
+            "size": 628,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Distinct_Max-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Max-default.txt-Results]": [
+        {
+            "checksum": "3affccca1b12590589082884e01f1cee",
+            "size": 1163,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Distinct_Max-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Some-default.txt-Debug]": [
+        {
+            "checksum": "8da99a898db6edddfb933e9840bfd021",
+            "size": 638,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Distinct_Some-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Some-default.txt-Results]": [
+        {
+            "checksum": "054ebecaa802f05387aae1b2b68a612f",
+            "size": 1163,
+            "uri": "https://{canondata_backend}/1937367/3c94ae37e0750989f72a855b4195fa2c00eb9da1/resource.tar.gz#test.test_Lib-Agg_Distinct_Some-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-CondenseOneItemTuple-default.txt-Debug]": [
+        {
+            "checksum": "d589e4bd473d1a7c861ba3b5f8f0a3ef",
+            "size": 308,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-CondenseOneItemTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-CondenseOneItemTuple-default.txt-Results]": [
+        {
+            "checksum": "c8ec123f40a66415e1898ad4eadc525a",
+            "size": 548,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-CondenseOneItemTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenCondense1-default.txt-Debug]": [
+        {
+            "checksum": "26d35f4a9dc1b155ae255d1efa12fa22",
+            "size": 294,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-ConstMapThenCondense1-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenCondense1-default.txt-Results]": [
+        {
+            "checksum": "2151e100ada389bc28de9c7e0259186b",
+            "size": 333,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-ConstMapThenCondense1-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-EquivInsideNestedLambdaOuterDiffLevel-default.txt-Debug]": [
+        {
+            "checksum": "e14a4c65daad2ea74c175daf4d81dd1e",
+            "size": 535,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-EquivInsideNestedLambdaOuterDiffLevel-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-EquivInsideNestedLambdaOuterDiffLevel-default.txt-Results]": [
+        {
+            "checksum": "299f4b2d849acf2c369375101fab9d91",
+            "size": 1111,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-EquivInsideNestedLambdaOuterDiffLevel-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ExpandAddRemoveMember-default.txt-Debug]": [
+        {
+            "checksum": "c0a0c9fb3ce386fc650390f3dc6675fb",
+            "size": 398,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-ExpandAddRemoveMember-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ExpandAddRemoveMember-default.txt-Results]": [
+        {
+            "checksum": "4a155b29354ea7a043f63adef04cf7d7",
+            "size": 1898,
+            "uri": "https://{canondata_backend}/1130705/e27ee360d23431ab443c695912675aeff5c666da/resource.tar.gz#test.test_Optimizers-ExpandAddRemoveMember-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatmapsWithOptionalIf-default.txt-Debug]": [
+        {
+            "checksum": "32b477a05656832c61a75dd316baf982",
+            "size": 1104,
+            "uri": "https://{canondata_backend}/1031349/e775ea070d44786f7a487ac7371f162b2010f0b6/resource.tar.gz#test.test_Optimizers-FuseFlatmapsWithOptionalIf-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatmapsWithOptionalIf-default.txt-Results]": [
+        {
+            "checksum": "3645f340c69e1b8dc3c5ddc52afce468",
+            "size": 1910,
+            "uri": "https://{canondata_backend}/1031349/e775ea070d44786f7a487ac7371f162b2010f0b6/resource.tar.gz#test.test_Optimizers-FuseFlatmapsWithOptionalIf-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FuseMultipliersFlatmaps-default.txt-Debug]": [
+        {
+            "checksum": "0f4241f88e53af4cb58c1753dd901007",
+            "size": 477,
+            "uri": "https://{canondata_backend}/1031349/e775ea070d44786f7a487ac7371f162b2010f0b6/resource.tar.gz#test.test_Optimizers-FuseMultipliersFlatmaps-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FuseMultipliersFlatmaps-default.txt-Results]": [
+        {
+            "checksum": "aabdf9b2a8091b26e0098e0e2b933cd9",
+            "size": 4532,
+            "uri": "https://{canondata_backend}/1031349/e775ea070d44786f7a487ac7371f162b2010f0b6/resource.tar.gz#test.test_Optimizers-FuseMultipliersFlatmaps-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverTake-default.txt-Debug]": [
+        {
+            "checksum": "353c66ef94262c03e82609056a7435bf",
+            "size": 150,
+            "uri": "https://{canondata_backend}/1775319/4853c35082216c826105aae8f4cce32b381019a3/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverTake-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverTake-default.txt-Results]": [
+        {
+            "checksum": "f16c7adba7f91862fa4e0f9542be7076",
+            "size": 660,
+            "uri": "https://{canondata_backend}/1775319/4853c35082216c826105aae8f4cce32b381019a3/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverTake-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-VisitAllEqualLambdas-default.txt-Debug]": [
+        {
+            "checksum": "d507275746491c45cbc87ed0027c20b2",
+            "size": 402,
+            "uri": "https://{canondata_backend}/1775319/b7f2999078d6075a080c3773f60862807cb7b630/resource.tar.gz#test.test_Optimizers-VisitAllEqualLambdas-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-VisitAllEqualLambdas-default.txt-Results]": [
+        {
+            "checksum": "132c354edd7910a34c795a58491832ad",
+            "size": 395,
+            "uri": "https://{canondata_backend}/1775319/b7f2999078d6075a080c3773f60862807cb7b630/resource.tar.gz#test.test_Optimizers-VisitAllEqualLambdas-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-VisitOverVisit-default.txt-Debug]": [
+        {
+            "checksum": "6f1f18f509a4aaf08cb7e58a85597463",
+            "size": 1079,
+            "uri": "https://{canondata_backend}/1775319/b7f2999078d6075a080c3773f60862807cb7b630/resource.tar.gz#test.test_Optimizers-VisitOverVisit-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-VisitOverVisit-default.txt-Results]": [
+        {
+            "checksum": "f089dcde64e8dbe800a61ae66191b93c",
+            "size": 1448,
+            "uri": "https://{canondata_backend}/1775319/b7f2999078d6075a080c3773f60862807cb7b630/resource.tar.gz#test.test_Optimizers-VisitOverVisit-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-ListTakeOption-default.txt-Debug]": [
+        {
+            "checksum": "9b8c5aba706b1aedf73daddea623a14b",
+            "size": 185,
+            "uri": "https://{canondata_backend}/1942415/81e53b5a1f7564e550bfd18ea8e0ed35fe07cb9c/resource.tar.gz#test.test_Result-ListTakeOption-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-ListTakeOption-default.txt-Results]": [
+        {
+            "checksum": "00ba51a4e368e5fa8e4a928ad6c268ef",
+            "size": 205,
+            "uri": "https://{canondata_backend}/1942415/81e53b5a1f7564e550bfd18ea8e0ed35fe07cb9c/resource.tar.gz#test.test_Result-ListTakeOption-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-Pure-default.txt-Debug]": [
+        {
+            "checksum": "a5655565789a6a73fc13a279c0375ce9",
+            "size": 1308,
+            "uri": "https://{canondata_backend}/1781765/238e4d1bd45b5a6a2818dea6aec53cbe1c00c5ed/resource.tar.gz#test.test_Result-Pure-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-Pure-default.txt-Results]": [
+        {
+            "checksum": "4b3c2c675ddc3732a4c795b6d887f693",
+            "size": 9486,
+            "uri": "https://{canondata_backend}/1781765/238e4d1bd45b5a6a2818dea6aec53cbe1c00c5ed/resource.tar.gz#test.test_Result-Pure-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-LambdaAsCallable--Debug]": [
+        {
+            "checksum": "8e3eefd92010c5ac541f6f442142c5b0",
+            "size": 588,
+            "uri": "https://{canondata_backend}/1880306/3c2f28f5521ae9dbe32af747da37ff19927caf45/resource.tar.gz#test.test_Udf-LambdaAsCallable--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-LambdaAsCallable--Results]": [
+        {
+            "checksum": "76c76b8026126aa6902588def1dba3c9",
+            "size": 213,
+            "uri": "https://{canondata_backend}/1880306/3c2f28f5521ae9dbe32af747da37ff19927caf45/resource.tar.gz#test.test_Udf-LambdaAsCallable--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-NamedApply-default.txt-Debug]": [
+        {
+            "checksum": "34d60897998f6479e0708aeddd69f273",
+            "size": 1718,
+            "uri": "https://{canondata_backend}/1880306/3c2f28f5521ae9dbe32af747da37ff19927caf45/resource.tar.gz#test.test_Udf-NamedApply-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-NamedApply-default.txt-Results]": [
+        {
+            "checksum": "b12200136c608a6d79af95f5363ee588",
+            "size": 2030,
+            "uri": "https://{canondata_backend}/1880306/3c2f28f5521ae9dbe32af747da37ff19927caf45/resource.tar.gz#test.test_Udf-NamedApply-default.txt-Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part5/canondata/test.test_Casts-AlterToOverDataTypes-default.txt-Results_/extracted b/yql/essentials/tests/s-expressions/minirun/part5/canondata/test.test_Casts-AlterToOverDataTypes-default.txt-Results_/extracted
new file mode 100644
index 0000000000..2094d59c70
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part5/canondata/test.test_Casts-AlterToOverDataTypes-default.txt-Results_/extracted
@@ -0,0 +1,32 @@
+<tmp_path>/program.yql:<main>: Warning: Execution
+
+    <tmp_path>/program.yql:/home/alterto.yql:6:23: Warning: At function: FlatMap, At function: Just, At function: IfPresent, At function: StrictCast
+    	(let config (DataSource 'config))
+	                      ^
+        <tmp_path>/program.yql:<main>:19:59: Warning: Consider using RemoveTimezone to convert into UTC time
+        	(let world (Apply (bind alterto_module 'doAlterTo) world (TzTimestamp '"1546992000000000,GMT") (DataType 'Date) (Date '3)))
+	                                                          ^
+    <tmp_path>/program.yql:/home/alterto.yql:6:23: Warning: At function: FlatMap, At function: Just, At function: IfPresent, At function: StrictCast
+    	(let config (DataSource 'config))
+	                      ^
+        <tmp_path>/program.yql:<main>:20:59: Warning: Consider using RemoveTimezone to convert into UTC time
+        	(let world (Apply (bind alterto_module 'doAlterTo) world (TzTimestamp '"1546992000000001,GMT") (DataType 'Date) (Date '4)))
+	                                                          ^
+    <tmp_path>/program.yql:/home/alterto.yql:6:23: Warning: At function: FlatMap, At function: Just, At function: IfPresent, At function: StrictCast
+    	(let config (DataSource 'config))
+	                      ^
+        <tmp_path>/program.yql:<main>:22:59: Warning: Consider using RemoveTimezone to convert into UTC time
+        	(let world (Apply (bind alterto_module 'doAlterTo) world (TzTimestamp '"1546981200000000,Europe/Moscow") (DataType 'Date) (Date '5)))
+	                                                          ^
+    <tmp_path>/program.yql:/home/alterto.yql:6:23: Warning: At function: FlatMap, At function: Just, At function: IfPresent, At function: StrictCast
+    	(let config (DataSource 'config))
+	                      ^
+        <tmp_path>/program.yql:<main>:24:59: Warning: Consider using RemoveTimezone to convert into UTC time
+        	(let world (Apply (bind alterto_module 'doAlterTo) world (TzTimestamp '"1546992000000000,Europe/Moscow") (DataType 'Date) (Date '6)))
+	                                                          ^
+    <tmp_path>/program.yql:/home/alterto.yql:6:23: Warning: At function: FlatMap, At function: Just, At function: IfPresent, At function: StrictCast
+    	(let config (DataSource 'config))
+	                      ^
+        <tmp_path>/program.yql:<main>:25:59: Warning: Consider using RemoveTimezone to convert into UTC time
+        	(let world (Apply (bind alterto_module 'doAlterTo) world (TzTimestamp '"1546992000000001,Europe/Moscow") (DataType 'Date) (Date '7)))
+	                                                          ^
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/minirun/part5/test.py b/yql/essentials/tests/s-expressions/minirun/part5/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part5/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part5/ya.make b/yql/essentials/tests/s-expressions/minirun/part5/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part5/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part6/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part6/canondata/result.json
new file mode 100644
index 0000000000..94d6ce22ca
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part6/canondata/result.json
@@ -0,0 +1,660 @@
+{
+    "test.test[Casts-SafeCastOverStruct-default.txt-Debug]": [
+        {
+            "checksum": "e4692bd023e956d7b27c10f4c65b155a",
+            "size": 512,
+            "uri": "https://{canondata_backend}/1936997/9e20941ea5129087d78700f99b8d28296062432f/resource.tar.gz#test.test_Casts-SafeCastOverStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverStruct-default.txt-Results]": [
+        {
+            "checksum": "698841c9c913bceff14b6498078b14d6",
+            "size": 2423,
+            "uri": "https://{canondata_backend}/1936997/9e20941ea5129087d78700f99b8d28296062432f/resource.tar.gz#test.test_Casts-SafeCastOverStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-StrictCastOverVariant-default.txt-Debug]": [
+        {
+            "checksum": "2a813714c95e800e85493029a927a1d3",
+            "size": 840,
+            "uri": "https://{canondata_backend}/1936997/9e20941ea5129087d78700f99b8d28296062432f/resource.tar.gz#test.test_Casts-StrictCastOverVariant-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-StrictCastOverVariant-default.txt-Results]": [
+        {
+            "checksum": "da85667a4585e4f0d4be5905f7239e65",
+            "size": 3562,
+            "uri": "https://{canondata_backend}/1936997/9e20941ea5129087d78700f99b8d28296062432f/resource.tar.gz#test.test_Casts-StrictCastOverVariant-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Config-DataSources-default.txt-Debug]": [
+        {
+            "checksum": "0435c94cad38b76fdc424a9cb1970b90",
+            "size": 200,
+            "uri": "https://{canondata_backend}/1871102/441b12fc1db44027bdccaf13c67956b7eb10ab97/resource.tar.gz#test.test_Config-DataSources-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Config-DataSources-default.txt-Results]": [
+        {
+            "checksum": "ec2a2ec8d3b155be221ac79f9c82e5a7",
+            "size": 203,
+            "uri": "https://{canondata_backend}/1777230/2f576fca9b0ae86029eb18255a004de1e2ecdf2b/resource.tar.gz#test.test_Config-DataSources-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem3Alias12-default.txt-Debug]": [
+        {
+            "checksum": "61be68f72bfd019227c087c4d058c3b2",
+            "size": 4068,
+            "uri": "https://{canondata_backend}/1942525/03f327593648b37dc4a00dc0267d6412ab0962f1/resource.tar.gz#test.test_EquiJoin-JoinInMem3Alias12-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem3Alias12-default.txt-Results]": [
+        {
+            "checksum": "3e4bb391745a492a5f5a259a1ab64291",
+            "size": 73208,
+            "uri": "https://{canondata_backend}/1942525/03f327593648b37dc4a00dc0267d6412ab0962f1/resource.tar.gz#test.test_EquiJoin-JoinInMem3Alias12-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasOne1-default.txt-Debug]": [
+        {
+            "checksum": "5be53c71388529756046a5dbacdaca37",
+            "size": 2231,
+            "uri": "https://{canondata_backend}/1942525/03f327593648b37dc4a00dc0267d6412ab0962f1/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasOne1-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasOne1-default.txt-Results]": [
+        {
+            "checksum": "838dfa8f8fe2222319e23a66215dbc24",
+            "size": 25904,
+            "uri": "https://{canondata_backend}/1942525/03f327593648b37dc4a00dc0267d6412ab0962f1/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasOne1-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasTwo12-default.txt-Debug]": [
+        {
+            "checksum": "2805c93bff52bc834da601b4119a2972",
+            "size": 2273,
+            "uri": "https://{canondata_backend}/1942525/03f327593648b37dc4a00dc0267d6412ab0962f1/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasTwo12-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasTwo12-default.txt-Results]": [
+        {
+            "checksum": "c45b9307b90ee1d43726c0f074174f8f",
+            "size": 25904,
+            "uri": "https://{canondata_backend}/1942525/03f327593648b37dc4a00dc0267d6412ab0962f1/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasTwo12-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[File-ConfigureFileFromUrl-default.txt-Debug]": [
+        {
+            "checksum": "06b6c365462b3f67076b04fa1fc55938",
+            "size": 595,
+            "uri": "https://{canondata_backend}/1931696/bd1433ec3ae467c206d6085ff07e1337a1f67ddd/resource.tar.gz#test.test_File-ConfigureFileFromUrl-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-ConfigureFileFromUrl-default.txt-Results]": [
+        {
+            "checksum": "4d9e23c61e1b137f3209c3e4b6537954",
+            "size": 2156,
+            "uri": "https://{canondata_backend}/1931696/bd1433ec3ae467c206d6085ff07e1337a1f67ddd/resource.tar.gz#test.test_File-ConfigureFileFromUrl-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoJust-default.txt-Debug]": [
+        {
+            "checksum": "beadfb53ebeedb9c0f480fb16a56f5e8",
+            "size": 173,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-AutoJust-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoJust-default.txt-Results]": [
+        {
+            "checksum": "c71f74a7ba286f3289115557052e01e7",
+            "size": 778,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-AutoJust-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-Enumerate-default.txt-Debug]": [
+        {
+            "checksum": "9b532d67a7a2e49ab25ba9c164fa9128",
+            "size": 193,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-Enumerate-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-Enumerate-default.txt-Results]": [
+        {
+            "checksum": "0fd37699cdb4f852aaa40f3c45bc90b7",
+            "size": 823,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-Enumerate-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverOptional-default.txt-Debug]": [
+        {
+            "checksum": "d08ada699b31f4a7dba0eff37b1ba1da",
+            "size": 390,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverOptional-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverOptional-default.txt-Results]": [
+        {
+            "checksum": "3e1247fd8546021292bedc6c0722c02f",
+            "size": 544,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverOptional-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverVariantStruct-default.txt-Debug]": [
+        {
+            "checksum": "b9ed00b8588e6624d5d7dc70a3ae9ac6",
+            "size": 415,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverVariantStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-ImplicitEqualsOverVariantStruct-default.txt-Results]": [
+        {
+            "checksum": "bde2e92f20ef7573eadf6a1a93dd9973",
+            "size": 377,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-ImplicitEqualsOverVariantStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideOptLiteral-default.txt-Debug]": [
+        {
+            "checksum": "06048fd6ec8e183a7cb5417b36d77c7a",
+            "size": 161,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-InsideOptLiteral-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideOptLiteral-default.txt-Results]": [
+        {
+            "checksum": "1edc240f245e3bca537518c3fd4cf087",
+            "size": 556,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-InsideOptLiteral-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-NullAsOpt-default.txt-Debug]": [
+        {
+            "checksum": "3212c04ec3ff869701e0b829929b9c49",
+            "size": 266,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-NullAsOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-NullAsOpt-default.txt-Results]": [
+        {
+            "checksum": "6cdc7737012b39adcfb743a4a0c2c80a",
+            "size": 102,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-NullAsOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-Shift-default.txt-Debug]": [
+        {
+            "checksum": "96549b723df7135a9927cdf607617cd8",
+            "size": 789,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-Shift-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-Shift-default.txt-Results]": [
+        {
+            "checksum": "a34de29065542bc563baf005cebbee93",
+            "size": 1954,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-Shift-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-Skip-default.txt-Debug]": [
+        {
+            "checksum": "aec495ed7fdd51aeef414697c2125a89",
+            "size": 133,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-Skip-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-Skip-default.txt-Results]": [
+        {
+            "checksum": "5e37ee6d3e989b237570216290194006",
+            "size": 333,
+            "uri": "https://{canondata_backend}/1936273/30fa1084fc96ad0571c60e93e2296013c68e7651/resource.tar.gz#test.test_ImplictCasts-Skip-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-CompareNulls-default.txt-Debug]": [
+        {
+            "checksum": "78d133421a87f52deb34896a6ad2fae5",
+            "size": 894,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-CompareNulls-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-CompareNulls-default.txt-Results]": [
+        {
+            "checksum": "b431c63af708f348670e4d52f38ceee4",
+            "size": 1964,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-CompareNulls-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-FilterNullMembers-default.txt-Debug]": [
+        {
+            "checksum": "643eaac885e83793abb12d602bed736b",
+            "size": 287,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-FilterNullMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-FilterNullMembers-default.txt-Results]": [
+        {
+            "checksum": "896fabcd81831837250084dce6a92a8f",
+            "size": 954,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-FilterNullMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-FloatsMod-default.txt-Debug]": [
+        {
+            "checksum": "88c615ac631f2a94e22ad34f8f077dbe",
+            "size": 390,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-FloatsMod-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-FloatsMod-default.txt-Results]": [
+        {
+            "checksum": "da433037b5d9d3279247a2256a6d632a",
+            "size": 744,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-FloatsMod-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Fold1MapOverPreservedStream-default.txt-Debug]": [
+        {
+            "checksum": "9e54dd10cf86dcc5c6296be219a11190",
+            "size": 1371,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-Fold1MapOverPreservedStream-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Fold1MapOverPreservedStream-default.txt-Results]": [
+        {
+            "checksum": "778813a3237b69ba370b041c57498601",
+            "size": 2555,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-Fold1MapOverPreservedStream-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-MemberOpt-default.txt-Debug]": [
+        {
+            "checksum": "a176b72f52fa6861a290d25d7c7ee4d3",
+            "size": 482,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-MemberOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-MemberOpt-default.txt-Results]": [
+        {
+            "checksum": "ac4176372c113532ce007d91bf7161a5",
+            "size": 470,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-MemberOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-PartitionByKeySorted-default.txt-Debug]": [
+        {
+            "checksum": "a8535d605f26bf224dea1609b8d86007",
+            "size": 545,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-PartitionByKeySorted-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-PartitionByKeySorted-default.txt-Results]": [
+        {
+            "checksum": "84818bb62486355e33995cd36e7757fc",
+            "size": 277,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-PartitionByKeySorted-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-QueueRangeWithPreservedStream-default.txt-Debug]": [
+        {
+            "checksum": "297cc38af2fc096207d70cbccf33f5ac",
+            "size": 517,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-QueueRangeWithPreservedStream-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-QueueRangeWithPreservedStream-default.txt-Results]": [
+        {
+            "checksum": "7663c0fc66d780fd1127e3133cb746ad",
+            "size": 3984,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-QueueRangeWithPreservedStream-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Seq-default.txt-Debug]": [
+        {
+            "checksum": "1bf2ed8f8206dd7c691aa2629886f850",
+            "size": 626,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-Seq-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Seq-default.txt-Results]": [
+        {
+            "checksum": "cf8f75a7fd7064785eab789b806fd6c7",
+            "size": 1656,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-Seq-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-SortOptTuple-default.txt-Debug]": [
+        {
+            "checksum": "ebd40b8faa939e6990698ad86aa27787",
+            "size": 441,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-SortOptTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-SortOptTuple-default.txt-Results]": [
+        {
+            "checksum": "fdd0639904c126ddab563cf1bd75dd3d",
+            "size": 1071,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-SortOptTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamFoldMap-default.txt-Debug]": [
+        {
+            "checksum": "02cf7d8ee59a1c341288505b8f3bdeae",
+            "size": 493,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-StreamFoldMap-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamFoldMap-default.txt-Results]": [
+        {
+            "checksum": "2c540a5c41be99b332b8dab463c4bebd",
+            "size": 1557,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-StreamFoldMap-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamInGroupByKey-default.txt-Debug]": [
+        {
+            "checksum": "13afe48c44d088368bf1f5404dce1d9c",
+            "size": 313,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-StreamInGroupByKey-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamInGroupByKey-default.txt-Results]": [
+        {
+            "checksum": "1b2fa390b9ca337f45b0f25a5e7d8c11",
+            "size": 408,
+            "uri": "https://{canondata_backend}/1936842/f5a1ea9d18320a4808b27dd027dc32e6269e8d5b/resource.tar.gz#test.test_InMem-StreamInGroupByKey-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedLeft_Flow-default.txt-Debug]": [
+        {
+            "checksum": "724296e253aa29c2c55e947e707a7080",
+            "size": 4949,
+            "uri": "https://{canondata_backend}/1936842/91c773d35d2761f0f31e434b1568be4fbacb1da4/resource.tar.gz#test.test_Join-CommonJoinCoreSortedLeft_Flow-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedLeft_Flow-default.txt-Results]": [
+        {
+            "checksum": "4bb2d1e196b5a811b23fb9af2cb7cca6",
+            "size": 57226,
+            "uri": "https://{canondata_backend}/1936842/91c773d35d2761f0f31e434b1568be4fbacb1da4/resource.tar.gz#test.test_Join-CommonJoinCoreSortedLeft_Flow-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-MapJoinCore_FlowOfTuples-default.txt-Debug]": [
+        {
+            "checksum": "34bc9e3acb4a03e3d5bdc2dd54978950",
+            "size": 1516,
+            "uri": "https://{canondata_backend}/1936842/91c773d35d2761f0f31e434b1568be4fbacb1da4/resource.tar.gz#test.test_Join-MapJoinCore_FlowOfTuples-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-MapJoinCore_FlowOfTuples-default.txt-Results]": [
+        {
+            "checksum": "1b5cd66f9a194e6b9c2adb138f4e65a2",
+            "size": 10638,
+            "uri": "https://{canondata_backend}/1936842/91c773d35d2761f0f31e434b1568be4fbacb1da4/resource.tar.gz#test.test_Join-MapJoinCore_FlowOfTuples-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Bit_Xor-default.txt-Debug]": [
+        {
+            "checksum": "eeeb136589320117e2c8872f8494a17c",
+            "size": 711,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Bit_Xor-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Bit_Xor-default.txt-Results]": [
+        {
+            "checksum": "e16dce7922cce8890008f85b63487545",
+            "size": 1162,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Bit_Xor-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Count-default.txt-Debug]": [
+        {
+            "checksum": "3b95e8bda0c9217e8f10a3ed95c15d2f",
+            "size": 504,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Count-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Count-default.txt-Results]": [
+        {
+            "checksum": "910c2b7da651b3862a0087b2111123ce",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Count-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List_Min_By-default.txt-Debug]": [
+        {
+            "checksum": "bbd4c4ab1030f55c70134d8347df5258",
+            "size": 1277,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_List_Min_By-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List_Min_By-default.txt-Results]": [
+        {
+            "checksum": "a4ffbdb08aba091485448216dae2367c",
+            "size": 1213,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_List_Min_By-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Max_By_Opt-default.txt-Debug]": [
+        {
+            "checksum": "6bc488b9f0e8d25bfed49aade9615347",
+            "size": 1341,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Max_By_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Max_By_Opt-default.txt-Results]": [
+        {
+            "checksum": "78b61b049c123b2ed33ead6e763d0154",
+            "size": 857,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Max_By_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Max_Opt-default.txt-Debug]": [
+        {
+            "checksum": "e1a7bdadb478645d702fc60eb293c0af",
+            "size": 761,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Max_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Max_Opt-default.txt-Results]": [
+        {
+            "checksum": "5d2a85891b7a1f792913d4cf8a27b76b",
+            "size": 1408,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Max_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Min_By_Opt-default.txt-Debug]": [
+        {
+            "checksum": "d4c4c03a586b190bdd84a0d1701fc462",
+            "size": 1301,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Min_By_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Min_By_Opt-default.txt-Results]": [
+        {
+            "checksum": "57f77c4680488748ecdc4c1d789a3fb6",
+            "size": 857,
+            "uri": "https://{canondata_backend}/1920236/8b9939a6f527c26c382a127453599153e513377f/resource.tar.gz#test.test_Lib-Agg_Min_By_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-BinaryDataLiterals-default.txt-Debug]": [
+        {
+            "checksum": "6654e4fd03493f8379826008552edf65",
+            "size": 395,
+            "uri": "https://{canondata_backend}/1814674/670348067493992aee551efb5ba46335eaee5e92/resource.tar.gz#test.test_Optimizers-BinaryDataLiterals-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-BinaryDataLiterals-default.txt-Results]": [
+        {
+            "checksum": "d44ea2781630b4178a718a454afca9dc",
+            "size": 383,
+            "uri": "https://{canondata_backend}/1814674/670348067493992aee551efb5ba46335eaee5e92/resource.tar.gz#test.test_Optimizers-BinaryDataLiterals-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenCondense-default.txt-Debug]": [
+        {
+            "checksum": "1706ab6d7a8c15158a13a885aee8d904",
+            "size": 273,
+            "uri": "https://{canondata_backend}/1937429/7f072688ae435ae6f26bfd99cca55f38b3884bf2/resource.tar.gz#test.test_Optimizers-ConstMapThenCondense-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenCondense-default.txt-Results]": [
+        {
+            "checksum": "2151e100ada389bc28de9c7e0259186b",
+            "size": 333,
+            "uri": "https://{canondata_backend}/1937429/7f072688ae435ae6f26bfd99cca55f38b3884bf2/resource.tar.gz#test.test_Optimizers-ConstMapThenCondense-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenFold-default.txt-Debug]": [
+        {
+            "checksum": "ff530e8f10e7872dbb72dd4b0e68b84e",
+            "size": 185,
+            "uri": "https://{canondata_backend}/1937429/7f072688ae435ae6f26bfd99cca55f38b3884bf2/resource.tar.gz#test.test_Optimizers-ConstMapThenFold-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-ConstMapThenFold-default.txt-Results]": [
+        {
+            "checksum": "05de141de04c24e9e5aa5bd59ab3e54e",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1937429/7f072688ae435ae6f26bfd99cca55f38b3884bf2/resource.tar.gz#test.test_Optimizers-ConstMapThenFold-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-EquivNodeInNestedLambda-default.txt-Debug]": [
+        {
+            "checksum": "93880ad889df77bc2f869389ddf93605",
+            "size": 372,
+            "uri": "https://{canondata_backend}/1937429/7f072688ae435ae6f26bfd99cca55f38b3884bf2/resource.tar.gz#test.test_Optimizers-EquivNodeInNestedLambda-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-EquivNodeInNestedLambda-default.txt-Results]": [
+        {
+            "checksum": "f14952ef8a06ac1a690f6a32a2fbf08c",
+            "size": 362,
+            "uri": "https://{canondata_backend}/1937429/7f072688ae435ae6f26bfd99cca55f38b3884bf2/resource.tar.gz#test.test_Optimizers-EquivNodeInNestedLambda-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatMapWithExtractMembers-default.txt-Debug]": [
+        {
+            "checksum": "1e2664d12958b59b4802bf7e47791c9a",
+            "size": 300,
+            "uri": "https://{canondata_backend}/1031349/4922c900f34c05383e0bb9e25918e6733d37d501/resource.tar.gz#test.test_Optimizers-FuseFlatMapWithExtractMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatMapWithExtractMembers-default.txt-Results]": [
+        {
+            "checksum": "599a1262764dde79e407198f6ab2b0dc",
+            "size": 830,
+            "uri": "https://{canondata_backend}/1031349/4922c900f34c05383e0bb9e25918e6733d37d501/resource.tar.gz#test.test_Optimizers-FuseFlatMapWithExtractMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatMapWithStreamLambda-default.txt-Debug]": [
+        {
+            "checksum": "c2bff5bd2de9ea6363c3e7d39ad91085",
+            "size": 293,
+            "uri": "https://{canondata_backend}/1031349/4922c900f34c05383e0bb9e25918e6733d37d501/resource.tar.gz#test.test_Optimizers-FuseFlatMapWithStreamLambda-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FuseFlatMapWithStreamLambda-default.txt-Results]": [
+        {
+            "checksum": "589a61afd4aaeff5dd479ff0cba41bba",
+            "size": 642,
+            "uri": "https://{canondata_backend}/1031349/4922c900f34c05383e0bb9e25918e6733d37d501/resource.tar.gz#test.test_Optimizers-FuseFlatMapWithStreamLambda-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverConstSort-default.txt-Debug]": [
+        {
+            "checksum": "bb04e3db6896484695f239f6a94b189c",
+            "size": 182,
+            "uri": "https://{canondata_backend}/1946324/145f46cf483bce708f88c9a81adc71112fb6ea80/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverConstSort-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverConstSort-default.txt-Results]": [
+        {
+            "checksum": "cd7f08d8db47dafcc2f123871a25a763",
+            "size": 738,
+            "uri": "https://{canondata_backend}/1946324/145f46cf483bce708f88c9a81adc71112fb6ea80/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverConstSort-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-NonEquivNestedLambdaOuterSameLevel-default.txt-Debug]": [
+        {
+            "checksum": "ed41cbf97a485d85089ab082a50978fb",
+            "size": 484,
+            "uri": "https://{canondata_backend}/1946324/145f46cf483bce708f88c9a81adc71112fb6ea80/resource.tar.gz#test.test_Optimizers-NonEquivNestedLambdaOuterSameLevel-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-NonEquivNestedLambdaOuterSameLevel-default.txt-Results]": [
+        {
+            "checksum": "1302401ff926f32a15f04a75c0f033f0",
+            "size": 923,
+            "uri": "https://{canondata_backend}/1946324/145f46cf483bce708f88c9a81adc71112fb6ea80/resource.tar.gz#test.test_Optimizers-NonEquivNestedLambdaOuterSameLevel-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-TakeOverTop-default.txt-Debug]": [
+        {
+            "checksum": "a3b6ffb90248dae58f59f7baca5d7604",
+            "size": 280,
+            "uri": "https://{canondata_backend}/1937424/cd1b83e446f2bfec8131ffe52cccd798c241a899/resource.tar.gz#test.test_Optimizers-TakeOverTop-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-TakeOverTop-default.txt-Results]": [
+        {
+            "checksum": "f37f0469ebf711db4d0d16e00ad9e2a0",
+            "size": 358,
+            "uri": "https://{canondata_backend}/1937424/cd1b83e446f2bfec8131ffe52cccd798c241a899/resource.tar.gz#test.test_Optimizers-TakeOverTop-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-Apply-default.txt-Debug]": [
+        {
+            "checksum": "6a2b013ff0f06a08e59b1306146b673a",
+            "size": 220,
+            "uri": "https://{canondata_backend}/1942415/39cca2bf59dca4eac0d4f06394aa93077fe175ea/resource.tar.gz#test.test_Result-Apply-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-Apply-default.txt-Results]": [
+        {
+            "checksum": "a06eb867925eacabd34a8f494d37078c",
+            "size": 202,
+            "uri": "https://{canondata_backend}/1942415/39cca2bf59dca4eac0d4f06394aa93077fe175ea/resource.tar.gz#test.test_Result-Apply-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-CallOtherCallable--Debug]": [
+        {
+            "checksum": "a2fe64b855aa331a01558036c3bd93d2",
+            "size": 529,
+            "uri": "https://{canondata_backend}/1689644/d3a75644fee853cbca57f4c34f7c438c5d8336e8/resource.tar.gz#test.test_Udf-CallOtherCallable--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-CallOtherCallable--Results]": [
+        {
+            "checksum": "19975583131bc8889c56906538a3f4d1",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1689644/d3a75644fee853cbca57f4c34f7c438c5d8336e8/resource.tar.gz#test.test_Udf-CallOtherCallable--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonCallableAsResult--Debug]": [
+        {
+            "checksum": "159ad8531c1097b4451caa598a20ac70",
+            "size": 584,
+            "uri": "https://{canondata_backend}/1600758/8cf4e0f70af820ab5703e4b9a2f179f672412c67/resource.tar.gz#test.test_Udf-PythonCallableAsResult--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonCallableAsResult--Results]": [
+        {
+            "checksum": "2d1b3562b9d3a1047cbd7ccfdecb5294",
+            "size": 408,
+            "uri": "https://{canondata_backend}/1600758/8cf4e0f70af820ab5703e4b9a2f179f672412c67/resource.tar.gz#test.test_Udf-PythonCallableAsResult--Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-TopFreq-default.txt-Debug]": [
+        {
+            "checksum": "76a356eb69fca2e67abf8672697b6c9e",
+            "size": 5522,
+            "uri": "https://{canondata_backend}/1871002/db875bd5ecfdb00c8d36698fa5bd0eb2637a7411/resource.tar.gz#test.test_Udf-TopFreq-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-TopFreq-default.txt-Results]": [
+        {
+            "checksum": "7be433d146f1a29f696b53c8708938f0",
+            "size": 5875,
+            "uri": "https://{canondata_backend}/1871002/db875bd5ecfdb00c8d36698fa5bd0eb2637a7411/resource.tar.gz#test.test_Udf-TopFreq-default.txt-Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part6/test.py b/yql/essentials/tests/s-expressions/minirun/part6/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part6/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part6/ya.make b/yql/essentials/tests/s-expressions/minirun/part6/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part6/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part7/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part7/canondata/result.json
new file mode 100644
index 0000000000..77bc21d321
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part7/canondata/result.json
@@ -0,0 +1,534 @@
+{
+    "test.test[Casts-AlterToOverDataFloatTypes-default.txt-Debug]": [
+        {
+            "checksum": "9b4d469cf19d56e5c7fba1fcb759a8b0",
+            "size": 1365,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-AlterToOverDataFloatTypes-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverDataFloatTypes-default.txt-Results]": [
+        {
+            "checksum": "6962b12eb874c3b0335fa5f7c8044295",
+            "size": 1890,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-AlterToOverDataFloatTypes-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverOptional-default.txt-Debug]": [
+        {
+            "checksum": "bd2608339d69f089870d8b49f84564f3",
+            "size": 2438,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-AlterToOverOptional-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverOptional-default.txt-Results]": [
+        {
+            "checksum": "e1cafe4bc472a5e63c2c2effbdd0e889",
+            "size": 5884,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-AlterToOverOptional-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverStruct-default.txt-Debug]": [
+        {
+            "checksum": "d6579dbcc8ffddd231ff3c6ce2b6c7a4",
+            "size": 503,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-AlterToOverStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverStruct-default.txt-Results]": [
+        {
+            "checksum": "66092dce48562fbaa0740139d5a08013",
+            "size": 1510,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-AlterToOverStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-HasNullTrue-default.txt-Debug]": [
+        {
+            "checksum": "220caf9c492e6463808c21e1b2903f01",
+            "size": 933,
+            "uri": "https://{canondata_backend}/1781765/cc900c92e8ff70c649ac7e0c044fc6dfff303dd5/resource.tar.gz#test.test_Casts-HasNullTrue-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-HasNullTrue-default.txt-Results]": [
+        {
+            "checksum": "1fc24fd7f0c650d0dda33907cdd9f8eb",
+            "size": 2036,
+            "uri": "https://{canondata_backend}/1781765/cc900c92e8ff70c649ac7e0c044fc6dfff303dd5/resource.tar.gz#test.test_Casts-HasNullTrue-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-SafeCastOverList-default.txt-Debug]": [
+        {
+            "checksum": "b78f76a08fa96bf41cac66a023dd0ec1",
+            "size": 496,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-SafeCastOverList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverList-default.txt-Results]": [
+        {
+            "checksum": "d9ac55524ade8eee55ac1789bd0b6546",
+            "size": 1011,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-SafeCastOverList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-SafeCastOverResource--Debug]": [
+        {
+            "checksum": "b938b59734b7e7eeac78234a61e622e0",
+            "size": 1041,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-SafeCastOverResource--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverResource--Results]": [
+        {
+            "checksum": "32cd1c334602776c077133e8f1ebad99",
+            "size": 399,
+            "uri": "https://{canondata_backend}/1936997/8d728312965766d523a9418384175f6559ed62d4/resource.tar.gz#test.test_Casts-SafeCastOverResource--Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertCoalesce-default.txt-Debug]": [
+        {
+            "checksum": "9f7a8475ecff8bd4a26ffb1b4a50a75f",
+            "size": 355,
+            "uri": "https://{canondata_backend}/1937492/efad3523f3676fffe6b0d58964f62e1d3a96598e/resource.tar.gz#test.test_ImplictCasts-AutoConvertCoalesce-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoConvertCoalesce-default.txt-Results]": [
+        {
+            "checksum": "bd2ed62065652092a300f849c188c57b",
+            "size": 831,
+            "uri": "https://{canondata_backend}/1937492/efad3523f3676fffe6b0d58964f62e1d3a96598e/resource.tar.gz#test.test_ImplictCasts-AutoConvertCoalesce-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideDictLiteral-default.txt-Debug]": [
+        {
+            "checksum": "246e19d6c54b094baad07594d570580d",
+            "size": 292,
+            "uri": "https://{canondata_backend}/1937492/efad3523f3676fffe6b0d58964f62e1d3a96598e/resource.tar.gz#test.test_ImplictCasts-InsideDictLiteral-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideDictLiteral-default.txt-Results]": [
+        {
+            "checksum": "53be1c0824478697355b5004b1ab9713",
+            "size": 1026,
+            "uri": "https://{canondata_backend}/1937492/efad3523f3676fffe6b0d58964f62e1d3a96598e/resource.tar.gz#test.test_ImplictCasts-InsideDictLiteral-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideTupleLiteral-default.txt-Debug]": [
+        {
+            "checksum": "00a5f0fd9a056af39fc69dcdf81b7655",
+            "size": 153,
+            "uri": "https://{canondata_backend}/1937492/efad3523f3676fffe6b0d58964f62e1d3a96598e/resource.tar.gz#test.test_ImplictCasts-InsideTupleLiteral-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideTupleLiteral-default.txt-Results]": [
+        {
+            "checksum": "d519931fea76179840489aec36aa95de",
+            "size": 621,
+            "uri": "https://{canondata_backend}/1937492/efad3523f3676fffe6b0d58964f62e1d3a96598e/resource.tar.gz#test.test_ImplictCasts-InsideTupleLiteral-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Demux-default.txt-Debug]": [
+        {
+            "checksum": "803470ff872cd21b77eff5fb9e59a0e1",
+            "size": 1213,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-Demux-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Demux-default.txt-Results]": [
+        {
+            "checksum": "dec50e9095f5e1f4699113e79d2e957d",
+            "size": 3004,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-Demux-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-IndexDictOpt-default.txt-Debug]": [
+        {
+            "checksum": "fd6aabd191c08f959d8d507661ee8166",
+            "size": 290,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-IndexDictOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-IndexDictOpt-default.txt-Results]": [
+        {
+            "checksum": "0afffe1c6551277d4612c3741b19b6a8",
+            "size": 1295,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-IndexDictOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-QueueSimpleStrings-default.txt-Debug]": [
+        {
+            "checksum": "075baaf1bbeaa7b4e5f115cd6e2306cc",
+            "size": 514,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-QueueSimpleStrings-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-QueueSimpleStrings-default.txt-Results]": [
+        {
+            "checksum": "382f3ba9ba35a74d2c954df13bd6cd8f",
+            "size": 2015,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-QueueSimpleStrings-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamExtend-default.txt-Debug]": [
+        {
+            "checksum": "906cd8743f06458ad00b2dd7f55e882b",
+            "size": 299,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamExtend-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamExtend-default.txt-Results]": [
+        {
+            "checksum": "6f8de596eebc75603e29db30e3e750ce",
+            "size": 533,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamExtend-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamFilter-default.txt-Debug]": [
+        {
+            "checksum": "fb69f4e8548d585c92a08a7641b19177",
+            "size": 263,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamFilter-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamFilter-default.txt-Results]": [
+        {
+            "checksum": "0a8dba5a7e317ad8d63658e404a0cd31",
+            "size": 358,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamFilter-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamInCombineByKey-default.txt-Debug]": [
+        {
+            "checksum": "c42fc09c4182df03058d3c7181212b3f",
+            "size": 440,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamInCombineByKey-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamInCombineByKey-default.txt-Results]": [
+        {
+            "checksum": "c0823d231ad0f3528294099992595503",
+            "size": 824,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamInCombineByKey-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamMap-default.txt-Debug]": [
+        {
+            "checksum": "4f87027ed179076f2db44d45d3b722cd",
+            "size": 230,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamMap-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamMap-default.txt-Results]": [
+        {
+            "checksum": "aa54e486bfe896a111fb17885b989500",
+            "size": 386,
+            "uri": "https://{canondata_backend}/1936842/b41d65940489e73fa69690fbff2e1446347ef1ab/resource.tar.gz#test.test_InMem-StreamMap-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedLeft-default.txt-Debug]": [
+        {
+            "checksum": "58e3ca21d8d74bce0f1eb42fc9871a19",
+            "size": 5525,
+            "uri": "https://{canondata_backend}/1937424/fdec47b84b4fdc9bcfbdb62d97078a9e82e64468/resource.tar.gz#test.test_Join-CommonJoinCoreSortedLeft-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-CommonJoinCoreSortedLeft-default.txt-Results]": [
+        {
+            "checksum": "4bb2d1e196b5a811b23fb9af2cb7cca6",
+            "size": 57226,
+            "uri": "https://{canondata_backend}/1937424/fdec47b84b4fdc9bcfbdb62d97078a9e82e64468/resource.tar.gz#test.test_Join-CommonJoinCoreSortedLeft-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Bit_Or-default.txt-Debug]": [
+        {
+            "checksum": "618a15bd97761ab6c236fa909736d69d",
+            "size": 708,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Bit_Or-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Bit_Or-default.txt-Results]": [
+        {
+            "checksum": "a2fbaf15fde910dd5c47df3cd7465854",
+            "size": 1161,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Bit_Or-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Bool_And_Opt-default.txt-Debug]": [
+        {
+            "checksum": "14091ceb36a74397b437a65b162a69a2",
+            "size": 936,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Bool_And_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Bool_And_Opt-default.txt-Results]": [
+        {
+            "checksum": "b88ff817c98b9700d91e6d528372df6d",
+            "size": 1837,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Bool_And_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_If_Opt-default.txt-Debug]": [
+        {
+            "checksum": "97c767099cc6cdc048d89b618cecd88e",
+            "size": 802,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_If_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_If_Opt-default.txt-Results]": [
+        {
+            "checksum": "05cf54a7ac9f4fda8a52e9dde020cb92",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_If_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Max_Opt-default.txt-Debug]": [
+        {
+            "checksum": "7d7d6a5cf0de0ef2c183d6815eab4b8f",
+            "size": 677,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Distinct_Max_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Max_Opt-default.txt-Results]": [
+        {
+            "checksum": "5d2a85891b7a1f792913d4cf8a27b76b",
+            "size": 1408,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Distinct_Max_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Min_By-default.txt-Debug]": [
+        {
+            "checksum": "01b992362a17d4572b4ed9ed057314a9",
+            "size": 935,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Min_By-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Min_By-default.txt-Results]": [
+        {
+            "checksum": "57f77c4680488748ecdc4c1d789a3fb6",
+            "size": 857,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Min_By-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Sum_If_Opt-default.txt-Debug]": [
+        {
+            "checksum": "fd5529ff5555a3edd0ca11baaabe8783",
+            "size": 1162,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Sum_If_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Sum_If_Opt-default.txt-Results]": [
+        {
+            "checksum": "7ef7ac424903b1c7197b0df417c0437f",
+            "size": 1409,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Sum_If_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Sum_Opt-default.txt-Debug]": [
+        {
+            "checksum": "82078283f48b26d9280a9b8f28dbb508",
+            "size": 796,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Sum_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Sum_Opt-default.txt-Results]": [
+        {
+            "checksum": "30a19abb6276a41302c4e4edfbd5f6a3",
+            "size": 1409,
+            "uri": "https://{canondata_backend}/1871182/06a32a8f65677469565c60ddb48f6224884d1d03/resource.tar.gz#test.test_Lib-Agg_Sum_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-CondenseOneItemStruct-default.txt-Debug]": [
+        {
+            "checksum": "68abafb64c63b5d025efbb5bff355f23",
+            "size": 322,
+            "uri": "https://{canondata_backend}/1942415/1812f864134750189c6422c62ffb41c53b4b7121/resource.tar.gz#test.test_Optimizers-CondenseOneItemStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-CondenseOneItemStruct-default.txt-Results]": [
+        {
+            "checksum": "4996da1cfd1bfc50e7d29dcf6be521ec",
+            "size": 662,
+            "uri": "https://{canondata_backend}/1942415/1812f864134750189c6422c62ffb41c53b4b7121/resource.tar.gz#test.test_Optimizers-CondenseOneItemStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-EquivNestedLambdaOuterDiffLevel-default.txt-Debug]": [
+        {
+            "checksum": "8bfb355f62f4230cafc0356b4d844c5c",
+            "size": 482,
+            "uri": "https://{canondata_backend}/1942415/1812f864134750189c6422c62ffb41c53b4b7121/resource.tar.gz#test.test_Optimizers-EquivNestedLambdaOuterDiffLevel-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-EquivNestedLambdaOuterDiffLevel-default.txt-Results]": [
+        {
+            "checksum": "47f7f036c5594604e379fbf65b2a4d70",
+            "size": 987,
+            "uri": "https://{canondata_backend}/1942415/1812f864134750189c6422c62ffb41c53b4b7121/resource.tar.gz#test.test_Optimizers-EquivNestedLambdaOuterDiffLevel-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FlatMapAfterCombineByKey-default.txt-Debug]": [
+        {
+            "checksum": "d90a55bcd1efd9e78f5d4f62f711a46f",
+            "size": 387,
+            "uri": "https://{canondata_backend}/1881367/282a201c14320aafdd3fd38261fecf9a70ea4fdb/resource.tar.gz#test.test_Optimizers-FlatMapAfterCombineByKey-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FlatMapAfterCombineByKey-default.txt-Results]": [
+        {
+            "checksum": "61a07a917d6f5ab003ec5c214577b230",
+            "size": 359,
+            "uri": "https://{canondata_backend}/1881367/282a201c14320aafdd3fd38261fecf9a70ea4fdb/resource.tar.gz#test.test_Optimizers-FlatMapAfterCombineByKey-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FlatMapBeforeCombineByKey-default.txt-Debug]": [
+        {
+            "checksum": "209e3ccdb007b68da12354adcc2352f0",
+            "size": 485,
+            "uri": "https://{canondata_backend}/1942415/9fad3ce3e91e30529937a7e90c1c9c5e144ec28e/resource.tar.gz#test.test_Optimizers-FlatMapBeforeCombineByKey-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FlatMapBeforeCombineByKey-default.txt-Results]": [
+        {
+            "checksum": "8983fe67e6680e16adbc4b23b9047ee1",
+            "size": 824,
+            "uri": "https://{canondata_backend}/1942415/9fad3ce3e91e30529937a7e90c1c9c5e144ec28e/resource.tar.gz#test.test_Optimizers-FlatMapBeforeCombineByKey-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1EmptyStruct-default.txt-Debug]": [
+        {
+            "checksum": "5dc5b7f7deb97a28b3083410b93cc59d",
+            "size": 130,
+            "uri": "https://{canondata_backend}/1942415/9fad3ce3e91e30529937a7e90c1c9c5e144ec28e/resource.tar.gz#test.test_Optimizers-Fold1EmptyStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1EmptyStruct-default.txt-Results]": [
+        {
+            "checksum": "7f94bd7b9696b569a8717fad2b83f59a",
+            "size": 432,
+            "uri": "https://{canondata_backend}/1942415/9fad3ce3e91e30529937a7e90c1c9c5e144ec28e/resource.tar.gz#test.test_Optimizers-Fold1EmptyStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FoldConstMax-default.txt-Debug]": [
+        {
+            "checksum": "cf7f2e44fc2c6f9209107b741aa7fcb1",
+            "size": 142,
+            "uri": "https://{canondata_backend}/1942415/9fad3ce3e91e30529937a7e90c1c9c5e144ec28e/resource.tar.gz#test.test_Optimizers-FoldConstMax-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FoldConstMax-default.txt-Results]": [
+        {
+            "checksum": "04fde3d25ba9219e0953f927af1e51c5",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1942415/9fad3ce3e91e30529937a7e90c1c9c5e144ec28e/resource.tar.gz#test.test_Optimizers-FoldConstMax-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-GroupBySingleKeyListUnused-default.txt-Debug]": [
+        {
+            "checksum": "381934f15093c807298b51ab2083fe99",
+            "size": 263,
+            "uri": "https://{canondata_backend}/1784117/5173d4c5261af3d3ca86a77bf3ffba63120caa9a/resource.tar.gz#test.test_Optimizers-GroupBySingleKeyListUnused-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-GroupBySingleKeyListUnused-default.txt-Results]": [
+        {
+            "checksum": "c0a3702ab408881533d2cf360cfb5255",
+            "size": 334,
+            "uri": "https://{canondata_backend}/1784117/5173d4c5261af3d3ca86a77bf3ffba63120caa9a/resource.tar.gz#test.test_Optimizers-GroupBySingleKeyListUnused-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-LengthAfterEnumerate-default.txt-Debug]": [
+        {
+            "checksum": "51cc1ca88f5582bddd6f074e307a341c",
+            "size": 124,
+            "uri": "https://{canondata_backend}/1784117/5173d4c5261af3d3ca86a77bf3ffba63120caa9a/resource.tar.gz#test.test_Optimizers-LengthAfterEnumerate-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-LengthAfterEnumerate-default.txt-Results]": [
+        {
+            "checksum": "7aa42388e362036820e1af224a37b181",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1784117/5173d4c5261af3d3ca86a77bf3ffba63120caa9a/resource.tar.gz#test.test_Optimizers-LengthAfterEnumerate-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MemberOverFlattenMembers-default.txt-Debug]": [
+        {
+            "checksum": "8dbf39125b63deec8510add7837c99b1",
+            "size": 418,
+            "uri": "https://{canondata_backend}/1946324/3b5568f9ca1631c1b44b88c8f3ed31ccfaeee154/resource.tar.gz#test.test_Optimizers-MemberOverFlattenMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MemberOverFlattenMembers-default.txt-Results]": [
+        {
+            "checksum": "d4ff6c1ca910961a9ff4baa4f92f5d3c",
+            "size": 2072,
+            "uri": "https://{canondata_backend}/1946324/3b5568f9ca1631c1b44b88c8f3ed31ccfaeee154/resource.tar.gz#test.test_Optimizers-MemberOverFlattenMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-VisitAsGuess-default.txt-Debug]": [
+        {
+            "checksum": "ed65e68f7666c1de4e3969e80c641afa",
+            "size": 1179,
+            "uri": "https://{canondata_backend}/1937424/639f8d4c922a1612eed16165354ac2003260e838/resource.tar.gz#test.test_Optimizers-VisitAsGuess-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-VisitAsGuess-default.txt-Results]": [
+        {
+            "checksum": "732f016333f322b20e5d44a025ddd280",
+            "size": 4524,
+            "uri": "https://{canondata_backend}/1937424/639f8d4c922a1612eed16165354ac2003260e838/resource.tar.gz#test.test_Optimizers-VisitAsGuess-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-ResultColumns-default.txt-Debug]": [
+        {
+            "checksum": "ba3cf96a3c819ecbb7c1df07c6a88e14",
+            "size": 352,
+            "uri": "https://{canondata_backend}/1773845/7a8bd63f1be64f21002f9614bb54178a3b730514/resource.tar.gz#test.test_Result-ResultColumns-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-ResultColumns-default.txt-Results]": [
+        {
+            "checksum": "8ae9bf5e4bf5abd56984250675917590",
+            "size": 1394,
+            "uri": "https://{canondata_backend}/1773845/7a8bd63f1be64f21002f9614bb54178a3b730514/resource.tar.gz#test.test_Result-ResultColumns-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-SeveralWritesAndCommits-default.txt-Debug]": [
+        {
+            "checksum": "643d25e6f03963ac6fdd11c36edbbc77",
+            "size": 403,
+            "uri": "https://{canondata_backend}/1773845/7a8bd63f1be64f21002f9614bb54178a3b730514/resource.tar.gz#test.test_Result-SeveralWritesAndCommits-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-SeveralWritesAndCommits-default.txt-Results]": [
+        {
+            "checksum": "5c80c4f4682e8dd56355ea650c423318",
+            "size": 434,
+            "uri": "https://{canondata_backend}/1773845/7a8bd63f1be64f21002f9614bb54178a3b730514/resource.tar.gz#test.test_Result-SeveralWritesAndCommits-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Result-Yson-default.txt-Debug]": [
+        {
+            "checksum": "6ed1111ff4d7b92b099b218d74be56da",
+            "size": 274,
+            "uri": "https://{canondata_backend}/1773845/7a8bd63f1be64f21002f9614bb54178a3b730514/resource.tar.gz#test.test_Result-Yson-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Result-Yson-default.txt-Results]": [
+        {
+            "checksum": "897a01184b99e1de4c6a9a1ac266852f",
+            "size": 2329,
+            "uri": "https://{canondata_backend}/1773845/7a8bd63f1be64f21002f9614bb54178a3b730514/resource.tar.gz#test.test_Result-Yson-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-TypeInspection--Debug]": [
+        {
+            "checksum": "ec7060db02e81bd921be708564e37884",
+            "size": 994,
+            "uri": "https://{canondata_backend}/1784826/7c091b31b587d6fbb64c3049b827a8acf18d3225/resource.tar.gz#test.test_Udf-TypeInspection--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-TypeInspection--Results]": [
+        {
+            "checksum": "e217b7259f0e6cf0cc4fbf812f5fc5f5",
+            "size": 2451,
+            "uri": "https://{canondata_backend}/1784826/7c091b31b587d6fbb64c3049b827a8acf18d3225/resource.tar.gz#test.test_Udf-TypeInspection--Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part7/test.py b/yql/essentials/tests/s-expressions/minirun/part7/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part7/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part7/ya.make b/yql/essentials/tests/s-expressions/minirun/part7/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part7/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part8/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part8/canondata/result.json
new file mode 100644
index 0000000000..9a9b578824
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part8/canondata/result.json
@@ -0,0 +1,548 @@
+{
+    "test.test[Aggregation-AggrMinMax-default.txt-Debug]": [
+        {
+            "checksum": "7745ac4b97fbb70428e9759f9a5aaedb",
+            "size": 793,
+            "uri": "https://{canondata_backend}/1597364/1f3e7f25c6ddb50b091fa9aaedebacdf37917233/resource.tar.gz#test.test_Aggregation-AggrMinMax-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-AggrMinMax-default.txt-Results]": [
+        {
+            "checksum": "a5466f00d26ea44b08e4e1aecd411703",
+            "size": 2632,
+            "uri": "https://{canondata_backend}/1597364/1f3e7f25c6ddb50b091fa9aaedebacdf37917233/resource.tar.gz#test.test_Aggregation-AggrMinMax-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Aggregation-InMemAggregateUsingTuple-default.txt-Debug]": [
+        {
+            "checksum": "f602c1d4362e7c4ba5662c3de56961c8",
+            "size": 1750,
+            "uri": "https://{canondata_backend}/1597364/1f3e7f25c6ddb50b091fa9aaedebacdf37917233/resource.tar.gz#test.test_Aggregation-InMemAggregateUsingTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-InMemAggregateUsingTuple-default.txt-Results]": [
+        {
+            "checksum": "2ddacc003fd4e281c9afbe98cd18562c",
+            "size": 7251,
+            "uri": "https://{canondata_backend}/1597364/1f3e7f25c6ddb50b091fa9aaedebacdf37917233/resource.tar.gz#test.test_Aggregation-InMemAggregateUsingTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Aggregation-InMemAggregateZero-default.txt-Debug]": [
+        {
+            "checksum": "0cf7d8142195706fcce048aa51ee845d",
+            "size": 640,
+            "uri": "https://{canondata_backend}/1597364/1f3e7f25c6ddb50b091fa9aaedebacdf37917233/resource.tar.gz#test.test_Aggregation-InMemAggregateZero-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-InMemAggregateZero-default.txt-Results]": [
+        {
+            "checksum": "c5ee4e2565a943034859f1ec55ab07c6",
+            "size": 1093,
+            "uri": "https://{canondata_backend}/1597364/1f3e7f25c6ddb50b091fa9aaedebacdf37917233/resource.tar.gz#test.test_Aggregation-InMemAggregateZero-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-AlterToOverDict-default.txt-Debug]": [
+        {
+            "checksum": "a9f9e14c7d309b2c32a2db246bd0c532",
+            "size": 553,
+            "uri": "https://{canondata_backend}/1784117/708be20f8b06decb7df90fb41219e7184d8b21df/resource.tar.gz#test.test_Casts-AlterToOverDict-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-AlterToOverDict-default.txt-Results]": [
+        {
+            "checksum": "848a3ed8da9a3fbe8a0e5142b4443c21",
+            "size": 1172,
+            "uri": "https://{canondata_backend}/1784117/708be20f8b06decb7df90fb41219e7184d8b21df/resource.tar.gz#test.test_Casts-AlterToOverDict-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-SafeCastOverOptional-default.txt-Debug]": [
+        {
+            "checksum": "057f2c2c9913557a0c96053f7f888298",
+            "size": 1621,
+            "uri": "https://{canondata_backend}/1784117/708be20f8b06decb7df90fb41219e7184d8b21df/resource.tar.gz#test.test_Casts-SafeCastOverOptional-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-SafeCastOverOptional-default.txt-Results]": [
+        {
+            "checksum": "549246191ec2af4a4ab380c4e4761775",
+            "size": 10128,
+            "uri": "https://{canondata_backend}/1784117/708be20f8b06decb7df90fb41219e7184d8b21df/resource.tar.gz#test.test_Casts-SafeCastOverOptional-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-StrictCastOverOptional-default.txt-Debug]": [
+        {
+            "checksum": "a917dbebcfc55408476bd2a3ca7a04d6",
+            "size": 1866,
+            "uri": "https://{canondata_backend}/1784117/708be20f8b06decb7df90fb41219e7184d8b21df/resource.tar.gz#test.test_Casts-StrictCastOverOptional-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-StrictCastOverOptional-default.txt-Results]": [
+        {
+            "checksum": "01f3086355d869b97b662a8d727eb67a",
+            "size": 9856,
+            "uri": "https://{canondata_backend}/1784117/708be20f8b06decb7df90fb41219e7184d8b21df/resource.tar.gz#test.test_Casts-StrictCastOverOptional-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Config-DataSinks-default.txt-Debug]": [
+        {
+            "checksum": "07f6ca73ef720f155b724b3c497957c9",
+            "size": 198,
+            "uri": "https://{canondata_backend}/1871102/6c68f58a599b5357b0f128344d98e9fd967b77f5/resource.tar.gz#test.test_Config-DataSinks-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Config-DataSinks-default.txt-Results]": [
+        {
+            "checksum": "58882ea1096c0b969f41b8a7a8e057cd",
+            "size": 203,
+            "uri": "https://{canondata_backend}/1889210/3c1c879c94050e6ec01e12de8f279042794082a9/resource.tar.gz#test.test_Config-DataSinks-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem3Rename-default.txt-Debug]": [
+        {
+            "checksum": "06fce6667f3137ade0d2e05abd6d1701",
+            "size": 1044,
+            "uri": "https://{canondata_backend}/1942525/fa426b9c279118db0e440a1a73e5d529862ca0d7/resource.tar.gz#test.test_EquiJoin-JoinInMem3Rename-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMem3Rename-default.txt-Results]": [
+        {
+            "checksum": "2363472b2cebe27e5500c8bcbf1f2661",
+            "size": 2400,
+            "uri": "https://{canondata_backend}/1942525/fa426b9c279118db0e440a1a73e5d529862ca0d7/resource.tar.gz#test.test_EquiJoin-JoinInMem3Rename-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemOpt1-default.txt-Debug]": [
+        {
+            "checksum": "2045e141eba8a1537b0ce24ff0fe1d5a",
+            "size": 2231,
+            "uri": "https://{canondata_backend}/1942525/fa426b9c279118db0e440a1a73e5d529862ca0d7/resource.tar.gz#test.test_EquiJoin-JoinInMemOpt1-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemOpt1-default.txt-Results]": [
+        {
+            "checksum": "3665a1e15860cea6d5f99973f043223c",
+            "size": 28772,
+            "uri": "https://{canondata_backend}/1942525/fa426b9c279118db0e440a1a73e5d529862ca0d7/resource.tar.gz#test.test_EquiJoin-JoinInMemOpt1-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[File-DifferentAliasesToSameFiles--Debug]": [
+        {
+            "checksum": "ac5ed6f88340ca9a9e370e22c4ef1f2b",
+            "size": 217,
+            "uri": "https://{canondata_backend}/1871102/7eb544db9caa5232e7bb924ec32bd396ea364d63/resource.tar.gz#test.test_File-DifferentAliasesToSameFiles--Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-DifferentAliasesToSameFiles--Results]": [
+        {
+            "checksum": "528de4fc5fb2a7cc06883cb6e39a1aec",
+            "size": 760,
+            "uri": "https://{canondata_backend}/1871102/7eb544db9caa5232e7bb924ec32bd396ea364d63/resource.tar.gz#test.test_File-DifferentAliasesToSameFiles--Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-AutoJustByIf-default.txt-Debug]": [
+        {
+            "checksum": "e242262805d1ab611ab39cd21a5c92b1",
+            "size": 138,
+            "uri": "https://{canondata_backend}/1937367/99299196357b50bc2de59e1f22cc090f88e4cc41/resource.tar.gz#test.test_ImplictCasts-AutoJustByIf-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-AutoJustByIf-default.txt-Results]": [
+        {
+            "checksum": "d9a630ebac469d0935ef597b9673e319",
+            "size": 485,
+            "uri": "https://{canondata_backend}/1937367/99299196357b50bc2de59e1f22cc090f88e4cc41/resource.tar.gz#test.test_ImplictCasts-AutoJustByIf-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-InsideTuple-default.txt-Debug]": [
+        {
+            "checksum": "3430a68181f65b2d006815d1e8dc7e3e",
+            "size": 165,
+            "uri": "https://{canondata_backend}/1937367/99299196357b50bc2de59e1f22cc090f88e4cc41/resource.tar.gz#test.test_ImplictCasts-InsideTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-InsideTuple-default.txt-Results]": [
+        {
+            "checksum": "b40e149dc0c99ab1800165c478b64fe8",
+            "size": 856,
+            "uri": "https://{canondata_backend}/1937367/99299196357b50bc2de59e1f22cc090f88e4cc41/resource.tar.gz#test.test_ImplictCasts-InsideTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-AccessDictOpt-default.txt-Debug]": [
+        {
+            "checksum": "194e6406af9c6121406954f03c6262c5",
+            "size": 983,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-AccessDictOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-AccessDictOpt-default.txt-Results]": [
+        {
+            "checksum": "e12967a9c8fe0326bebec8f6f9bddf84",
+            "size": 3468,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-AccessDictOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-CountBits-default.txt-Debug]": [
+        {
+            "checksum": "fe2a7db3f3db87ff90d79041cf5c47d2",
+            "size": 617,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-CountBits-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-CountBits-default.txt-Results]": [
+        {
+            "checksum": "42b63873bfebbbffa1a47d0b2e6b8291",
+            "size": 1360,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-CountBits-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-DiffKeyTypeLookup-default.txt-Debug]": [
+        {
+            "checksum": "0193f03195abcf9b8fd0132e77420cee",
+            "size": 3781,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-DiffKeyTypeLookup-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-DiffKeyTypeLookup-default.txt-Results]": [
+        {
+            "checksum": "32d486a3b7df03ed90a978adbd0a4937",
+            "size": 5024,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-DiffKeyTypeLookup-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ForwardList-default.txt-Debug]": [
+        {
+            "checksum": "983b5dc9b02a2fdb9d969816065e55d0",
+            "size": 374,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-ForwardList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ForwardList-default.txt-Results]": [
+        {
+            "checksum": "84100b9ef3c00d692cc7daa1b3a35d35",
+            "size": 483,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-ForwardList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-GroupOptTuple-default.txt-Debug]": [
+        {
+            "checksum": "14725417be34309265edc2d474a076d9",
+            "size": 466,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-GroupOptTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-GroupOptTuple-default.txt-Results]": [
+        {
+            "checksum": "430b991146fc540a666fe4d4d80b3a2b",
+            "size": 3215,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-GroupOptTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-LMap-default.txt-Debug]": [
+        {
+            "checksum": "a1789c3da562123d8c6332cd22756b00",
+            "size": 278,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-LMap-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-LMap-default.txt-Results]": [
+        {
+            "checksum": "db9e7793b518dc7bafd402922fe1e827",
+            "size": 192,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-LMap-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-MultiMap-default.txt-Debug]": [
+        {
+            "checksum": "c12973465a130122653c56ea4b477444",
+            "size": 498,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-MultiMap-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-MultiMap-default.txt-Results]": [
+        {
+            "checksum": "b4b3f392f275890c08a6de19e954cd17",
+            "size": 1513,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-MultiMap-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamFold1Map-default.txt-Debug]": [
+        {
+            "checksum": "5144ee1b90c9724a6747512f3ccdedc6",
+            "size": 658,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-StreamFold1Map-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamFold1Map-default.txt-Results]": [
+        {
+            "checksum": "5762ee3d5c7a37e0f1338d7b5889c627",
+            "size": 1888,
+            "uri": "https://{canondata_backend}/1937424/940d029b6b388ef2068a9d216e30513d3cf412c0/resource.tar.gz#test.test_InMem-StreamFold1Map-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Bit_And-default.txt-Debug]": [
+        {
+            "checksum": "92233119460c1521efc420ebf15a40f7",
+            "size": 711,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Bit_And-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Bit_And-default.txt-Results]": [
+        {
+            "checksum": "22e4798892992d387aad747b40bab7b9",
+            "size": 1162,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Bit_And-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Count_If_Opt-default.txt-Debug]": [
+        {
+            "checksum": "a5ed3891149c43864173d09b0917c470",
+            "size": 895,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Count_If_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Count_If_Opt-default.txt-Results]": [
+        {
+            "checksum": "80d85f6d9d9526c5f52f548427c82cc7",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Count_If_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Min_Opt-default.txt-Debug]": [
+        {
+            "checksum": "f785973d1ef8e5c5a50ec631942481d4",
+            "size": 677,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Distinct_Min_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Min_Opt-default.txt-Results]": [
+        {
+            "checksum": "9b75f62b1135e975c2e6c6c345da327e",
+            "size": 1408,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Distinct_Min_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Some-default.txt-Debug]": [
+        {
+            "checksum": "5015415854ea29de007e71171530fe4d",
+            "size": 689,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Some-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Some-default.txt-Results]": [
+        {
+            "checksum": "054ebecaa802f05387aae1b2b68a612f",
+            "size": 1163,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Some-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Some_Opt-default.txt-Debug]": [
+        {
+            "checksum": "2e8d333a2290542964cf7a63b51de185",
+            "size": 752,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Some_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Some_Opt-default.txt-Results]": [
+        {
+            "checksum": "2530d160761f4a55cad8b485a2163583",
+            "size": 1409,
+            "uri": "https://{canondata_backend}/1937367/e92e2c76b6eb228edcd2f8a314e4d68e7c6de391/resource.tar.gz#test.test_Lib-Agg_Some_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Condense1OneItemStruct-default.txt-Debug]": [
+        {
+            "checksum": "078a60a657f4e28480dfd89934b0b949",
+            "size": 330,
+            "uri": "https://{canondata_backend}/1942415/026f26eeb061e1e8e9d7b37ceb66f3d058e2784d/resource.tar.gz#test.test_Optimizers-Condense1OneItemStruct-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Condense1OneItemStruct-default.txt-Results]": [
+        {
+            "checksum": "4996da1cfd1bfc50e7d29dcf6be521ec",
+            "size": 662,
+            "uri": "https://{canondata_backend}/1942415/026f26eeb061e1e8e9d7b37ceb66f3d058e2784d/resource.tar.gz#test.test_Optimizers-Condense1OneItemStruct-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FlatMapAfterFilterNullMembers-default.txt-Debug]": [
+        {
+            "checksum": "88dd79cef1338593c1b37caa4596a3ea",
+            "size": 419,
+            "uri": "https://{canondata_backend}/1781765/8853521468f9fc8413a7806fb91e2673bfc8add8/resource.tar.gz#test.test_Optimizers-FlatMapAfterFilterNullMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FlatMapAfterFilterNullMembers-default.txt-Results]": [
+        {
+            "checksum": "9ae6d01d87e38794d971952dd4c3d478",
+            "size": 1739,
+            "uri": "https://{canondata_backend}/1781765/8853521468f9fc8413a7806fb91e2673bfc8add8/resource.tar.gz#test.test_Optimizers-FlatMapAfterFilterNullMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1ConstMin-default.txt-Debug]": [
+        {
+            "checksum": "9534f7d6f4d3158b3ecc3b08f19e796f",
+            "size": 206,
+            "uri": "https://{canondata_backend}/1781765/8853521468f9fc8413a7806fb91e2673bfc8add8/resource.tar.gz#test.test_Optimizers-Fold1ConstMin-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1ConstMin-default.txt-Results]": [
+        {
+            "checksum": "b7de823a6ca8e4f5c253a1c17706364a",
+            "size": 337,
+            "uri": "https://{canondata_backend}/1781765/8853521468f9fc8413a7806fb91e2673bfc8add8/resource.tar.gz#test.test_Optimizers-Fold1ConstMin-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1IncrementAsLength-default.txt-Debug]": [
+        {
+            "checksum": "f888efddb98f420dd91d57b4f4f0fb12",
+            "size": 201,
+            "uri": "https://{canondata_backend}/1781765/8853521468f9fc8413a7806fb91e2673bfc8add8/resource.tar.gz#test.test_Optimizers-Fold1IncrementAsLength-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1IncrementAsLength-default.txt-Results]": [
+        {
+            "checksum": "61c52fb8f7c38d8b01db8b669ba26984",
+            "size": 337,
+            "uri": "https://{canondata_backend}/1781765/8853521468f9fc8413a7806fb91e2673bfc8add8/resource.tar.gz#test.test_Optimizers-Fold1IncrementAsLength-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FuseExtractMembers-default.txt-Debug]": [
+        {
+            "checksum": "dc43598f16dffa8744b79124dea04a33",
+            "size": 179,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-FuseExtractMembers-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FuseExtractMembers-default.txt-Results]": [
+        {
+            "checksum": "c797528b8353e91f46b25d3fbe9fd592",
+            "size": 733,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-FuseExtractMembers-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-GroupBySingleKeyListUsed-default.txt-Debug]": [
+        {
+            "checksum": "e93f4611b94104733c776d8c49fdae51",
+            "size": 268,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-GroupBySingleKeyListUsed-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-GroupBySingleKeyListUsed-default.txt-Results]": [
+        {
+            "checksum": "aa58785caba48c457d1e4b0b12f906ba",
+            "size": 721,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-GroupBySingleKeyListUsed-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-HasItemsAfterEnumerate-default.txt-Debug]": [
+        {
+            "checksum": "36dcdb3bb6509a255c2170ee740073f6",
+            "size": 125,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-HasItemsAfterEnumerate-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-HasItemsAfterEnumerate-default.txt-Results]": [
+        {
+            "checksum": "c9d1de383b72fda4093e207a50f76887",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-HasItemsAfterEnumerate-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-InjectExtractMembersOverSort-default.txt-Debug]": [
+        {
+            "checksum": "4c62cfd7fb52974379a4c0bbf2001467",
+            "size": 300,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-InjectExtractMembersOverSort-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-InjectExtractMembersOverSort-default.txt-Results]": [
+        {
+            "checksum": "0d36c48bd6ba5875ce384e9b29dde401",
+            "size": 733,
+            "uri": "https://{canondata_backend}/1031349/13d6d12389a265760bf916bf1360202e2b715391/resource.tar.gz#test.test_Optimizers-InjectExtractMembersOverSort-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSort2-default.txt-Debug]": [
+        {
+            "checksum": "0ccb4d9d4047fadfcf90436f0f05d676",
+            "size": 282,
+            "uri": "https://{canondata_backend}/1946324/9898e072203c4590ddcf3e6e2d440006136310fd/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSort2-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-MoveExtractMembersOverSort2-default.txt-Results]": [
+        {
+            "checksum": "25139e6d64ed492258cd039281c725d6",
+            "size": 1055,
+            "uri": "https://{canondata_backend}/1946324/9898e072203c4590ddcf3e6e2d440006136310fd/resource.tar.gz#test.test_Optimizers-MoveExtractMembersOverSort2-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-UseEmptyDict-default.txt-Debug]": [
+        {
+            "checksum": "ea3d4ee0bd335b9503c5839c9769406a",
+            "size": 587,
+            "uri": "https://{canondata_backend}/1937367/b2052ea3d75a93fe131f6518387f7438452c890b/resource.tar.gz#test.test_Optimizers-UseEmptyDict-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-UseEmptyDict-default.txt-Results]": [
+        {
+            "checksum": "8ac2b7d8c7304d0d9ea2dd53d8d6e0d1",
+            "size": 1629,
+            "uri": "https://{canondata_backend}/1937367/b2052ea3d75a93fe131f6518387f7438452c890b/resource.tar.gz#test.test_Optimizers-UseEmptyDict-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Pure-PureList-default.txt-Debug]": [
+        {
+            "checksum": "b530303243dda322e5f83e8fbc415201",
+            "size": 133,
+            "uri": "https://{canondata_backend}/1777230/52bc68d899becf7bbae2237144774d811cdd833d/resource.tar.gz#test.test_Pure-PureList-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-PureList-default.txt-Results]": [
+        {
+            "checksum": "7c0702454288b28532520548ed629ffa",
+            "size": 333,
+            "uri": "https://{canondata_backend}/1777230/52bc68d899becf7bbae2237144774d811cdd833d/resource.tar.gz#test.test_Pure-PureList-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Pure-PureStructListWithFields-default.txt-Debug]": [
+        {
+            "checksum": "9da4a0884c24af730156cdd6f59ebbf1",
+            "size": 315,
+            "uri": "https://{canondata_backend}/1777230/52bc68d899becf7bbae2237144774d811cdd833d/resource.tar.gz#test.test_Pure-PureStructListWithFields-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Pure-PureStructListWithFields-default.txt-Results]": [
+        {
+            "checksum": "6632b4948b29c75d70916757021fb6dd",
+            "size": 1371,
+            "uri": "https://{canondata_backend}/1777230/52bc68d899becf7bbae2237144774d811cdd833d/resource.tar.gz#test.test_Pure-PureStructListWithFields-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-CallableType-default.txt-Debug]": [
+        {
+            "checksum": "20510d6815ba5970c7f982d6dfe7b52f",
+            "size": 496,
+            "uri": "https://{canondata_backend}/1880306/ed48168c5f53d4328004271812f4aec79af5743b/resource.tar.gz#test.test_Udf-CallableType-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-CallableType-default.txt-Results]": [
+        {
+            "checksum": "68a0b998625466840c005254bcc9445a",
+            "size": 852,
+            "uri": "https://{canondata_backend}/1880306/ed48168c5f53d4328004271812f4aec79af5743b/resource.tar.gz#test.test_Udf-CallableType-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Udf-PythonAvg--Debug]": [
+        {
+            "checksum": "3c48becb08f825e3f64de7f909c3d4a7",
+            "size": 989,
+            "uri": "https://{canondata_backend}/1600758/4167b447d68450d04af3e055febcc3a8168a477c/resource.tar.gz#test.test_Udf-PythonAvg--Debug_/opt.yql"
+        }
+    ],
+    "test.test[Udf-PythonAvg--Results]": [
+        {
+            "checksum": "ad54b250aded4651f81673be1d629c6b",
+            "size": 210,
+            "uri": "https://{canondata_backend}/1600758/4167b447d68450d04af3e055febcc3a8168a477c/resource.tar.gz#test.test_Udf-PythonAvg--Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part8/test.py b/yql/essentials/tests/s-expressions/minirun/part8/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part8/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part8/ya.make b/yql/essentials/tests/s-expressions/minirun/part8/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part8/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/part9/canondata/result.json b/yql/essentials/tests/s-expressions/minirun/part9/canondata/result.json
new file mode 100644
index 0000000000..10958c0797
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part9/canondata/result.json
@@ -0,0 +1,352 @@
+{
+    "test.test[Aggregation-AggrAdd-default.txt-Debug]": [
+        {
+            "checksum": "efccdc310c73dee0de3847d7b6dba7d5",
+            "size": 514,
+            "uri": "https://{canondata_backend}/1597364/87512a95e6935beaa948584bb73e2cd84702fc26/resource.tar.gz#test.test_Aggregation-AggrAdd-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-AggrAdd-default.txt-Results]": [
+        {
+            "checksum": "d6f347bb1450385bf5f50df859d503d0",
+            "size": 1338,
+            "uri": "https://{canondata_backend}/1597364/87512a95e6935beaa948584bb73e2cd84702fc26/resource.tar.gz#test.test_Aggregation-AggrAdd-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Aggregation-Traits-default.txt-Debug]": [
+        {
+            "checksum": "b0333bdd28d68c266fec9d14f0a8069d",
+            "size": 136,
+            "uri": "https://{canondata_backend}/1597364/87512a95e6935beaa948584bb73e2cd84702fc26/resource.tar.gz#test.test_Aggregation-Traits-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Aggregation-Traits-default.txt-Results]": [
+        {
+            "checksum": "f1e7d247c6ca7cb58ce878f5de7b9c17",
+            "size": 212,
+            "uri": "https://{canondata_backend}/1597364/87512a95e6935beaa948584bb73e2cd84702fc26/resource.tar.gz#test.test_Aggregation-Traits-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Casts-StrictCastOverDict-default.txt-Debug]": [
+        {
+            "checksum": "6ae11f39bed1392361aa774377e0ff72",
+            "size": 512,
+            "uri": "https://{canondata_backend}/1784117/ee03fcea589402513de20520f3a4f69e5a11b242/resource.tar.gz#test.test_Casts-StrictCastOverDict-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Casts-StrictCastOverDict-default.txt-Results]": [
+        {
+            "checksum": "49dbab1909ce59b165b9e6047e6009a2",
+            "size": 1415,
+            "uri": "https://{canondata_backend}/1784117/ee03fcea589402513de20520f3a4f69e5a11b242/resource.tar.gz#test.test_Casts-StrictCastOverDict-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasOne12-default.txt-Debug]": [
+        {
+            "checksum": "a849903765fdac6b9f5ecd518a37ef2a",
+            "size": 2267,
+            "uri": "https://{canondata_backend}/1814674/03f2ada37168ec8b5b94a08a4a26e4db88df5dc3/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasOne12-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemAliasOne12-default.txt-Results]": [
+        {
+            "checksum": "838dfa8f8fe2222319e23a66215dbc24",
+            "size": 25904,
+            "uri": "https://{canondata_backend}/1814674/03f2ada37168ec8b5b94a08a4a26e4db88df5dc3/resource.tar.gz#test.test_EquiJoin-JoinInMemAliasOne12-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumnsOpt1-default.txt-Debug]": [
+        {
+            "checksum": "4d7ebd5d6df54672cabf1ea0b4a83179",
+            "size": 2267,
+            "uri": "https://{canondata_backend}/1814674/03f2ada37168ec8b5b94a08a4a26e4db88df5dc3/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumnsOpt1-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[EquiJoin-JoinInMemTwoColumnsOpt1-default.txt-Results]": [
+        {
+            "checksum": "aeb1021cae8724410d6d7da6873be1de",
+            "size": 28951,
+            "uri": "https://{canondata_backend}/1814674/03f2ada37168ec8b5b94a08a4a26e4db88df5dc3/resource.tar.gz#test.test_EquiJoin-JoinInMemTwoColumnsOpt1-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[File-FilePath-default.txt-Debug]": [
+        {
+            "checksum": "34ed38805bea73f4c1097aa84874ae05",
+            "size": 123,
+            "uri": "https://{canondata_backend}/1599023/61a5454a6ceb642e6cea12d84ee4fe3a648ff15e/resource.tar.gz#test.test_File-FilePath-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-FilePath-default.txt-Results]": [
+        {
+            "checksum": "ecbcc1d6719333bb4260332482b8841c",
+            "size": 110,
+            "uri": "https://{canondata_backend}/1599023/61a5454a6ceb642e6cea12d84ee4fe3a648ff15e/resource.tar.gz#test.test_File-FilePath-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[File-RootFiles-default.txt-Debug]": [
+        {
+            "checksum": "a79140e2638c549099c156f8ebd2419d",
+            "size": 375,
+            "uri": "https://{canondata_backend}/1599023/61a5454a6ceb642e6cea12d84ee4fe3a648ff15e/resource.tar.gz#test.test_File-RootFiles-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[File-RootFiles-default.txt-Results]": [
+        {
+            "checksum": "3ae4768788091cc9b4dcb83cf0b482d4",
+            "size": 1972,
+            "uri": "https://{canondata_backend}/1599023/61a5454a6ceb642e6cea12d84ee4fe3a648ff15e/resource.tar.gz#test.test_File-RootFiles-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[ImplictCasts-Arithmetic-default.txt-Debug]": [
+        {
+            "checksum": "a3cf46de7f47c5471d4413f6525d65e1",
+            "size": 625,
+            "uri": "https://{canondata_backend}/1937492/5ccedb5daf68b6f4df4b6979845340513a0193d5/resource.tar.gz#test.test_ImplictCasts-Arithmetic-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[ImplictCasts-Arithmetic-default.txt-Results]": [
+        {
+            "checksum": "d422a5eab04f8ec5d3da7f3009390e65",
+            "size": 2305,
+            "uri": "https://{canondata_backend}/1937492/5ccedb5daf68b6f4df4b6979845340513a0193d5/resource.tar.gz#test.test_ImplictCasts-Arithmetic-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ConcatOpt-default.txt-Debug]": [
+        {
+            "checksum": "3e7bbeeead5ae2fe67338efc0a08fe13",
+            "size": 3325,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-ConcatOpt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ConcatOpt-default.txt-Results]": [
+        {
+            "checksum": "bad1d7bdc2264456ea3a30edabfa503e",
+            "size": 22508,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-ConcatOpt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Default-default.txt-Debug]": [
+        {
+            "checksum": "f8120efa6ee49214ea3d955a51f554e8",
+            "size": 3467,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-Default-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Default-default.txt-Results]": [
+        {
+            "checksum": "664319fc65a4ea09648d89a5b146b987",
+            "size": 9844,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-Default-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-FloatsIncDec-default.txt-Debug]": [
+        {
+            "checksum": "95b9e2f6f57faeb4a39d245f663f6f78",
+            "size": 334,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-FloatsIncDec-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-FloatsIncDec-default.txt-Results]": [
+        {
+            "checksum": "057e17b778274e8237b170338f48acaf",
+            "size": 713,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-FloatsIncDec-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Fold1MapOverUnboundedPreservedStream-default.txt-Debug]": [
+        {
+            "checksum": "6a566125116e8d4f6e939bad14562313",
+            "size": 1381,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-Fold1MapOverUnboundedPreservedStream-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Fold1MapOverUnboundedPreservedStream-default.txt-Results]": [
+        {
+            "checksum": "778813a3237b69ba370b041c57498601",
+            "size": 2555,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-Fold1MapOverUnboundedPreservedStream-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-Iterator-default.txt-Debug]": [
+        {
+            "checksum": "0e113483bded2bb1720c767a33ec8428",
+            "size": 874,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-Iterator-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-Iterator-default.txt-Results]": [
+        {
+            "checksum": "3bf6b05a1e940d48a4fe473f1e0e3b3d",
+            "size": 986,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-Iterator-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-ReplaceMember-default.txt-Debug]": [
+        {
+            "checksum": "356532c5c41738b56f422acc79110cbc",
+            "size": 266,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-ReplaceMember-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-ReplaceMember-default.txt-Results]": [
+        {
+            "checksum": "21ac2fdc694cc7d1bbdb39b66623bfc1",
+            "size": 1465,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-ReplaceMember-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StreamDiscard-default.txt-Debug]": [
+        {
+            "checksum": "17fb0e5440068b3257ca1705fba3629f",
+            "size": 188,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-StreamDiscard-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StreamDiscard-default.txt-Results]": [
+        {
+            "checksum": "838a7c8d1a962cc914fbbf3912224fda",
+            "size": 330,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-StreamDiscard-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[InMem-StringContains-default.txt-Debug]": [
+        {
+            "checksum": "35d698571b91af34c56885cdc1e9a9b6",
+            "size": 722,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-StringContains-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[InMem-StringContains-default.txt-Results]": [
+        {
+            "checksum": "49e52909b66922971fcd011e9352e588",
+            "size": 1924,
+            "uri": "https://{canondata_backend}/1936842/97e0ab044a6a521639a649b6b781407443c8c0f8/resource.tar.gz#test.test_InMem-StringContains-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Join-CommonJoinCore_FlowOfTuples-default.txt-Debug]": [
+        {
+            "checksum": "830609e31d8936dddcdf93a609d0ee3a",
+            "size": 4102,
+            "uri": "https://{canondata_backend}/1871002/37e24245740836cc7891f3214dc997994d76b089/resource.tar.gz#test.test_Join-CommonJoinCore_FlowOfTuples-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Join-CommonJoinCore_FlowOfTuples-default.txt-Results]": [
+        {
+            "checksum": "b310291c0d26c58c49ac14a233f6b24b",
+            "size": 47428,
+            "uri": "https://{canondata_backend}/1871002/37e24245740836cc7891f3214dc997994d76b089/resource.tar.gz#test.test_Join-CommonJoinCore_FlowOfTuples-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Bool_Or_Opt-default.txt-Debug]": [
+        {
+            "checksum": "284d5b8515fb3a9fbfa6716e392fa694",
+            "size": 933,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_Bool_Or_Opt-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Bool_Or_Opt-default.txt-Results]": [
+        {
+            "checksum": "1c6c2e87ac0a56a596f8a4876f76b37f",
+            "size": 1834,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_Bool_Or_Opt-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_If-default.txt-Debug]": [
+        {
+            "checksum": "b00dd8a3eb316d8992e0dad8670b2412",
+            "size": 725,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_If-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Count_If-default.txt-Results]": [
+        {
+            "checksum": "6493e935158c3e4c1ad119f1a3106d8a",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_Distinct_Count_If-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Min-default.txt-Debug]": [
+        {
+            "checksum": "41b2d7f24ca1d09f472cdc54f0b027a8",
+            "size": 628,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_Distinct_Min-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_Distinct_Min-default.txt-Results]": [
+        {
+            "checksum": "f0157b60a5793373734a6a225702985d",
+            "size": 1163,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_Distinct_Min-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Lib-Agg_List_Compare_By_Opts-default.txt-Debug]": [
+        {
+            "checksum": "e661f8c5bccd5186f396d71de8378072",
+            "size": 2786,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_List_Compare_By_Opts-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Lib-Agg_List_Compare_By_Opts-default.txt-Results]": [
+        {
+            "checksum": "791fcbfe5d8135fb9c635336f1ab54c0",
+            "size": 2578,
+            "uri": "https://{canondata_backend}/1937367/e77ba21bdee3073d5ac816e83de0c7af4a7daf05/resource.tar.gz#test.test_Lib-Agg_List_Compare_By_Opts-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-Fold1OneItemTuple-default.txt-Debug]": [
+        {
+            "checksum": "d92be86870a01fdf575d08165de8f8a0",
+            "size": 278,
+            "uri": "https://{canondata_backend}/1942415/797c8707c8b876df32eb780887894533311d2c4a/resource.tar.gz#test.test_Optimizers-Fold1OneItemTuple-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-Fold1OneItemTuple-default.txt-Results]": [
+        {
+            "checksum": "1405d048e73b8d71f02831ec42d94e85",
+            "size": 552,
+            "uri": "https://{canondata_backend}/1942415/797c8707c8b876df32eb780887894533311d2c4a/resource.tar.gz#test.test_Optimizers-Fold1OneItemTuple-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-FoldIncrementAsLength-default.txt-Debug]": [
+        {
+            "checksum": "ff530e8f10e7872dbb72dd4b0e68b84e",
+            "size": 185,
+            "uri": "https://{canondata_backend}/1942415/797c8707c8b876df32eb780887894533311d2c4a/resource.tar.gz#test.test_Optimizers-FoldIncrementAsLength-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-FoldIncrementAsLength-default.txt-Results]": [
+        {
+            "checksum": "05de141de04c24e9e5aa5bd59ab3e54e",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1942415/797c8707c8b876df32eb780887894533311d2c4a/resource.tar.gz#test.test_Optimizers-FoldIncrementAsLength-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-IfOverNotPredicate-default.txt-Debug]": [
+        {
+            "checksum": "a65bdb3d54e13c73e3983eacf6642c6b",
+            "size": 124,
+            "uri": "https://{canondata_backend}/1031349/df47136f10b23be567e4d030aeee318bb1121eda/resource.tar.gz#test.test_Optimizers-IfOverNotPredicate-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-IfOverNotPredicate-default.txt-Results]": [
+        {
+            "checksum": "82b25724231ea529e9fdba0527c6aec0",
+            "size": 209,
+            "uri": "https://{canondata_backend}/1031349/df47136f10b23be567e4d030aeee318bb1121eda/resource.tar.gz#test.test_Optimizers-IfOverNotPredicate-default.txt-Results_/results.txt"
+        }
+    ],
+    "test.test[Optimizers-SkipWhileOverLiterals-default.txt-Debug]": [
+        {
+            "checksum": "5081e1983cedab37620224e0e5bcaf2c",
+            "size": 575,
+            "uri": "https://{canondata_backend}/1937367/d830b2d1fda4887e670f554aae360552aab48da2/resource.tar.gz#test.test_Optimizers-SkipWhileOverLiterals-default.txt-Debug_/opt.yql"
+        }
+    ],
+    "test.test[Optimizers-SkipWhileOverLiterals-default.txt-Results]": [
+        {
+            "checksum": "34166dfa989759d49040ab61eaba7fa9",
+            "size": 1750,
+            "uri": "https://{canondata_backend}/1937367/d830b2d1fda4887e670f554aae360552aab48da2/resource.tar.gz#test.test_Optimizers-SkipWhileOverLiterals-default.txt-Results_/results.txt"
+        }
+    ]
+}
diff --git a/yql/essentials/tests/s-expressions/minirun/part9/test.py b/yql/essentials/tests/s-expressions/minirun/part9/test.py
new file mode 100644
index 0000000000..a0f6bc2d42
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part9/test.py
@@ -0,0 +1,16 @@
+import pytest
+import yatest
+
+from pure import run_test, DATA_PATH
+from test_utils import pytest_generate_tests_for_part
+from yql_utils import pytest_get_current_part
+
+
+def pytest_generate_tests(metafunc):
+    current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, DATA_PATH, template='.yqls')
+
+
+@pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
+def test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    return run_test(suite, case, cfg, tmpdir, what, yql_http_file_server)
diff --git a/yql/essentials/tests/s-expressions/minirun/part9/ya.make b/yql/essentials/tests/s-expressions/minirun/part9/ya.make
new file mode 100644
index 0000000000..0d703e1e22
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/part9/ya.make
@@ -0,0 +1,3 @@
+INCLUDE(../pure.make)
+
+
diff --git a/yql/essentials/tests/s-expressions/minirun/pure.make b/yql/essentials/tests/s-expressions/minirun/pure.make
new file mode 100644
index 0000000000..72d3812177
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/pure.make
@@ -0,0 +1,54 @@
+IF (NOT OPENSOURCE)
+
+PY3TEST()
+
+TEST_SRCS(
+    test.py
+)
+
+IF (SANITIZER_TYPE OR NOT OPENSOURCE)
+    REQUIREMENTS(ram:20)
+ENDIF()
+
+IF (SANITIZER_TYPE OR WITH_VALGRIND)
+    TIMEOUT(1800)
+    SIZE(LARGE)
+    TAG(ya:fat sb:ttl=2)
+ELSE()
+    TIMEOUT(600)
+    SIZE(MEDIUM)
+    TAG(sb:ttl=2)
+ENDIF()
+
+#FORK_TESTS()
+#FORK_SUBTESTS()
+#SPLIT_FACTOR(10)
+
+DEPENDS(
+    yql/essentials/tools/astdiff
+    yql/essentials/tools/minirun
+    yql/essentials/tests/common/test_framework/udfs_deps
+    yql/essentials/udfs/test/test_import
+)
+DATA(
+    arcadia/yql/essentials/tests/s-expressions/minirun # python files
+    arcadia/yql/essentials/tests/s-expressions/suites
+    arcadia/yql/essentials/mount
+    arcadia/yql/essentials/cfg/tests
+)
+
+PEERDIR(
+    yql/essentials/tests/common/test_framework
+    library/python/testing/swag/lib
+    yql/essentials/core/file_storage/proto
+)
+
+NO_CHECK_IMPORTS()
+
+IF (SANITIZER_TYPE == "memory")
+    TAG(ya:not_autocheck) # YQL-15385
+ENDIF()
+
+END()
+
+ENDIF()
diff --git a/yql/essentials/tests/s-expressions/minirun/pure.py b/yql/essentials/tests/s-expressions/minirun/pure.py
new file mode 100644
index 0000000000..383094ebfe
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/pure.py
@@ -0,0 +1,101 @@
+import codecs
+import os
+import pytest
+import re
+import yql_utils
+
+import yatest.common
+from yql_utils import execute, get_tables, get_files, get_http_files, \
+    KSV_ATTR, yql_binary_path, is_xfail, is_canonize_peephole, is_peephole_use_blocks, is_canonize_lineage, \
+    is_skip_forceblocks, get_param, normalize_source_code_path, replace_vals, get_gateway_cfg_suffix, \
+    do_custom_query_check, stable_result_file, stable_table_file, is_with_final_result_issues, \
+    normalize_result
+from yqlrun import YQLRun
+
+from test_utils import get_config, get_parameters_json
+from test_file_common import run_file, run_file_no_cache, get_gateways_config, get_sql_query
+
+ASTDIFF_PATH = yql_binary_path('yql/essentials/tools/astdiff/astdiff')
+MINIRUN_PATH = yql_binary_path('yql/essentials/tools/minirun/minirun')
+DATA_PATH = yatest.common.source_path('yql/essentials/tests/s-expressions/suites')
+
+
+def run_test(suite, case, cfg, tmpdir, what, yql_http_file_server):
+    if get_gateway_cfg_suffix() != '' and what not in ('Results','LLVM'):
+        pytest.skip('non-trivial gateways.conf')
+
+    config = get_config(suite, case, cfg, data_path=DATA_PATH)
+
+    xfail = is_xfail(config)
+    if xfail and what != 'Results':
+        pytest.skip('xfail is not supported in this mode')
+
+    program_sql = os.path.join(DATA_PATH, suite, '%s.yqls' % case)
+    with codecs.open(program_sql, encoding='utf-8') as program_file_descr:
+        sql_query = program_file_descr.read()
+
+    extra_final_args = []
+    if is_with_final_result_issues(config):
+        extra_final_args += ['--with-final-issues']
+    (res, tables_res) = run_file('pure', suite, case, cfg, config, yql_http_file_server, MINIRUN_PATH,
+                                 extra_args=extra_final_args, allow_llvm=False, data_path=DATA_PATH, run_sql=False)
+
+    to_canonize = []
+    assert xfail or os.path.exists(res.results_file)
+    assert not tables_res
+
+    if what == 'Results':
+        if xfail:
+            return None
+
+        if do_custom_query_check(res, sql_query):
+            return None
+
+        stable_result_file(res)
+        to_canonize.append(yatest.common.canonical_file(res.results_file))
+        if res.std_err:
+            to_canonize.append(normalize_source_code_path(res.std_err))
+
+    if what == 'Debug':
+        to_canonize = [yatest.common.canonical_file(res.opt_file, diff_tool=ASTDIFF_PATH)]
+
+    if what == 'RunOnOpt' or what == 'LLVM':
+        is_llvm = (what == 'LLVM')
+        files = get_files(suite, config, DATA_PATH)
+        http_files = get_http_files(suite, config, DATA_PATH)
+        http_files_urls = yql_http_file_server.register_files({}, http_files)
+        parameters = get_parameters_json(suite, config, DATA_PATH)
+        query_sql = get_sql_query('pure', suite, case, config, DATA_PATH, template='.yqls') if is_llvm else None
+
+        yqlrun = YQLRun(
+            prov='pure',
+            keep_temp=False,
+            gateway_config=get_gateways_config(http_files, yql_http_file_server, allow_llvm=is_llvm),
+            udfs_dir=yql_binary_path('yql/essentials/tests/common/test_framework/udfs_deps'),
+            binary=MINIRUN_PATH
+        )
+
+        opt_res, opt_tables_res = execute(
+            yqlrun,
+            program=res.opt if not is_llvm else query_sql,
+            run_sql=False,
+            files=files,
+            urls=http_files_urls,
+            check_error=True,
+            verbose=True,
+            parameters=parameters)
+
+        assert os.path.exists(opt_res.results_file)
+        assert not opt_tables_res
+
+        base_res_yson = normalize_result(stable_result_file(res), False)
+        opt_res_yson = normalize_result(stable_result_file(opt_res), False)
+
+        # Compare results
+        assert opt_res_yson == base_res_yson, 'RESULTS_DIFFER\n' \
+            'Result:\n %(opt_res_yson)s\n\n' \
+            'Base result:\n %(base_res_yson)s\n' % locals()
+
+        return None
+
+    return to_canonize
diff --git a/yql/essentials/tests/s-expressions/minirun/ya.make b/yql/essentials/tests/s-expressions/minirun/ya.make
new file mode 100644
index 0000000000..cc5451b4fd
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/minirun/ya.make
@@ -0,0 +1,16 @@
+IF (NOT OPENSOURCE)
+
+RECURSE(
+    part0
+    part1
+    part2
+    part3
+    part4
+    part5
+    part6
+    part7
+    part8
+    part9
+)
+
+ENDIF()
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yqls
index ae95d15a68..679d2ece1a 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let x (Int32 '34))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yqls
index f0a27ab8d5..93facdc915 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let x (Int32 '34))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yqls
index ab948dc649..6e58c9598e 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let x (Int32 '34))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFields.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFields.yqls
deleted file mode 100644
index e9565555ef..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFields.yqls
+++ /dev/null
@@ -1,44 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table1)
-      (let core (block '(
-        (let Count0_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-        (let Count0_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-        (let Count0_save (lambda '(state) state))
-        (let Count0_load (lambda '(item) item))
-        (let Count0_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count0_finish (lambda '(state) state))
-        (return (Aggregate core '('"key" '"subkey") '('('Count0 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"value") Count0_create Count0_update Count0_save Count0_load Count0_merge Count0_finish (Uint64 '0)) '"value"))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"subkey" (Member row '"subkey")))
-        (let res (AddMember res '"column2" (Member row 'Count0)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row '"key") (Member row '"subkey")))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key" '"subkey" '"column2")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFieldsUsingTuple.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFieldsUsingTuple.yqls
deleted file mode 100644
index 502366d6d5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFieldsUsingTuple.yqls
+++ /dev/null
@@ -1,52 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let table1 (FlatMap table1 (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" '((Member row '"key") (Member row '"key"))))
-        (let res (AddMember res '"subkey" (Member row '"subkey")))
-        (let res (AddMember res '"value" (Member row 'value)))
-        (let res (AsList res))
-        (return res)
-  )))))
-  (let output (block '(
-    (let select (block '(
-      (let core table1)
-      (let core (block '(
-        (let Count0_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-        (let Count0_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-        (let Count0_save (lambda '(state) state))
-        (let Count0_load (lambda '(item) item))
-        (let Count0_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count0_finish (lambda '(state) state))
-        (return (Aggregate core '('"key" '"subkey") '('('Count0 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"value") Count0_create Count0_update Count0_save Count0_load Count0_merge Count0_finish (Uint64 '0)) '"value"))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"subkey" (Member row '"subkey")))
-        (let res (AddMember res '"column2" (Member row 'Count0)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select '((Bool 'true) (Bool 'true) (Bool 'true)) (lambda '(row) '((Nth (Member row '"key") '0) (Nth (Member row '"key") '1) (Member row '"subkey")))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key" '"subkey" '"column2")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroupByOneField.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroupByOneField.yqls
deleted file mode 100644
index b309a99b1c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroupByOneField.yqls
+++ /dev/null
@@ -1,50 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table2 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table2)
-      (let core (block '(
-        (let Sum0_create (lambda '(row) ("Coalesce" (Cast (Member row '"subkey") 'Uint64) (Int64 '"0"))))
-        (let Sum0_update (lambda '(row state) (OptionalReduce state ("Coalesce" (Cast (Member row '"subkey") 'Uint64) (Int64 '"0")) (lambda '(a b) (+ a b)))))
-        (let Sum0_save (lambda '(state) state))
-        (let Sum0_load (lambda '(item) item))
-        (let Sum0_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Sum0_finish (lambda '(state) state))
-        (let Count1_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-        (let Count1_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-        (let Count1_save (lambda '(state) state))
-        (let Count1_load (lambda '(item) item))
-        (let Count1_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count1_finish (lambda '(state) state))
-        (return (Aggregate core '('"key") '('('Sum0 (AggregationTraits (ListItemType (TypeOf core)) Sum0_create Sum0_update Sum0_save Sum0_load Sum0_merge Sum0_finish (Null))) '('Count1 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"value") Count1_create Count1_update Count1_save Count1_load Count1_merge Count1_finish (Uint64 '0)) '"value"))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"column1" (Member row 'Sum0)))
-        (let res (AddMember res '"column2" (Member row 'Count1)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key" '"column1" '"column2")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateOptState.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateOptState.yqls
deleted file mode 100644
index bb96925785..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateOptState.yqls
+++ /dev/null
@@ -1,38 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"value" '"key" '"subkey") '()))
-  (let world (Left! x))
-  (let table2 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table2)
-      (let core (block '(
-        (let Sum1_create (lambda '(row) (FromString (Member row '"subkey") '"Int64")))
-        (let Sum1_update (lambda '(row state) (OptionalReduce state (FromString (Member row '"subkey") '"Int64") (lambda '(a b) (+ a b)))))
-        (let Sum1_save (lambda '(state) state))
-        (let Sum1_load (lambda '(item) item))
-        (let Sum1_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Sum1_finish (lambda '(state) state))
-        (return (Aggregate core '('"value") '('('"Sum1" (AggregationTraits (ListItemType (TypeOf core)) Sum1_create Sum1_update Sum1_save Sum1_load Sum1_merge Sum1_finish (Null))))))
-)
-))
-      (return core)
-)
-))
-    (return select)
-)
-))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let sortedOutput (Sort output (Bool 'false) (lambda '(x) (Member x 'value) )))
-    (let world (Write! world result_sink (Key) sortedOutput '('('type) '('autoref))))
-    (let plato_sink (DataSink '"yt" '"plato"))
-    (let world (Commit! world plato_sink))
-    (return (Commit! world result_sink))
-)
-))
-  (return world)
-)
-))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateRead.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateRead.yqls
deleted file mode 100644
index 70d8879fc0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateRead.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-#comment
-(let res_sink (DataSink 'result))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let init (lambda '(x) (StrictFromString (Member x 'value) 'Uint32)))
-(let update_min (lambda '(x y) (Min (StrictFromString (Member x 'value) 'Uint32) y)))
-(let save (lambda '(x) x))
-(let load (lambda '(x) x))
-(let merge_min (lambda '(x y) (Min x y)))
-(let finish (lambda '(x) x))
-(let min (AggregationTraits (ListItemType (TypeOf table1)) init update_min save load merge_min finish (Null)))
-(let resAll (Aggregate table1 '() '('('minvalue min))))
-(let world (Write! world res_sink (Key) resAll '('('type))))
-(let resKey (Aggregate table1 '('key) '('('minvalue min))))
-(let sortedOutput (Sort resKey (Bool 'false) (lambda '(x) (Member x 'key) )))
-(let world (Write! world res_sink (Key) sortedOutput '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinct.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinct.yqls
deleted file mode 100644
index 94034d32af..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinct.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let res_sink (DataSink 'result))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let init (lambda '(x) (StrictFromString (Member x 'value) 'Uint32)))
-(let init_distinct (lambda '(x) (StrictFromString x 'Uint32)))
-(let update_sum_distinct (lambda '(x y) (+ (StrictFromString x 'Uint32) y)))
-(let save (lambda '(x) x))
-(let load (lambda '(x) x))
-(let merge_sum (lambda '(x y) (+ x y)))
-(let finish (lambda '(x) x))
-# distinct process one column and requires data/data? type
-(let sum (AggregationTraits (StructMemberType (ListItemType (TypeOf table1)) 'value) init_distinct update_sum_distinct save load merge_sum finish (Null)))
-(let resAll (Aggregate table1 '() '('('distsum sum 'value))))
-(let world (Write! world res_sink (Key) resAll '('('type))))
-(let resKey (Aggregate table1 '('key) '('('distsum sum 'value))))
-(let sortedOutput (Sort resKey (Bool 'false) (lambda '(x) (Member x 'key) )))
-(let world (Write! world res_sink (Key) sortedOutput '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctUsingTuple.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctUsingTuple.yqls
deleted file mode 100644
index d4f0adca76..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctUsingTuple.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-#comment
-(let res_sink (DataSink 'result))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (FlatMap table1 (lambda '(row) (block '(
-      (let res (Struct))
-      (let res (AddMember res '"key" '((Member row '"key") (Member row '"key"))))
-      (let res (AddMember res '"subkey" (Member row '"subkey")))
-      (let res (AddMember res '"value" (Member row 'value)))
-      (let res (AsList res))
-      (return res)
-)))))
-
-(let init (lambda '(x) (StrictFromString (Member x 'value) 'Uint32)))
-(let init_distinct (lambda '(x) (StrictFromString x 'Uint32)))
-(let update_sum_distinct (lambda '(x y) (+ (StrictFromString x 'Uint32) y)))
-(let save (lambda '(x) x))
-(let load (lambda '(x) x))
-(let merge_sum (lambda '(x y) (+ x y)))
-(let finish (lambda '(x) x))
-# distinct process one column and requires data/data? type
-(let sum (AggregationTraits (StructMemberType (ListItemType (TypeOf table1)) 'value) init_distinct update_sum_distinct save load merge_sum finish (Null)))
-(let resAll (Aggregate table1 '() '('('distsum sum 'value))))
-(let world (Write! world res_sink (Key) resAll '('('type))))
-(let resKey (Aggregate table1 '('key) '('('distsum sum 'value))))
-(let sortedOutput (Sort resKey '((Bool 'false) (Bool 'false)) (lambda '(x) (Member x 'key) )))
-(let world (Write! world res_sink (Key) sortedOutput '('('type))))
-(let resKey (Aggregate table1 '('key 'subkey) '('('distsum sum 'value))))
-(let sortedOutput (Sort resKey '((Bool 'false) (Bool 'false) (Bool 'false)) (lambda '(x) '((Nth (Member x 'key) '0) (Nth (Member x 'key) '1) (Member x 'subkey)) )))
-(let world (Write! world res_sink (Key) sortedOutput '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctWithParents.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctWithParents.yqls
deleted file mode 100644
index 27c4faf647..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctWithParents.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let res_sink (DataSink 'result))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let init (lambda '(x parent) '(parent (StrictFromString (Member x 'value) 'Uint32))))
-(let init_distinct (lambda '(x parent) '(parent (StrictFromString x 'Uint32))))
-(let update_sum_distinct (lambda '(x y parent) '(parent (+ (StrictFromString x 'Uint32) (Nth y '1)))))
-(let save (lambda '(x) x))
-(let load (lambda '(x) x))
-(let merge_sum (lambda '(x y) '((Nth x '0) (AggrAdd (Nth x '1) (Nth y '1)))))
-(let finish (lambda '(x) (Nth x '1)))
-# distinct process one column and requires data/data? type
-(let sum (AggregationTraits (StructMemberType (ListItemType (TypeOf table1)) 'value) init_distinct update_sum_distinct save load merge_sum finish (Null)))
-(let resAll (Aggregate table1 '() '('('distsum sum 'value))))
-(let world (Write! world res_sink (Key) resAll '('('type))))
-(let resKey (Aggregate table1 '('key) '('('distsum sum 'value))))
-(let sortedOutput (Sort resKey (Bool 'false) (lambda '(x) (Member x 'key) )))
-(let world (Write! world res_sink (Key) sortedOutput '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadWithParents.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadWithParents.yqls
deleted file mode 100644
index b0b2f6a084..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadWithParents.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-#comment
-(let res_sink (DataSink 'result))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let init (lambda '(x parent) '(parent (StrictFromString (Member x 'value) 'Uint32))))
-(let update_min (lambda '(x y parent) '(parent (AggrMin (StrictFromString (Member x 'value) 'Uint32) (Nth y '1)))))
-(let save (lambda '(x) x))
-(let load (lambda '(x) x))
-(let merge_min (lambda '(x y) (AggrMin x y)))
-(let finish (lambda '(x) (Nth x '1)))
-(let min (AggregationTraits (ListItemType (TypeOf table1)) init update_min save load merge_min finish (Null)))
-(let resAll (Aggregate table1 '() '('('minvalue min))))
-(let world (Write! world res_sink (Key) resAll '('('type))))
-(let resKey (Aggregate table1 '('key) '('('minvalue min))))
-(let sortedOutput (Sort resKey (Bool 'false) (lambda '(x) (Member x 'key) )))
-(let world (Write! world res_sink (Key) sortedOutput '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateSameDistinct.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateSameDistinct.yqls
deleted file mode 100644
index 9f4fb01757..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateSameDistinct.yqls
+++ /dev/null
@@ -1,107 +0,0 @@
-(
-(let $1 world)
-(let $2 (DataSource '"yt" '"plato"))
-(let $3 (String '"Input"))
-(let $4 '('table $3))
-(let $5 (Key $4))
-(let $6 '('"key"))
-(let $7 '())
-(let $8 (Read! $1 $2 $5 $6 $7))
-(let $9 (Left! $8))
-(let $10 (DataSink 'result))
-(let $11 (Key))
-(let $12 (Right! $8))
-(let $13 '())
-(let $14 (TypeOf $12))
-(let $15 (ListItemType $14))
-(let $16 (StructMemberType $15 '"key"))
-(let $17 (lambda '($49) (block '(
-  (let $51 (Exists $49))
-  (let $52 (Convert $51 'Uint64))
-  (return $52)
-))))
-(let $18 (lambda '($53 $54) (block '(
-  (let $56 (Exists $53))
-  (let $57 (Convert $56 'Uint64))
-  (let $58 (lambda '($60 $61) (block '(
-    (let $63 (+ $60 $61))
-    (return $63)
-  ))))
-  (let $59 (OptionalReduce $54 $57 $58))
-  (return $59)
-))))
-(let $19 (lambda '($64) (block '(
-  (return $64)
-))))
-(let $20 (lambda '($66) (block '(
-  (return $66)
-))))
-(let $21 (lambda '($68 $69) (block '(
-  (let $71 (lambda '($73 $74) (block '(
-    (let $76 (+ $73 $74))
-    (return $76)
-  ))))
-  (let $72 (OptionalReduce $68 $69 $71))
-  (return $72)
-))))
-(let $22 (lambda '($77) (block '(
-  (return $77)
-))))
-(let $23 (AggregationTraits $16 $17 $18 $19 $20 $21 $22 (Null)))
-(let $24 '('Count0 $23 '"key"))
-(let $25 (TypeOf $12))
-(let $26 (ListItemType $25))
-(let $27 (StructMemberType $26 '"key"))
-(let $28 (lambda '($79) (block '(
-  (return $79)
-))))
-(let $29 (lambda '($81 $82) (block '(
-  (let $84 (lambda '($86 $87) (block '(
-    (let $89 (Min $86 $87))
-    (return $89)
-  ))))
-  (let $85 (OptionalReduce $82 $81 $84))
-  (return $85)
-))))
-(let $30 (lambda '($90) (block '(
-  (return $90)
-))))
-(let $31 (lambda '($92) (block '(
-  (return $92)
-))))
-(let $32 (lambda '($94 $95) (block '(
-  (let $97 (lambda '($99 $100) (block '(
-    (let $102 (Min $99 $100))
-    (return $102)
-  ))))
-  (let $98 (OptionalReduce $94 $95 $97))
-  (return $98)
-))))
-(let $33 (lambda '($103) (block '(
-  (return $103)
-))))
-(let $34 (AggregationTraits $27 $28 $29 $30 $31 $32 $33 (Null)))
-(let $35 '('Min1 $34 '"key"))
-(let $36 '($24 $35))
-(let $37 (Aggregate $12 $13 $36))
-(let $38 (lambda '($105) (block '(
-  (let $107 (Struct))
-  (let $108 (Member $105 'Count0))
-  (let $109 (AddMember $107 '"column0" $108))
-  (let $110 (Member $105 'Min1))
-  (let $111 (AddMember $109 '"column1" $110))
-  (let $112 (AsList $111))
-  (return $112)
-))))
-(let $39 (FlatMap $37 $38))
-(let $40 '('type))
-(let $41 '('autoref))
-(let $42 '('"column0" '"column1"))
-(let $43 '('columns $42))
-(let $44 '($40 $41 $43))
-(let $45 (Write! $9 $10 $11 $39 $44))
-(let $46 (Commit! $45 $10))
-(let $47 (DataSink '"yt" '"plato"))
-(let $48 (Commit! $46 $47))
-(return $48)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutGroup.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutGroup.yqls
deleted file mode 100644
index 472d0234d1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutGroup.yqls
+++ /dev/null
@@ -1,55 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table3 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table3)
-      (let core (block '(
-        (let Sum0_create (lambda '(row) ("Coalesce" (Cast (Member row '"key") 'Uint64) (Int64 '"0"))))
-        (let Sum0_update (lambda '(row state) (OptionalReduce state ("Coalesce" (Cast (Member row '"key") 'Uint64) (Int64 '"0")) (lambda '(a b) (+ a b)))))
-        (let Sum0_save (lambda '(state) state))
-        (let Sum0_load (lambda '(item) item))
-        (let Sum0_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Sum0_finish (lambda '(state) state))
-        (let Count1_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-        (let Count1_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-        (let Count1_save (lambda '(state) state))
-        (let Count1_load (lambda '(item) item))
-        (let Count1_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count1_finish (lambda '(state) state))
-        (let Count2_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-        (let Count2_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-        (let Count2_save (lambda '(state) state))
-        (let Count2_load (lambda '(item) item))
-        (let Count2_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count2_finish (lambda '(state) state))
-        (return (Aggregate core '() '('('Sum0 (AggregationTraits (ListItemType (TypeOf core)) Sum0_create Sum0_update Sum0_save Sum0_load Sum0_merge Sum0_finish (Null))) '('Count1 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"subkey") Count1_create Count1_update Count1_save Count1_load Count1_merge Count1_finish (Uint64 '0)) '"subkey") '('Count2 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"value") Count2_create Count2_update Count2_save Count2_load Count2_merge Count2_finish (Uint64 '0)) '"value"))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" (Member row 'Sum0)))
-        (let res (AddMember res '"column1" (Member row 'Count1)))
-        (let res (AddMember res '"column2" (Member row 'Count2)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0" '"column1" '"column2")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutTraits.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutTraits.yqls
deleted file mode 100644
index 59dd4cabc3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutTraits.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core input)
-      (let core (block '(
-        (return (Aggregate core '('key 'value) '()))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row 'key)))
-        (let res (AddMember res '"value" (Member row 'value)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (let core (Sort core '((Bool 'true) (Bool 'true)) (lambda '(x) '((Member x 'key) (Member x 'value)) )))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug1.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug1.yqls
deleted file mode 100644
index 0a2a83b345..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug1.yqls
+++ /dev/null
@@ -1,69 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"value1" (MatchType (Member row '"value") 'Optional (lambda '(item) (Coalesce (Map item (lambda '(val) (IfType val (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Just (Convert item '"Int64")))))) (Nothing (OptionalType (DataType '"Int64"))))) (lambda '(item) (IfType item (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Convert item '"Int64")))))))
-            (let res (AsList res))
-            (return res)
-)
-))))
-          (return core)
-)
-))
-        (return select)
-)
-))
-      (let core (block '(
-        (let Max1_create (lambda '(row) (Member row '"value1")))
-        (let Max1_update (lambda '(row state) (OptionalReduce state (Member row '"value1") (lambda '(a b) (Max a b)))))
-        (let Max1_save (lambda '(state) state))
-        (let Max1_load (lambda '(item) item))
-        (let Max1_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (Max a b)))))
-        (let Max1_finish (lambda '(state) state))
-        (let Count2_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-        (let Count2_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-        (let Count2_save (lambda '(state) state))
-        (let Count2_load (lambda '(item) item))
-        (let Count2_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count2_finish (lambda '(state) state))
-        (return (Aggregate core '('"key") '('('Max1 (AggregationTraits (ListItemType (TypeOf core)) Max1_create Max1_update Max1_save Max1_load Max1_merge Max1_finish (Null))) '('Count2 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"value1") Count2_create Count2_update Count2_save Count2_load Count2_merge Count2_finish (Uint64 '0)) '"value1"))))
-)
-))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" (Member row 'Max1)))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"column2" (Member row 'Count2)))
-        (let res (AsList res))
-        (return res)
-)
-))))
-      (return core)
-)
-))
-    (return select)
-)
-))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let sortedOutput (Sort output (Bool 'false) (lambda '(x) (Member x 'key) )))
-    (let world (Write! world result_sink (Key) sortedOutput '('('type) '('autoref) '('columns '('"column0" '"key" '"column2")))))
-    (let plato_sink (DataSink '"yt" '"plato"))
-    (let world (Commit! world plato_sink))
-    (return (Commit! world result_sink))
-)
-))
-  (return world)
-)
-))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug2.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug2.yqls
deleted file mode 100644
index 1558d5a3a9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug2.yqls
+++ /dev/null
@@ -1,53 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table2 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table2)
-      (let core (block '(
-        (let Max0_create (lambda '(row) (Member row '"value")))
-        (let Max0_update (lambda '(row state) (OptionalReduce state (Member row '"value") (lambda '(a b) (Max a b)))))
-        (let Max0_save (lambda '(state) state))
-        (let Max0_load (lambda '(item) item))
-        (let Max0_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (Max a b)))))
-        (let Max0_finish (lambda '(state) state))
-        (let Count1_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-        (let Count1_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-        (let Count1_save (lambda '(state) state))
-        (let Count1_load (lambda '(item) item))
-        (let Count1_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count1_finish (lambda '(state) state))
-        (return (Aggregate core '('"key") '('('Max0 (AggregationTraits (ListItemType (TypeOf core)) Max0_create Max0_update Max0_save Max0_load Max0_merge Max0_finish (Null))) '('Count1 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"value") Count1_create Count1_update Count1_save Count1_load Count1_merge Count1_finish (Uint64 '0)) '"value"))))
-)
-))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" (Member row 'Max0)))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"column2" (Member row 'Count1)))
-        (let res (AsList res))
-        (return res)
-)
-))))
-      (return core)
-)
-))
-    (return select)
-)
-))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let sortedOutput (Sort output (Bool 'false) (lambda '(x) (Member x 'key) )))
-    (let world (Write! world result_sink (Key) sortedOutput '('('type) '('autoref) '('columns '('"column0" '"key" '"column2")))))
-    (let plato_sink (DataSink '"yt" '"plato"))
-    (let world (Commit! world plato_sink))
-    (return (Commit! world result_sink))
-)
-))
-  (return world)
-)
-))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.cfg b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.cfg
deleted file mode 100644
index 2c8f4d3baa..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input3.txt
-res result.txt
-udf datetime2_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.yqls
deleted file mode 100644
index 3cad6c380f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.yqls
+++ /dev/null
@@ -1,40 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (Configure! world (DataSource '"config") 'SQL '0))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table1)
-      (let core (Aggregate core '() '('('Avg0 (Apply (bind aggregate_module '"avg_traits_factory") (TypeOf core) (lambda '(row) (PersistableRepr (Apply (lambda '("$UniqID") (block '(
-        (let $string_uniqid (Coalesce (SafeCast "$UniqID" (DataType 'String)) (String '"")))
-        (let $time (Substring "$string_uniqid" ("-" (Size "$string_uniqid") (SafeCast (Int32 '"10") (DataType 'Uint32))) (Int32 '"10")))
-        (return ("-" (SafeCast (SqlCall '"DateTime2.ToSeconds" '((PositionalArgs (SafeCast (String '"2017-06-29") (DataType 'Date))))) (DataType 'Int64)) (SafeCast (SqlCall '"DateTime2.FromSeconds" '((PositionalArgs (SafeCast "$time" (DataType 'Uint32))))) (DataType 'Int64))))
-      ))) (Member row '"key"))))))) '()))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"avg_timediff" (Cast (/ (Member row 'Avg0) (Uint64 '1000000000000)) 'Int32))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"avg_timediff")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.cfg b/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.cfg
deleted file mode 100644
index c8889a670f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input1.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.yqls
deleted file mode 100644
index 312c757886..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.yqls
+++ /dev/null
@@ -1,58 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"subkey" (Member row '"subkey")))
-            (let res (AddMember res '"value" (Cast (Member row '"value") 'Double)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (block '(
-        (let Sum1_create (lambda '(row) (Member row '"value")))
-        (let Sum1_update (lambda '(row state) (OptionalReduce state (Member row '"value") (lambda '(a b) (+ a b)))))
-        (let Sum1_save (lambda '(state) state))
-        (let Sum1_load (lambda '(item) item))
-        (let Sum1_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Sum1_finish (lambda '(state) state))
-        (return (Aggregate core '('"key") '('('Sum1 (AggregationTraits (ListItemType (TypeOf core)) Sum1_create Sum1_update Sum1_save Sum1_load Sum1_merge Sum1_finish (Null))))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"subkey" (String '"")))
-        (let res (AddMember res '"value" (Member row 'Sum1)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key" '"subkey" '"value")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yqls
index b25953f460..1469e8b2ae 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let init (lambda '(x) (Member x 'value)))
 (let init_distinct (lambda '(x) x))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yqls
index d3c8358342..00ee588dfb 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let init (lambda '(x) (Member x 'value)))
 (let init_distinct (lambda '(x) x))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yqls
index 4357fcf5c7..39160a50ac 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let init (lambda '(x parent) '(parent (Member x 'value))))
 (let init_distinct (lambda '(x parent) '(parent x)))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yqls
index 73069b7061..a69ecc298e 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let init_min (lambda '(x) (Member x 'value)))
 (let init_count (lambda '(x) (Uint64 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yqls
index 857859cc2c..2b00f88e36 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let init_min (lambda '(x) (Member x 'value)))
 (let init_count (lambda '(x) (Uint64 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.cfg b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.cfg
deleted file mode 100644
index e341fb79d2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-in Input many_columns.txt
-out Output output.txt
-out Output1 output1.txt
-out Output2 output2.txt
-res result.txt
-mount ..\mounts.txt
-udf datetime2_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.yqls
deleted file mode 100644
index 82742f79ea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.yqls
+++ /dev/null
@@ -1,168 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let world (Configure! world (DataSource '"config") 'SQL '0))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"assignment_gs_count" '"assignment_assignment_id" '"assignment_last_status_change_time" '"requester_id" '"project_id" '"assignment_gs_weight") '()))
-  (let world (Left! x))
-  (let table5 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core table5)
-      (let core (Filter core (lambda '(row) (Coalesce (">" (Member row '"assignment_gs_count") (Int64 '"0")) (Bool 'false)))))
-      (let core (block '(
-        (return (Aggregate core '('"assignment_assignment_id") '('('Some0 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"assignment_last_status_change_time")))) '('Some1 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"requester_id")))) '('Some2 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"project_id")))) '('Some3 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"assignment_gs_count")))) '('Some4 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"assignment_gs_weight")))))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"assignment_id" (Member row '"assignment_assignment_id")))
-        (let res (AddMember res '"date" (SafeCast ("Apply" ("Udf" '"DateTime2.FromSeconds") (Cast (Member row 'Some0) 'Uint32)) (DataType 'Date))))
-        (let res (AddMember res '"requester_id" (Member row 'Some1)))
-        (let res (AddMember res '"project_id" (Member row 'Some2)))
-        (let res (AddMember res '"gs_count" (Member row 'Some3)))
-        (let res (AddMember res '"gs_weight" (Cast (Member row 'Some4) 'Double)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Output"))) (Void) '()))
-  (let world (Left! x))
-  (let table7 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (block '(
-            (let select (block '(
-              (let core table7)
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (AsList row))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )))
-          (let core (block '(
-            (return (Aggregate core '('"date" '"project_id" '"requester_id") '('('Sum8 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum9 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-          )))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"date" (Member row '"date")))
-            (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-            (let res (AddMember res '"project_id" (Member row '"project_id")))
-            (let res (AddMember res '"gs_count" (Member row 'Sum8)))
-            (let res (AddMember res '"gs_weight" (Member row 'Sum9)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output1"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Output"))) (Void) '()))
-  (let world (Left! x))
-  (let table7 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (block '(
-            (let select (block '(
-              (let core (block '(
-                (let select (block '(
-                  (let core table7)
-                  (let core (FlatMap core (lambda '(row) (block '(
-                    (let res (AsList row))
-                    (return res)
-                  )))))
-                  (return core)
-                )))
-                (return select)
-              )))
-              (let core (block '(
-                (return (Aggregate core '('"date" '"project_id" '"requester_id") '('('Sum8 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum9 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-              )))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (Struct))
-                (let res (AddMember res '"date" (Member row '"date")))
-                (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-                (let res (AddMember res '"project_id" (Member row '"project_id")))
-                (let res (AddMember res '"gs_count" (Member row 'Sum8)))
-                (let res (AddMember res '"gs_weight" (Member row 'Sum9)))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )))
-          (let core (block '(
-            (return (Aggregate core '('"date" '"requester_id") '('('Sum11 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum12 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-          )))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"date" (Member row '"date")))
-            (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-            (let res (AddMember res '"gs_count" (Member row 'Sum11)))
-            (let res (AddMember res '"gs_weight" (Member row 'Sum12)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output2"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.cfg b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.cfg
deleted file mode 100644
index f01a3e0180..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-in Input many_columns.txt
-out Output output.txt
-out Output1 output1.txt
-out Output2 output2.txt
-out Output3 output3.txt
-res result.txt
-mount ..\mounts.txt
-udf datetime2_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.yqls
deleted file mode 100644
index 682b168b3c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.yqls
+++ /dev/null
@@ -1,254 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let world (Configure! world (DataSource '"config") 'SQL '0))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"assignment_gs_count" '"assignment_assignment_id" '"assignment_last_status_change_time" '"requester_id" '"project_id" '"assignment_gs_weight") '()))
-  (let world (Left! x))
-  (let table5 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core table5)
-      (let core (Filter core (lambda '(row) (Coalesce (">" (Member row '"assignment_gs_count") (Int64 '"0")) (Bool 'false)))))
-      (let core (block '(
-        (return (Aggregate core '('"assignment_assignment_id") '('('Some0 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"assignment_last_status_change_time")))) '('Some1 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"requester_id")))) '('Some2 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"project_id")))) '('Some3 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"assignment_gs_count")))) '('Some4 (Apply (bind aggregate_module '"some_traits_factory") (TypeOf core) (lambda '(row) (Member row '"assignment_gs_weight")))))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"assignment_id" (Member row '"assignment_assignment_id")))
-        (let res (AddMember res '"date" (SafeCast ("Apply" ("Udf" '"DateTime2.FromSeconds") (Cast (Member row 'Some0) 'Uint32)) (DataType 'Date))))
-        (let res (AddMember res '"requester_id" (Member row 'Some1)))
-        (let res (AddMember res '"project_id" (Member row 'Some2)))
-        (let res (AddMember res '"gs_count" (Member row 'Some3)))
-        (let res (AddMember res '"gs_weight" (Cast (Member row 'Some4) 'Double)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Output"))) (Void) '()))
-  (let world (Left! x))
-  (let table7 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (block '(
-            (let select (block '(
-              (let core table7)
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (AsList row))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )))
-          (let core (block '(
-            (return (Aggregate core '('"date" '"project_id" '"requester_id") '('('Sum8 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum9 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-          )))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"date" (Member row '"date")))
-            (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-            (let res (AddMember res '"project_id" (Member row '"project_id")))
-            (let res (AddMember res '"gs_count" (Member row 'Sum8)))
-            (let res (AddMember res '"gs_weight" (Member row 'Sum9)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output1"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Output"))) (Void) '()))
-  (let world (Left! x))
-  (let table7 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (block '(
-            (let select (block '(
-              (let core (block '(
-                (let select (block '(
-                  (let core table7)
-                  (let core (FlatMap core (lambda '(row) (block '(
-                    (let res (AsList row))
-                    (return res)
-                  )))))
-                  (return core)
-                )))
-                (return select)
-              )))
-              (let core (block '(
-                (return (Aggregate core '('"date" '"project_id" '"requester_id") '('('Sum8 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum9 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-              )))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (Struct))
-                (let res (AddMember res '"date" (Member row '"date")))
-                (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-                (let res (AddMember res '"project_id" (Member row '"project_id")))
-                (let res (AddMember res '"gs_count" (Member row 'Sum8)))
-                (let res (AddMember res '"gs_weight" (Member row 'Sum9)))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )))
-          (let core (block '(
-            (return (Aggregate core '('"date" '"requester_id") '('('Sum11 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum12 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-          )))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"date" (Member row '"date")))
-            (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-            (let res (AddMember res '"gs_count" (Member row 'Sum11)))
-            (let res (AddMember res '"gs_weight" (Member row 'Sum12)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output2"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Output"))) (Void) '()))
-  (let world (Left! x))
-  (let table7 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (block '(
-            (let select (block '(
-              (let core (block '(
-                (let select (block '(
-                  (let core (block '(
-                    (let select (block '(
-                      (let core table7)
-                      (let core (FlatMap core (lambda '(row) (block '(
-                        (let res (AsList row))
-                        (return res)
-                      )))))
-                      (return core)
-                    )))
-                    (return select)
-                  )))
-                  (let core (block '(
-                    (return (Aggregate core '('"date" '"project_id" '"requester_id") '('('Sum8 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum9 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-                  )))
-                  (let core (FlatMap core (lambda '(row) (block '(
-                    (let res (Struct))
-                    (let res (AddMember res '"date" (Member row '"date")))
-                    (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-                    (let res (AddMember res '"project_id" (Member row '"project_id")))
-                    (let res (AddMember res '"gs_count" (Member row 'Sum8)))
-                    (let res (AddMember res '"gs_weight" (Member row 'Sum9)))
-                    (let res (AsList res))
-                    (return res)
-                  )))))
-                  (return core)
-                )))
-                (return select)
-              )))
-              (let core (block '(
-                (return (Aggregate core '('"date" '"requester_id") '('('Sum11 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum12 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-              )))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (Struct))
-                (let res (AddMember res '"date" (Member row '"date")))
-                (let res (AddMember res '"requester_id" (Member row '"requester_id")))
-                (let res (AddMember res '"gs_count" (Member row 'Sum11)))
-                (let res (AddMember res '"gs_weight" (Member row 'Sum12)))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )))
-          (let core (block '(
-            (return (Aggregate core '('"date") '('('Sum14 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_count")))) '('Sum15 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"gs_weight")))))))
-          )))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"date" (Member row '"date")))
-            (let res (AddMember res '"gs_count" (Member row 'Sum14)))
-            (let res (AddMember res '"gs_weight" (Member row 'Sum15)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output3"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.cfg b/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.cfg
deleted file mode 100644
index ed61022bf8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-mount ..\mounts.txt
-udf stat_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.sql b/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.sql
deleted file mode 100644
index aaa89e48d5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-USE plato;
-
-SELECT
-    key as key,
-    "a" || min(subkey || "q") as x1,
-    "b" || min(subkey || "q") as x2,
-    "c" || max(value) as x3,
-    "d" || max(value) as x4,
-    "1" || min(distinct subkey) as y1,
-    "2" || min(distinct subkey) as y2,
-    "3" || max(distinct value) as y3,
-    "4" || max(distinct value) as y4,
-    percentile(x, 0.5),
-    percentile(x, 0.9)
-FROM (SELECT key, subkey, value, Length(key) as x from Input)
-GROUP BY key
-ORDER BY key;
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.yqls
deleted file mode 100644
index 322d0e4047..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.yqls
+++ /dev/null
@@ -1,73 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"subkey" (Member row '"subkey")))
-            (let res (AddMember res '"value" (Member row '"value")))
-            (let res (AddMember res '"x" ("Size" (Member row '"key"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (block '(
-        (let percentile_x_create (lambda '(row) (MatchType (Member row '"x") 'Optional (lambda '(optValue) (FlatMap optValue (lambda '(value) (Just (Apply (Udf 'Stat.TDigest_Create) value))))) (lambda '(value) (Apply (Udf 'Stat.TDigest_Create) value)))))
-        (let percentile_x_update (lambda '(row state) (MatchType (Member row '"x") 'Optional (lambda '(optValue) (IfPresent state (lambda '(state) (IfPresent optValue (lambda '(value) (Just (Apply (Udf 'Stat.TDigest_AddValue) state value))) (Just state))) (FlatMap optValue (lambda '(value) (Just (Apply (Udf 'Stat.TDigest_Create) value)))))) (lambda '(value) (Apply (Udf 'Stat.TDigest_AddValue) state value)))))
-        (let percentile_x_save (lambda '(state) (MatchType state 'Optional (lambda '(optState) (Map optState (lambda '(currState) (Apply (Udf 'Stat.TDigest_Serialize) currState)))) (lambda '(currState) (Apply (Udf 'Stat.TDigest_Serialize) currState)))))
-        (let percentile_x_load (lambda '(item) (MatchType item 'Optional (lambda '(optData) (FlatMap optData (lambda '(data) (Just (Apply (Udf 'Stat.TDigest_Deserialize) data))))) (lambda '(data) (Apply (Udf 'Stat.TDigest_Deserialize) data)))))
-        (let percentile_x_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (Apply (Udf 'Stat.TDigest_Merge) a b)))))
-        (let percentile_x_finish (lambda '(state) (block '(
-          (let res (Struct))
-          (let res (AddMember res 'Percentile9 (Apply (lambda '(state) (MatchType state 'Optional (lambda '(optData) (Map optData (lambda '(data) (Apply (Udf 'Stat.TDigest_GetPercentile) data (Double '0.5))))) (lambda '(data) (Apply (Udf 'Stat.TDigest_GetPercentile) data (Double '0.5))))) state)))
-          (let res (AddMember res 'Percentile10 (Apply (lambda '(state) (MatchType state 'Optional (lambda '(optData) (Map optData (lambda '(data) (Apply (Udf 'Stat.TDigest_GetPercentile) data (Double '0.9))))) (lambda '(data) (Apply (Udf 'Stat.TDigest_GetPercentile) data (Double '0.9))))) state)))
-          (return res)
-        ))))
-        (return (Aggregate core '('"key") '('('Min1 (Apply (bind aggregate_module '"min_traits_factory") (TypeOf core) (lambda '(row) ("Concat" (Member row '"subkey") (String '"q"))))) '('Min2 (Apply (bind aggregate_module '"min_traits_factory") (TypeOf core) (lambda '(row) ("Concat" (Member row '"subkey") (String '"q"))))) '('Max3 (Apply (bind aggregate_module '"max_traits_factory") (TypeOf core) (lambda '(row) (Member row '"value")))) '('Max4 (Apply (bind aggregate_module '"max_traits_factory") (TypeOf core) (lambda '(row) (Member row '"value")))) '('Min5 (Apply (bind aggregate_module '"min_traits_factory") (ListType (StructMemberType (ListItemType (TypeOf core)) '"subkey")) (lambda '(row) row)) '"subkey") '('Min6 (Apply (bind aggregate_module '"min_traits_factory") (ListType (StructMemberType (ListItemType (TypeOf core)) '"subkey")) (lambda '(row) row)) '"subkey") '('Max7 (Apply (bind aggregate_module '"max_traits_factory") (ListType (StructMemberType (ListItemType (TypeOf core)) '"value")) (lambda '(row) row)) '"value") '('Max8 (Apply (bind aggregate_module '"max_traits_factory") (ListType (StructMemberType (ListItemType (TypeOf core)) '"value")) (lambda '(row) row)) '"value") '('percentile_x (AggregationTraits (ListItemType (TypeOf core)) percentile_x_create percentile_x_update percentile_x_save percentile_x_load percentile_x_merge percentile_x_finish (Null))))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"x1" ("Concat" (String '"a") (Member row 'Min1))))
-        (let res (AddMember res '"x2" ("Concat" (String '"b") (Member row 'Min2))))
-        (let res (AddMember res '"x3" ("Concat" (String '"c") (Member row 'Max3))))
-        (let res (AddMember res '"x4" ("Concat" (String '"d") (Member row 'Max4))))
-        (let res (AddMember res '"y1" ("Concat" (String '"1") (Member row 'Min5))))
-        (let res (AddMember res '"y2" ("Concat" (String '"2") (Member row 'Min6))))
-        (let res (AddMember res '"y3" ("Concat" (String '"3") (Member row 'Max7))))
-        (let res (AddMember res '"y4" ("Concat" (String '"4") (Member row 'Max8))))
-        (let res (AddMember res '"column9" (Member (Member row '"percentile_x") 'Percentile9)))
-        (let res (AddMember res '"column10" (Member (Member row '"percentile_x") 'Percentile10)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key" '"x1" '"x2" '"x3" '"x4" '"y1" '"y2" '"y3" '"y4" '"column9" '"column10")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yqls b/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yqls
index 7a8c8845dc..16a524943a 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let init (lambda '(x) x))
 (let update (lambda '(x y) (+ x y)))
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/default.cfg b/yql/essentials/tests/s-expressions/suites/Aggregation/default.cfg
index fe2b19a9ff..00dec6c3f8 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/default.cfg
@@ -1,3 +1 @@
-in Input input.txt
-out Output output.txt
 res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/input.txt b/yql/essentials/tests/s-expressions/suites/Aggregation/input.txt
deleted file mode 100644
index fc70ee2541..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/input.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{"key"="075";"subkey"="1";"value"="2"};
-{"key"="075";"subkey"="2";"value"="5"};
-{"key"="075";"subkey"="3";"value"="5"};
-{"key"="800";"subkey"="4";"value"="4"};
-{"key"="020";"subkey"="5";"value"="10"};
-{"key"="150";"subkey"="6";"value"="2"};
-{"key"="150";"subkey"="7";"value"="3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Aggregation/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/input1.txt b/yql/essentials/tests/s-expressions/suites/Aggregation/input1.txt
deleted file mode 100644
index d1fa0973d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/input1.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="075";"subkey"=".";"value"="abc"};
-{"key"="911";"subkey"=".";"value"="kkk"};
-{"key"="023";"subkey"=".";"value"="aaa"};
-{"key"="527";"subkey"=".";"value"="bbb"};
-{"key"="037";"subkey"=".";"value"="ddd"};
-{"key"="761";"subkey"=".";"value"="ccc"};
-{"key"="200";"subkey"=".";"value"="qqq"};
-{"key"="150";"subkey"=".";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/Aggregation/input1.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/input3.txt b/yql/essentials/tests/s-expressions/suites/Aggregation/input3.txt
deleted file mode 100644
index 6872d1e389..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/input3.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{"key"=1016143471372484394u};
-{"key"=1033900131482000140u};
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/Aggregation/input3.txt.attr
deleted file mode 100644
index bdbbaad78d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/input3.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{"_yql_row_spec"={
-    "Type"=["StructType";[
-        ["key";["DataType";"Uint64"]];
-        ]
-    ];
-    "SortDirections"=[1;];
-    "SortedBy"=["key";];
-    "SortedByTypes"=[["DataType";"Uint64";];];
-    "SortMembers"=["key";];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/many_columns.txt b/yql/essentials/tests/s-expressions/suites/Aggregation/many_columns.txt
deleted file mode 100644
index c76c262542..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/many_columns.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{"assignment_assignment_id"=243u;"assignment_gs_count"=98u;"assignment_gs_weight"=89989u;"assignment_last_status_change_time"=43u;"project_id"=67u;"requester_id"=65u};
-{"assignment_assignment_id"=43u;"assignment_gs_count"=9u;"assignment_gs_weight"=8u;"assignment_last_status_change_time"=4563u;"project_id"=6897u;"requester_id"=765u};
-{"assignment_assignment_id"=25u;"assignment_gs_count"=678u;"assignment_gs_weight"=0u;"assignment_last_status_change_time"=45u;"project_id"=62u;"requester_id"=63u};
-{"assignment_assignment_id"=2563u;"assignment_gs_count"=98u;"assignment_gs_weight"=89989u;"assignment_last_status_change_time"=43u;"project_id"=67u;"requester_id"=65u};
-{"assignment_assignment_id"=233453u;"assignment_gs_count"=98u;"assignment_gs_weight"=89989u;"assignment_last_status_change_time"=43u;"project_id"=67u;"requester_id"=65u};
-{"assignment_assignment_id"=2456u;"assignment_gs_count"=978u;"assignment_gs_weight"=89u;"assignment_last_status_change_time"=403u;"project_id"=67u;"requester_id"=67u};
-{"assignment_assignment_id"=27643u;"assignment_gs_count"=9768u;"assignment_gs_weight"=86789u;"assignment_last_status_change_time"=49u;"project_id"=67u;"requester_id"=67u};
-{"assignment_assignment_id"=248u;"assignment_gs_count"=9768u;"assignment_gs_weight"=89989u;"assignment_last_status_change_time"=409u;"project_id"=67u;"requester_id"=625u};
-{"assignment_assignment_id"=248u;"assignment_gs_count"=9768u;"assignment_gs_weight"=89969u;"assignment_last_status_change_time"=4u;"project_id"=6347u;"requester_id"=65u};
-{"assignment_assignment_id"=24893u;"assignment_gs_count"=98u;"assignment_gs_weight"=8963989u;"assignment_last_status_change_time"=40u;"project_id"=6767u;"requester_id"=655u};
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/many_columns.txt.attr b/yql/essentials/tests/s-expressions/suites/Aggregation/many_columns.txt.attr
deleted file mode 100644
index 54d58bb57d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/many_columns.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["assignment_assignment_id";["DataType";"Uint64"]];["assignment_last_status_change_time";["DataType";"Uint64"]];["requester_id";["DataType";"Uint64"]];["project_id";["DataType";"Uint64"]];["assignment_gs_count";["DataType";"Uint64"]];["assignment_gs_weight";["DataType";"Uint64"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/AndOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/AndOverOptional.yqls
deleted file mode 100644
index 4b878ab6d0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/AndOverOptional.yqls
+++ /dev/null
@@ -1,60 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let writer (lambda '(x) (MatchType x 'Optional 
-(lambda '(x) (Coalesce (Map x (lambda '(y) (ToString y))) (String 'NULL)))
-(lambda '(x) (ToString x)))))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let t (Bool 'true))
-   (let jt (Just t))
-   (let f (Bool 'false))
-   (let jf (Just f))
-   (let n (Nothing (OptionalType (DataType 'Bool))))
-   (let newValue value)
-
-   (let newValue (Concat newValue (String '" => AND true : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And t t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And t jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And t f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And t jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And t n)))))
-   (let newValue (Concat newValue (String '" => AND false : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And f t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And f jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And f f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And f jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And f n)))))          
-   (let newValue (Concat newValue (String '" => AND just true : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jt t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jt jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jt f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jt jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jt n)))))
-   (let newValue (Concat newValue (String '" => AND just false : ")))   
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jf t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jf jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jf f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jf jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And jf n)))))                
-   (let newValue (Concat newValue (String '" => AND nothing : ")))      
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And n t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And n jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And n f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And n jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (And n n)))))                
-  
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Arithmetic.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Arithmetic.yqls
deleted file mode 100644
index ac50a50ada..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Arithmetic.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '2))
-   (let y (Uint32 '0))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (+ (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (- (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (* (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ (Size value) x) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ (Size value) y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% (Size value) x) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% (Size value) y) (Uint32 '999))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticOverEmptyOptionals.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticOverEmptyOptionals.yqls
deleted file mode 100644
index fa25eff9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticOverEmptyOptionals.yqls
+++ /dev/null
@@ -1,80 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '7))
-   (let y (Uint32 '2))
-   (let z (Uint32 '0))
-   (let jx (Just x))
-   (let jy (Just y))
-   (let n (Nothing (OptionalType (DataType 'Uint32))))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (String '" + ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (+ x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (+ n n) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" - ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (- x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (- n n) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" * ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (* x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (* n n) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" / ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ x y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ x z) (Uint32 '999))))))   
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (/ n n) (Uint32 '999))))))   
-   (let newValue (Concat newValue (String '" % ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% x y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% x z) (Uint32 '999))))))   
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (% n n) (Uint32 '999))))))   
-
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.cfg
deleted file mode 100644
index 6f99339756..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.yqls
deleted file mode 100644
index 2df7e940fe..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.yqls
+++ /dev/null
@@ -1,53 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let u (Uint32 '2))
-   (let u64 (Uint64 '333))
-   (let u8 (Uint8 '7))
-   (let s (Int32 '-2))
-   (let d (Double '3.1415))
-   (let ju (Just u))
-   (let js (Just s))
-   (let jd (Just d))
-   (let newValue (Member item 'value))
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (CountBits u)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (CountBits u64)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (CountBits u8)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Inc u)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Dec u)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Plus u)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Minus u)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Inc ju) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Dec ju) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Plus ju) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Minus ju) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Inc s)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Dec s)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Plus s)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Minus s)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Inc js) (Int32 '-999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Dec js) (Int32 '-999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Plus js) (Int32 '-999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Minus js) (Int32 '-999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Abs s)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Abs d)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Plus d)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Minus d)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Plus jd) (Double '0))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Minus jd) (Double '0))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) table1map '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.cfg
deleted file mode 100644
index fe2b19a9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.yqls
deleted file mode 100644
index 76a39cde33..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let newValue (AsTagged (Member item 'value) 'myTag))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(let x (Read! world mr_source (Key '('table (String 'Output))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table2 '('('type))))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogical.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/BitLogical.yqls
deleted file mode 100644
index 801f98c809..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogical.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '2))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitNot (Size value))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitAnd (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitOr (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitXor (Size value) x)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogicalOverEmptyOptionals.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/BitLogicalOverEmptyOptionals.yqls
deleted file mode 100644
index bad75321c1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogicalOverEmptyOptionals.yqls
+++ /dev/null
@@ -1,62 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '7))
-   (let y (Uint32 '2))
-   (let z (Uint32 '0))
-   (let jx (Just x))
-   (let jy (Just y))
-   (let n (Nothing (OptionalType (DataType 'Uint32))))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (String '" BitNot ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitNot x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitNot jx) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitNot n) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" BitAnd ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitAnd x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitAnd n n) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" BitOr ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitOr x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitOr n n) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" BitXor ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (BitXor x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor x jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor jx jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor jx n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor n jy) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor x n) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (BitXor n n) (Uint32 '999))))))
-
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitShifts.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/BitShifts.yqls
deleted file mode 100644
index d38c5df0c2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitShifts.yqls
+++ /dev/null
@@ -1,31 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint8 '1))
-   (let y (Uint8 '10))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (ShiftLeft (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (RotLeft (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (ShiftRight (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (RotRight (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (ShiftLeft (Size value) y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (RotLeft (Size value) y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (ShiftRight (Size value) y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (RotRight (Size value) y)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitShiftsOverEmptyOptionals.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/BitShiftsOverEmptyOptionals.yqls
deleted file mode 100644
index d2dd9c92b4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitShiftsOverEmptyOptionals.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '7))
-   (let y (Uint8 '2))
-   (let jx (Just x))
-   (let n (Nothing (OptionalType (DataType 'Uint32))))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (String '" ShiftLeft ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (ShiftLeft x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (ShiftLeft jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (ShiftLeft n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" RotLeft ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (RotLeft x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (RotLeft jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (RotLeft n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" ShiftRight ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (ShiftRight x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (ShiftRight jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (ShiftRight n y) (Uint32 '999))))))
-   (let newValue (Concat newValue (String '" RotRight ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (RotRight x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (RotRight jx y) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (RotRight n y) (Uint32 '999))))))
-
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Cast.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Cast.yqls
deleted file mode 100644
index edf5b44792..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Cast.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (SafeCast value (DataType 'Int32)) (Int32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (SafeCast (String '42) (DataType 'Int32)) (Int32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (SafeCast value (DataType 'String))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (SafeCast (Int32 '123) (DataType 'String))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (SafeCast (Int32 '123) (DataType 'Double))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/CastStruct.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/CastStruct.yqls
deleted file mode 100644
index ff4a01823d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/CastStruct.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let type (StructType '('key (DataType 'String))))
-   (let list (List (ListType type)))
-   (let castedValue (CastStruct item type))
-   (let list (Append list castedValue))
-   (let newValue (Member castedValue 'key))
-   (let newValue (Concat newValue (ToString (Length list))))
-   (let s (Struct))
-   (let s (AddMember s 'key (String '.)))
-   (let s (AddMember s 'subkey (String  '.)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Coalesce.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Coalesce.yqls
deleted file mode 100644
index b03717e014..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Coalesce.yqls
+++ /dev/null
@@ -1,45 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '1))
-   (let y (Uint32 '2))
-   (let z (Uint32 '3))
-   (let n (Nothing (OptionalType (TypeOf x))))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   # single arg
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Unwrap (Coalesce (Just x)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Exists (Coalesce n))))))
-   # two arg
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Just x) y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Unwrap (Coalesce (Just x) (Just y)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce n y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Unwrap (Coalesce n (Just y)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Exists (Coalesce n n))))))
-   # more args
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce x y z)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Just x) (Just y) z)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Unwrap (Coalesce (Just x) (Just y) (Just z)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce n (Just y) z)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Unwrap (Coalesce n (Just y) (Just z)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce n n z)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Unwrap (Coalesce n n (Just z)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Exists (Coalesce n n n))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/CombineByKey.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/CombineByKey.yqls
deleted file mode 100644
index 5fa1b5c037..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/CombineByKey.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'abc) newValue))
-   (let newValue (Append newValue (String 'q)))
-   (let preMap (lambda '(item) (Just item)))
-   (let keyExtractor (lambda '(item) item))
-   (let init (lambda '(key item) item))
-   (let update (lambda '(key item state) (Concat state item)))
-   (let finish (lambda '(key state) (AsList '(key state))))
-   (let combined (CombineByKey newValue preMap keyExtractor init update finish))
-   (let ret (Map combined (lambda '(item2) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (Member item 'key)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value (Concat (Concat (Nth item2 '0) (String '" => ")) (ToString (Nth item2 '1)))))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Compare.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Compare.yqls
deleted file mode 100644
index bd5b02bfc8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Compare.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let b (String 'q))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (< value b)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (<= value b)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (> value b)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (>= value b)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (== value b)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (!= value b)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/CompareWithEmptyOptionals.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/CompareWithEmptyOptionals.yqls
deleted file mode 100644
index 4e7c2ed97f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/CompareWithEmptyOptionals.yqls
+++ /dev/null
@@ -1,69 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '700))
-   (let y (Uint32 '20))
-   (let z (Uint32 '0))
-   (let jx (FromString (Member item 'key) 'Uint32))
-   (let jy (FromString (Member item 'subkey) 'Uint32))
-   (let n (Nothing (OptionalType (DataType 'Uint32))))
-   (let test (lambda '(item) (If (Exists item) (ToString (Coalesce item (Bool 'false))) (String 'NULL))))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (String '" < ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (< x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< jx y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< x jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< jx jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< jx n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< n jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< x n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< n y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (< n n)))))
-   (let newValue (Concat newValue (String '" > ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (> x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> jx y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> x jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> jx jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> jx n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> n jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> x n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> n y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (> n n)))))
-   (let newValue (Concat newValue (String '" == ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (== x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== jx y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== x jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== jx jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== jx n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== n jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== x n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== n y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (== n n)))))
-   (let newValue (Concat newValue (String '" != ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (!= x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= jx y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= x jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= jx jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= jx n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= n jy)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= x n)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= n y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply test (!= n n)))))
-
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Concat.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Concat.yqls
deleted file mode 100644
index d423bbd1a2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Concat.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (Concat value (String 'zzz)))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Condense.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Condense.yqls
deleted file mode 100644
index d601958e3e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Condense.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'prepended) newValue))
-   (let newValue (Append newValue (String 'appended)))
-   (let state (Uint32 '0))
-   (let state (Condense (Iterator newValue) state (lambda '(item state) (Bool 'False)) (lambda '(item state) (+ state (Size item)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String  '.)))
-   (let s (AddMember s 'value (Concat (Concat value (String '" ==> ")) 
-    (ToString (Coalesce (ToOptional (Collect state)) (Uint32 '0))))))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Condense1.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Condense1.yqls
deleted file mode 100644
index 1899624162..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Condense1.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'prepended) newValue))
-   (let newValue (Append newValue (String 'appended)))
-   (let state (Condense1 (Iterator newValue) (lambda '(item) (Size item)) (lambda '(item state) (Bool 'False)) (lambda '(item state) (+ state (Size item)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String  '.)))
-   (let s (AddMember s 'value (Concat (Concat value (String '" ==> ")) 
-    (ToString (Coalesce (ToOptional (Collect state)) (Uint32 '0))))))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Contains.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Contains.yqls
deleted file mode 100644
index 1dbafaba7d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Contains.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let t1 (DataType 'Uint32))
-   (let t2 (DataType 'String))
-   (let d1 (DictType t1 t2))
-   (let d2 (Dict d1 '((Uint32 '4) (String 'aaa)) '((Uint32 '5) (String 'bbb))) )
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Contains d2 (Uint32 '4))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Contains d2 (Uint32 '6))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Convert.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Convert.yqls
deleted file mode 100644
index 74e0bf07e5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Convert.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Int32 '1))
-   (let y (Uint32 '20))
-   (let z (Double '300))
-   (let newValue (ToString (+ (Convert x (DataType 'Uint32)) y)))
-   (let newValue (Concat (Concat newValue (String '" ")) (ToString (+ (Coalesce (ToIntegral z (DataType 'Int32)) (Int32 '999)) x))))
-   (let newValue (Concat (Concat newValue (String '" ")) (ToString (+ (Convert y (DataType 'Double)) z))))
-   (let newValue (Concat (Concat newValue (String '" ")) (ToString (Coalesce (ToIntegral z (DataType 'Uint8)) (Uint8 '99)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/DicItems.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/DicItems.yqls
deleted file mode 100644
index 95277fbb51..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/DicItems.yqls
+++ /dev/null
@@ -1,48 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let t1 (DataType 'Uint32))
-   (let t2 (DataType 'String))
-   (let d1 (DictType t1 t2))
-   (let d2 (Dict d1 '((Uint32 '4) (String 'aaa)) '((Uint32 '4) (String 'zzz)) '((Uint32 '5) (String 'bbb))) )
-   (let list1 (Sort (DictItems d2) (Bool 'true) (lambda '(x) (Nth x '0))))
-   (let list2 (Sort (DictKeys d2) (Bool 'true) (lambda '(x) x)))
-   (let list3 (Sort (DictPayloads d2) (Bool 'true) (lambda '(x) x)))
-   (let value1 (Fold list1 (String '"") (lambda '(item state) (block '(
-      (let newValue state)
-      (let newValue (Concat newValue (String '" Items => ")))
-      (let newValue (Concat newValue (Concat (String '" ") (ToString (Nth item '0)))))
-      (let newValue (Concat newValue (Concat (String '" ") (ToString (Nth item '1)))))
-      (return newValue)
-   )))))
-   
-   (let value2 (Fold list2 (String '"") (lambda '(item state) (block '(
-      (let newValue state)
-      (let newValue (Concat newValue (String '" Keys => ")))
-      (let newValue (Concat newValue (Concat (String '" ") (ToString item))))
-      (return newValue)
-   )))))
-   
-   (let value3 (Fold list3 (String '"") (lambda '(item state) (block '(
-      (let newValue state)
-      (let newValue (Concat newValue (String '" Payloads => ")))
-      (let newValue (Concat newValue (Concat (String '" ") (ToString item))))
-      (return newValue)
-   )))))
-   
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value (Concat (Concat (Concat value value1) value2) value3)))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yqls
index d7d096c666..45bfc465e4 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yqls
index aabfde5009..28b1881600 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Enumerate.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Enumerate.yqls
deleted file mode 100644
index 245bccb5a7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Enumerate.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'p) newValue))
-   (let newValue (Append newValue (String 'a)))
-   (let numList (Enumerate newValue))
-   (let ret (Map numList (lambda '(item2) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (Member item 'key)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value (Concat (Concat (ToString (Nth item2 '0)) (String '" => ")) (Nth item2 '1))))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Exists.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Exists.yqls
deleted file mode 100644
index a45adbeeeb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Exists.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList (Exists (FromString (String 'zzz) 'Int32))))
-   (let newValue (Append newValue (Exists (FromString (String '3456) 'Int32))))
-   (let newValue (Append newValue (Exists (String 'zzz))))
-   (let ret (Map newValue (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value (ToString item)))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Extract.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Extract.yqls
deleted file mode 100644
index 97637f6e25..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Extract.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let list1 (AsList item))
-   (let list2 (Just '(value (Uint32 '22))))
-   (let structExtract (Extract list1 'key))
-   (let tupleExtract (Extract list2 '0))
-   (let ret (Map (Extend structExtract (ToList tupleExtract)) (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value item))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FilterAndSize.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/FilterAndSize.yqls
deleted file mode 100644
index db9c86ab6d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FilterAndSize.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let list (AsList value))
-   (let list (Append list (String 'x)))
-   (let filtered (Filter list (lambda '(x) (== (Size x) (Uint32 '1)))))
-   (let ret (Map filtered (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value item))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembers.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembers.yqls
deleted file mode 100644
index 7bb2ee9823..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembers.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let myStruct (AsStruct '('a (String 'z))))
-   (let flatten (FlattenMembers '('"first_" item) '('"second_" myStruct)))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Member flatten 'first_key))))
-   (let newValue (Concat newValue (Concat (String '" ") (Member flatten 'second_a))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional.yqls
deleted file mode 100644
index 4a2d27f7ce..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let myStruct (AsStruct '('a (String 'z))))
-   (let flatten (FlattenMembers '('"first_" item) '('"second_" (Just myStruct))))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Member flatten 'first_key))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Member flatten 'second_a) (String '"")))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yqls
index 42b30ea242..e750e414cb 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Floats.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Floats.yqls
deleted file mode 100644
index 08f9f64797..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Floats.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let x (Double '1.2))
-   (let y (Double '3))
-   (let newValue (String '" => "))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (+ x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (- x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (* x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (/ x y)))))
-   
-   (let x (Float '0.1))
-   (let y (Float '-2.2))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (+ x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (- x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (* x y)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (/ x y)))))
-
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (FromString (String '1.23) 'Float) (Float '0.0))))))
-   
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Fold.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Fold.yqls
deleted file mode 100644
index 34544fa51e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Fold.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'prepended) newValue))
-   (let newValue (Append newValue (String 'appended)))
-   (let state (Uint32 '0))
-   (let state (Fold newValue state (lambda '(item state) (+ state (Size item)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String  '.)))
-   (let s (AddMember s 'value (Concat (Concat value (String '" ==> ")) (ToString state))))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Fold1.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Fold1.yqls
deleted file mode 100644
index d360f24111..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Fold1.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'prepended) newValue))
-   (let newValue (Append newValue (String 'appended)))
-   (let state (Fold1 newValue 
-       (lambda '(item) '((Size item) (Uint64 '1))) 
-       (lambda '(item state) '((+ (Nth state '0) (Size item)) (+ (Nth state '1) (Uint64 '1))))))
-   (return (FlatMap state (lambda '(state) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (Member item 'key)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let x (ToString (Nth state '0)))
-      (let y (ToString (Nth state '1)))
-      (let s (AddMember s 'value 
-         (Concat (Concat value (String '" ==> ")) (Concat (Concat x (String '" ")) y))))
-      (return (AsList s))
-   )))))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Fold2Lambda.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Fold2Lambda.yqls
deleted file mode 100644
index 9d15c7ceb8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Fold2Lambda.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'prepended) newValue))
-   (let newValue (Append newValue (String 'appended)))
-   (let myLambda (lambda '(item state) (+ state item)))
-   (let state (Uint32 '0))
-   (let state (Fold (Map newValue (lambda '(x) (Size x))) state myLambda))
-   (let ilist (AsList (Int32 '4)))
-   (let ilist (Append ilist (Int32 '6)))
-   (let state2 (Int32 '0))
-   (let state2 (Fold ilist state2 myLambda))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String  '.)))
-   (let s (AddMember s 'value (Concat (Concat value (String '" ==> ")) (Concat (ToString state) (ToString state2)))))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FromString.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/FromString.yqls
deleted file mode 100644
index ba534b346d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FromString.yqls
+++ /dev/null
@@ -1,31 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList (Coalesce (FromString (String 'zzz) 'Int32) (Int32 '999))))
-   (let newValue (Append newValue (Coalesce (FromString (String '3456) 'Int32) (Int32 '999))))
-   (let newValue (Append newValue (Coalesce (FromString (String 'x"2345") 'Int32) (Int32 '999))))
-   (let newValue (Append newValue (Coalesce (FromString (String 'x"31") 'Int32) (Int32 '999))))
-   (let newValue (Append newValue (If (Coalesce (FromString (String 'true) 'Bool) (Bool 'false)) 
-      (Int32 '100) (Int32 '0))))
-      (let ret (Map newValue (lambda '(item) (block '(
-          (let s (Struct))
-          (let k (ToString (Coalesce (FromString (String '"1u,34") 'Yson) (Yson '"999"))))
-          (let k (Concat k (ToString (Coalesce (FromString (String '"NaN") 'Double) (Double '"999")))))
-          (let s (AddMember s 'key k))
-          (let sk (ToString (Coalesce (FromString (String '"[1u;34]") 'Yson) (Yson '"999"))))
-          (let sk (Concat sk (ToString (Coalesce (FromString (String '"-inf") 'Float) (Float '"999")))))
-          (let s (AddMember s 'subkey sk))
-          (let s (AddMember s 'value (ToString item)))
-          (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/GroupByKey.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/GroupByKey.yqls
deleted file mode 100644
index 931c95d7b6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/GroupByKey.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'q) newValue))
-   (let newValue (Append newValue (String 'ddd)))
-   (let ret (GroupByKey newValue (lambda '(x) x) (lambda '(key list) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key key))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value (ToString (Length list))))
-      (return (AsList s)))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/HasItems.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/HasItems.yqls
deleted file mode 100644
index 2500618f6f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/HasItems.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (Member item 'value))
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (HasItems (AsList (String 'zzz)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (HasItems (List (ListType (DataType 'Int32))))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (HasItems (AsDict '((Int32 '234) (String 'zzz))))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (HasItems (Dict (DictType (DataType 'Int32) (DataType 'String))))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (String '.)))
-   (let s (AddMember s 'subkey (String  '.)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/If.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/If.yqls
deleted file mode 100644
index f0cd523350..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/If.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let res (If (< (Member item 'key) (String '100)) value (String 'UUU)))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value res))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/IfType.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/IfType.cfg
deleted file mode 100644
index 6f99339756..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/IfType.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/IfType.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/IfType.yqls
deleted file mode 100644
index 9503f0ed59..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/IfType.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let key (Member item 'key))
-   (let res (IfType key (DataType 'String) (lambda '(item) (Concat item item)) (lambda '(item) item)))
-   (let s (Struct))
-   (let s (AddMember s 'key (ToString res)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value (Member item 'value)))
-   (return s)
-)))))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) table1map '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/IntTypes.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/IntTypes.yqls
deleted file mode 100644
index 56b74c715c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/IntTypes.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (Concat (String '"") (ToString (Uint8 '1))))
-   (let newValue (Concat newValue (ToString (Int32 '2))))
-   (let newValue (Concat newValue (ToString (Uint32 '3))))
-   (let newValue (Concat newValue (ToString (Int64 '4))))
-   (let newValue (Concat newValue (ToString (Uint64 '5))))
-   (let newValue (Concat newValue (ToString (Bool 'true))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Just.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Just.yqls
deleted file mode 100644
index eac651c347..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Just.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList (Not (Exists (Just (Uint32 '111))))))
-   (let newValue (Append newValue (== (Coalesce (Just (String 'z)) (String 'y)) (String 'z))))
-   (let ret (Map newValue (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value (ToString item)))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideMap.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideMap.yqls
deleted file mode 100644
index f308062a08..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideMap.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (Concat value (ToString (Length table1))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideReduce.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideReduce.yqls
deleted file mode 100644
index a28b93a7a7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideReduce.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (Concat (ToString (Length table1)) (ToString (HasItems table1)))))
-  (let s (AddMember s 'value (Concat (ToString (Length list)) (ToString (HasItems list)))))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Bool 'true) (lambda '(item) (Member item 'subkey)) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ListAppendPrependExtend.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/ListAppendPrependExtend.yqls
deleted file mode 100644
index c58fcc163d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ListAppendPrependExtend.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'prepended) newValue))
-   (let newValue (Append newValue (String 'appended)))
-   (let x (AsList (String '"extended twice")))
-   (let newValue (Extend newValue (Extend x x)))
-   (let ret (Map newValue (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value item))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Logical.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Logical.yqls
deleted file mode 100644
index 100c3df83b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Logical.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Bool 'true))
-   (let y (Bool 'false))
-   (let z (== value (String 'q)))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (And x z)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Or x z)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Xor x z)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Not z)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Lookup.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Lookup.yqls
deleted file mode 100644
index 2eb0e2ff1f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Lookup.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let t1 (DataType 'Uint32))
-   (let t2 (DataType 'String))
-   (let d1 (DictType t1 t2))
-   (let d2 (Dict d1 '((Uint32 '4) (String 'aaa)) '((Uint32 '5) (String 'bbb))) )
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Lookup d2 (Uint32 '4)) (String '?)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Lookup d2 (Uint32 '6)) (String '?)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.cfg
deleted file mode 100644
index 6f99339756..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.yqls
deleted file mode 100644
index 5eb3cb79d7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let key (FromString (Member item 'key) 'Uint64))
-   (let res (MatchType key 'Optional (lambda '(item) (Coalesce item (Uint64 '0))) (lambda '(item) item)))
-   (let s (Struct))
-   (let s (AddMember s 'key (ToString res)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value (Member item 'value)))
-   (return s)
-)))))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) table1map '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/MinMax.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/MinMax.yqls
deleted file mode 100644
index 71a972e7e9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/MinMax.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let x (Member item 'value))
-   (let y (String 'q))
-   (let z (String 'zzzz))
-   (let newValue x)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Min x))))
-   (let newValue (Concat newValue (Concat (String '" ") (Max x))))
-   (let newValue (Concat newValue (Concat (String '" ") (Min x y))))
-   (let newValue (Concat newValue (Concat (String '" ") (Min x x))))
-   (let newValue (Concat newValue (Concat (String '" ") (Max x y))))
-   (let newValue (Concat newValue (Concat (String '" ") (Max y y))))
-   (let newValue (Concat newValue (Concat (String '" ") (Min x y z))))
-   (let newValue (Concat newValue (Concat (String '" ") (Min x x z))))
-   (let newValue (Concat newValue (Concat (String '" ") (Max x y z))))
-   (let newValue (Concat newValue (Concat (String '" ") (Max z z z))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/MinMaxOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/MinMaxOverOptional.yqls
deleted file mode 100644
index 87b210c725..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/MinMaxOverOptional.yqls
+++ /dev/null
@@ -1,45 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let x (Member item 'value))
-   (let y (String 'q))
-   (let jx (Just x))
-   (let jy (Just y))
-   (let n (Nothing (OptionalType (DataType 'String))))
-   (let newValue x)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (String '" Min ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Min x y))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min jx y) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min x jy) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min jx jy) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min jx n) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min n jy) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min n y) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min x n) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Min n n) (String '999)))))
-   (let newValue (Concat newValue (String '" Max ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Max x y))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max jx y) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max x jy) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max jx jy) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max jx n) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max n jy) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max n y) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max x n) (String '999)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Max n n) (String '999)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Nanvl.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Nanvl.yqls
deleted file mode 100644
index 899ddf853d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Nanvl.yqls
+++ /dev/null
@@ -1,81 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue value)
-   (let x (Float '2))
-   (let y (Float '0))
-   (let nan (/ y y))
-   (let jx (Just x))
-   (let jy (Just y))
-   (let jnan (Just nan))
-   (let n (Nothing (TypeOf jx)))
-   (let v (Null))
-   (let newValue (Concat newValue (String '" Float => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x y) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl y y) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl nan y) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jx y) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jy y) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jnan y) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl n y) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x jy) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl y jy) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl nan jy) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jx jy) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jy jy) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jnan jy) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl n jy) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x n) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl y n) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl nan n) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jx n) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jy n) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jnan n) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl n n) (Float '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x v) (Float '999))))))
-   (let x (Double '2))
-   (let y (Double '0))
-   (let nan (/ y y))
-   (let jx (Just x))
-   (let jy (Just y))
-   (let jnan (Just nan))
-   (let n (Nothing (TypeOf jx)))
-   (let newValue (Concat newValue (String '" Double => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x y) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl y y) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl nan y) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jx y) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jy y) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jnan y) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl n y) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x jy) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl y jy) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl nan jy) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jx jy) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jy jy) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jnan jy) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl n jy) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x n) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl y n) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl nan n) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jx n) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jy n) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl jnan n) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl n n) (Double '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Nanvl x v) (Double '999))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/NotOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/NotOverOptional.yqls
deleted file mode 100644
index 6a4f6f8e19..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/NotOverOptional.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let writer (lambda '(x) (MatchType x 'Optional 
-(lambda '(x) (Coalesce (Map x (lambda '(y) (ToString y))) (String 'NULL)))
-(lambda '(x) (ToString x)))))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let t (Bool 'true))
-   (let jt (Just t))
-   (let f (Bool 'false))
-   (let jf (Just f))
-   (let n (Nothing (OptionalType (DataType 'Bool))))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => NOT : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Not t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Not jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Not f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Not jf)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Not n)))))      
-  
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Now.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/Now.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Now.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Now.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Now.yqls
deleted file mode 100644
index f187eeef74..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Now.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let newValue (ToString (Now (DependsOn (Member item 'value)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (ToString (Now))))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Nth.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Nth.yqls
deleted file mode 100644
index 0e3fc4acf6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Nth.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let x '((String 'zzz) (Member item 'value)))
-   (let newValue (Nth x '1))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalIf.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/OptionalIf.yqls
deleted file mode 100644
index 08758ca2b4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalIf.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (Coalesce (OptionalIf (== (Size value) (Uint32 '1)) value) (String '--)))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalReduce.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/OptionalReduce.yqls
deleted file mode 100644
index f53f027cbe..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalReduce.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '2))
-   (let y (Uint32 '3))
-   (let jx (Just x))
-   (let jy (Just y))
-   (let n (Nothing (OptionalType (DataType 'Uint32))))
-   (let handler (lambda '(x y) (+ x y)))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (OptionalReduce x y handler)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (OptionalReduce jx jy handler) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (OptionalReduce jx n handler) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (OptionalReduce n jy handler) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (OptionalReduce n n handler) (Uint32 '999))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/OrOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/OrOverOptional.yqls
deleted file mode 100644
index 8a1440b4a0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/OrOverOptional.yqls
+++ /dev/null
@@ -1,60 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let writer (lambda '(x) (MatchType x 'Optional 
-(lambda '(x) (Coalesce (Map x (lambda '(y) (ToString y))) (String 'NULL)))
-(lambda '(x) (ToString x)))))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let t (Bool 'true))
-   (let jt (Just t))
-   (let f (Bool 'false))
-   (let jf (Just f))
-   (let n (Nothing (OptionalType (DataType 'Bool))))
-   (let newValue value)
-
-   (let newValue (Concat newValue (String '" => OR true : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or t t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or t jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or t f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or t jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or t n)))))
-   (let newValue (Concat newValue (String '" => OR false : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or f t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or f jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or f f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or f jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or f n)))))          
-   (let newValue (Concat newValue (String '" => OR just true : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jt t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jt jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jt f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jt jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jt n)))))
-   (let newValue (Concat newValue (String '" => OR just false : ")))   
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jf t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jf jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jf f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jf jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or jf n)))))                
-   (let newValue (Concat newValue (String '" => OR nothing : ")))      
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or n t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or n jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or n f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or n jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Or n n)))))                
-   
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Random.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/Random.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Random.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Random.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Random.yqls
deleted file mode 100644
index 2e6b0f7236..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Random.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-# canonize yson here
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let newValue (Member item 'value))
-   (let newValue (Concat (Concat newValue (String '" ")) (ToString 
-     (Coalesce (ToIntegral (* (Uint64 '1000) (Random (DependsOn item))) (DataType 'Uint64)) (Uint64 '0)))))
-   (let newValue (Concat (Concat newValue (String '" ")) (ToString (RandomNumber (DependsOn item)))))
-   (let newValue (Concat (Concat newValue (String '" ")) (ToString (RandomUuid (DependsOn item)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (ToString (RandomNumber))))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Reverse.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Reverse.yqls
deleted file mode 100644
index d9d5058791..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Reverse.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Append newValue (String 'appended)))
-   (let ret (OrderedMap (Reverse newValue) (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value item))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Skip.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Skip.yqls
deleted file mode 100644
index 3691a0bc21..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Skip.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'p) newValue))
-   (let newValue (Append newValue (String 'a)))
-   (let ret (Map (Skip newValue (Uint64 '1)) (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value item))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/SkipAfterTake.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/SkipAfterTake.yqls
deleted file mode 100644
index 75ce137d75..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/SkipAfterTake.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table2 (Take table1 (Uint64 '2)))
-(let table3 (Skip table2 (Uint64 '1)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table3 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Sort.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Sort.yqls
deleted file mode 100644
index 7333ac3a14..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Sort.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'p) newValue))
-   (let newValue (Append newValue (String 'a)))
-   (let sorted (Sort newValue (Bool 'False) (lambda '(x) x)))
-   (let sorted (Append sorted (String '----)))
-   (let ret (Map sorted (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value item))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.cfg
deleted file mode 100644
index 9979f3f240..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input numeric_keys.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.yqls
deleted file mode 100644
index 8d61d0d81b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let result (Sort table1 (Bool 'true) (lambda '(item) (FromString (Member item 'key) 'Uint64))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/SortBySubkeyInsideReduce.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/SortBySubkeyInsideReduce.yqls
deleted file mode 100644
index db65afbd99..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/SortBySubkeyInsideReduce.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (ToString (Length list))))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Bool 'true) (lambda '(item) (Member item 'subkey)) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Substring.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Substring.yqls
deleted file mode 100644
index 7a43121bdc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Substring.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (Substring value (Uint32 '0) (Uint32 '1)))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Take.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Take.yqls
deleted file mode 100644
index 16e5ff7c87..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Take.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'p) newValue))
-   (let newValue (Append newValue (String 'a)))
-   (let ret (Map (Take newValue (Uint64 '2)) (lambda '(item) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (String '.)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value item))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TakeAfterSkip.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/TakeAfterSkip.yqls
deleted file mode 100644
index 8fb8659c08..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TakeAfterSkip.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table2 (Skip table1 (Uint64 '1)))
-(let table3 (Take table2 (Uint64 '2)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table3 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ToIndexDict.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/ToIndexDict.yqls
deleted file mode 100644
index 866fd55415..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ToIndexDict.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let list (AsList (Uint32 '7) (Uint32 '16)))
-   (let dict (ToIndexDict list))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length dict)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Contains dict (Uint64 '1))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Contains dict (Uint64 '10))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Lookup dict (Uint64 '1)) (Uint32 '999))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Coalesce (Lookup dict (Uint64 '10)) (Uint32 '999))))))      
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TryMember.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/TryMember.yqls
deleted file mode 100644
index 2c8d57527e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TryMember.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let key (Member item 'key))
-   (let res (TryMember item 'key (String 'aaa)))
-   (let res (Concat res (TryMember item 'newValue (String 'bbb))))
-   (let s (Struct))
-   (let s (AddMember s 'key res))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value (Member item 'value)))
-   (return s)
-)))))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) table1map '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TwoSkip.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/TwoSkip.yqls
deleted file mode 100644
index 453205bc66..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TwoSkip.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table2 (Skip table1 (Uint64 '1)))
-(let table3 (Skip table2 (Uint64 '2)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table3 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TwoTake.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/TwoTake.yqls
deleted file mode 100644
index abd4639a4c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TwoTake.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table2 (Take table1 (Uint64 '1)))
-(let table3 (Take table2 (Uint64 '2)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table3 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TypeConstructors.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/TypeConstructors.yqls
deleted file mode 100644
index 50527bf4fd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TypeConstructors.yqls
+++ /dev/null
@@ -1,49 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (RemoveSystemMembers (Right! x)))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '2))
-   (let y (String '!))
-   (let newValue value)
-   (let t1 (DataType 'Uint32))
-   (let o1 (OptionalType t1))
-   (let u1 (TupleType t1 o1))
-   (let str (DataType 'String))
-   (let s1 (StructType '('key str) '('subkey str) '('value str)))
-   (let s2 (Struct s1 '('subkey (String 'a)) '('key y) '('value y)))
-   (let s3 (AsStruct '('subkey (String 'a)) '('key y) '('value y)))
-   (let d1 (DictType t1 u1))
-   (let d2 (Dict d1))
-   (let d3 (Dict d1 '(x '(x (Just x)))))
-   (let d4 (AsDict '((String 'aaa) (Uint32 '17)) '((String 'aaa) (Uint32 '18)) '((String 'bbb) (Uint32 '5))))
-   (let z1 (Nothing (OptionalType (VoidType))))
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (+ (Size value) x)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length (List (ListType t1) x x))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length (List (ListType o1)))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length (List (ListType u1) '(x (Just x))))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Exists (Nothing o1))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length (AsList x x))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length (List (ListType s1) item))))))
-   (let newValue (Concat newValue (Concat (String '" ") (Member s2 'key))))
-   (let newValue (Concat newValue (Concat (String '" ") (Member s3 'subkey))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length d2)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length d3)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Length d4)))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Exists (Optional o1 x))))))
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Exists z1)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/UnionAll.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/UnionAll.yqls
deleted file mode 100644
index e332263266..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/UnionAll.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let list1 (Map table1 (lambda '(row) (block '(
-    (let res (AsStruct '('foo (FromString (Member row 'key) 'Int32)) '('bar (FromString (Member row 'subkey) 'Int32))))
-    (return res)
-)
-))))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let list2 (Map table2 (lambda '(row) (block '(
-    (let res (AsStruct '('foo (FromString (Member row 'key) 'Double)) '('jar (Member row 'value))))
-    (return res)
-)
-))))
-(let result (UnionAll list1 list2))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf result)) '()))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Unwrap.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Unwrap.yqls
deleted file mode 100644
index 2180970236..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Unwrap.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Uint32 '2))
-   (let newValue value)
-   (let newValue (Concat newValue (Concat (String '" ") (ToString (Unwrap (/ (Size value) x))))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/XorOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/XorOverOptional.yqls
deleted file mode 100644
index 3d605c38b6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/XorOverOptional.yqls
+++ /dev/null
@@ -1,60 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let writer (lambda '(x) (MatchType x 'Optional 
-(lambda '(x) (Coalesce (Map x (lambda '(y) (ToString y))) (String 'NULL)))
-(lambda '(x) (ToString x)))))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let t (Bool 'true))
-   (let jt (Just t))
-   (let f (Bool 'false))
-   (let jf (Just f))
-   (let n (Nothing (OptionalType (DataType 'Bool))))
-   (let newValue value)
-
-   (let newValue (Concat newValue (String '" => XOR true : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor t t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor t jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor t f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor t jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor t n)))))
-   (let newValue (Concat newValue (String '" => XOR false : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor f t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor f jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor f f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor f jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor f n)))))          
-   (let newValue (Concat newValue (String '" => XOR just true : ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jt t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jt jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jt f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jt jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jt n)))))
-   (let newValue (Concat newValue (String '" => XOR just false : ")))   
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jf t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jf jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jf f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jf jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor jf n)))))                
-   (let newValue (Concat newValue (String '" => XOR nothing : ")))      
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor n t)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor n jt)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor n f)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor n jf)))))         
-   (let newValue (Concat newValue (Concat (String '" ") (Apply writer (Xor n n)))))                
-   
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Zip.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/Zip.yqls
deleted file mode 100644
index 0455714f00..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Zip.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'p) newValue))
-   (let newValue (Append newValue (String 'a)))
-   (let smallList (AsList (Int32 '2)))
-   (let zippedList (Zip newValue smallList))
-   (let ret (Map zippedList (lambda '(item2) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (Member item 'key)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let s (AddMember s 'value (Concat (Concat (Nth item2 '0) (String '" => ")) (ToString (Nth item2 '1)))))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ZipAll.yqls b/yql/essentials/tests/s-expressions/suites/Builtins/ZipAll.yqls
deleted file mode 100644
index 554544466a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ZipAll.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (FlatMap table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let newValue (AsList value))
-   (let newValue (Prepend (String 'p) newValue))
-   (let newValue (Append newValue (String 'a)))
-   (let smallList (AsList (Int32 '2)))
-   (let zippedList (ZipAll newValue smallList))
-   (let ret (Map zippedList (lambda '(item2) (block '(
-      (let s (Struct))
-      (let s (AddMember s 'key (Member item 'key)))
-      (let s (AddMember s 'subkey (String  '.)))
-      (let x (Coalesce (Nth item2 '0) (String '_)))
-      (let y (Coalesce (Map (Nth item2 '1) (lambda '(x) (ToString x))) (String '_)))
-      (let s (AddMember s 'value (Concat (Concat x (String '" => ")) y)))
-      (return s))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/default.cfg b/yql/essentials/tests/s-expressions/suites/Builtins/default.cfg
index ad52c79527..e69de29bb2 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/default.cfg
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/input.txt b/yql/essentials/tests/s-expressions/suites/Builtins/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Builtins/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/numeric_keys.txt b/yql/essentials/tests/s-expressions/suites/Builtins/numeric_keys.txt
deleted file mode 100644
index cebd64e139..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/numeric_keys.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="1";"subkey"="10";"value"="FOO"};
-{"key"="2";"subkey"="20";"value"="BAR"};
-{"key"="3";"subkey"="30";"value"="BAR"};
-{"key"="WAT";"subkey"="WAT";"value"="FOO"};
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/numeric_keys.txt.attr b/yql/essentials/tests/s-expressions/suites/Builtins/numeric_keys.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Builtins/numeric_keys.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yqls
index 157a109a64..a79be033c5 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # Float -> Double (always success)
 (let world (Apply (bind alterto_module 'doAlterTo) world (Float '"1.0") (DataType 'Double) (Double '"0.0")))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yqls
index 746f8f987d..02bf0ebb30 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # Int32->Int16
 (let world (Apply (bind alterto_module 'doAlterTo) world (Int32 '10) (DataType 'Int16) (Int16 '100)))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yqls
index fd605370d2..c1cbb2e63a 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # String->Utf8
 (let world (Apply (bind alterto_module 'doAlterTo) world (String 'OK) (DataType 'Utf8) (Utf8 'FAIL)))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yqls
index 95377162e7..ebab3dc4ea 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # Dict<Int32, String> -> Dict<Int32, Utf8>
 (let targetType (DictType (DataType 'Int32) (DataType 'Utf8)))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yqls
index 6330d3262a..2124b97d45 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # List<Int32> -> List<Uint16> (success)
 (let targetType (ListType (DataType 'Uint16)))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yqls
index 6039cd0719..9075ebd9e6 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # Null -> Uint16?
 (let targetType (OptionalType (DataType 'Uint16)))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yqls
index 9141b62154..7a9fac88d6 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Int32? -> Uint16
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yqls
index 6654166a27..ab27b2e05c 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let targetType (StructType '('"a" (DataType 'Uint8)) '('"b" (DataType 'Utf8))))
 (let failValue (AsStruct '('a (Uint8 '0)) '('b (Utf8 '"not converted"))))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yqls
index 3ad49c4744..7290c74a3f 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let targetType (TupleType (DataType 'Uint8) (DataType 'Utf8)))
 (let failValue '((Uint8 '0) (Utf8 '"not converted")))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yqls b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yqls
index 020cf59904..a56231fdde 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yqls
@@ -4,7 +4,6 @@
 (import alterto_module '"alterto.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 ### Tuple
 
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yqls b/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yqls
index 8f253ab7a0..9010c35c89 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yqls
@@ -1,56 +1,55 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 
 # Data
 (let value (String 'test))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (Int32 '1))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (TzDatetime '"1546981200,Europe/Moscow"))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let valye (/ (Float '1) (Float '0)))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Optional 
 (let value (Just (Int32 '1)))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Tuple 
 (let value '((Int32 '1) (String 'test) (Float '1)))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value '())
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Struct
 (let value (AsStruct '('a (Int32 '1)) '('b (String 'one))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (Struct))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Variant
 (let valueType (VariantType (TupleType (DataType 'Int32) (NullType))))
 (let value (Variant (Int32 '123) '0 valueType))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let valueType (VariantType (StructType '('a (DataType 'Int32)) '('b (OptionalType (DataType 'String))))))
 (let value (Variant (Int32 '1) 'a valueType))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # List 
 (let value (AsList (Int32 '1) (Int32 '2) (Int32 '3)))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (List (ListType (NullType))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yqls b/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yqls
index a26295ffad..39c74168ea 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yqls
@@ -1,53 +1,52 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 
 # Optional
 (let value (Nothing (OptionalType (DataType 'Int32))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (Just (Nothing (OptionalType (DataType 'Int32)))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Null
 (let value (Null))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (Just (Null)))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (Nothing (OptionalType (NullType))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (Just (Nothing (OptionalType (NullType)))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Tuple
 (let value '((Int32 '1) (String 'test) (Nothing (OptionalType (DataType 'Int32)))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Struct
 (let value (AsStruct '('a (Int32 '1)) '('b (Just (Nothing (OptionalType (DataType 'Int32)))))))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # Variant
 (let valueType (VariantType (TupleType (DataType 'Int32) (NullType))))
 (let value (Variant (Null) '1 valueType))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let valueType (VariantType (StructType '('a (DataType 'Int32)) '('b (OptionalType (DataType 'String))))))
 (let value (Variant (Nothing (OptionalType (DataType 'String))) 'b valueType))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 # List
 (let value (AsList (Null) (Int32 '1) (Int32 '2)))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let value (AsList (Int32 '1) (Int32 '2) (Null)))
-(let world (Write! world res_sink (Key) (HasNull value) '()))
+(let world (Write! world res_sink (Key) (HasNull value) '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yqls
index 6dc4b237c5..c7e4493f90 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Dict<Int32, String> -> Dict<Uint8, Utf8> (full)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yqls
index 8f00b970d1..4896c3cd45 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # List<Int32> -> List<Uint16> (full)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yqls
index 6044a39e4e..84f95f81bf 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Null -> Uint16
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yqls
index c10d1243e9..90c9026cc8 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Int32? -> Uint16
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yqls
index 11fd9ebc30..ebdd59dfcb 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yqls
index 1ac4fd613e..962f8e7835 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Stream<Int32> -> Stream<Uint16> (full)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yqls
index 94bc8b7842..74357f40b5 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Struct<Int32, String, Utf8> -> Struct<Uint8?, Utf8?>
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yqls
index 33421380cb..8700d45dff 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let targetType (TupleType (DataType 'Uint8) (DataType 'Utf8)))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yqls b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yqls
index ea34cbd481..85c644fcc3 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 ### Tuple
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yqls b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yqls
index ee7aa8e401..f0cc5fa615 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Dict<Int32, String> -> Dict<Uint8, Utf8> (good)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yqls b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yqls
index 146ed0dbe9..462d27de83 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # List<Int32> -> List<Uint16> (good)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yqls b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yqls
index d7c66842b0..0b10b6214e 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Null -> Uint16?
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yqls
index 28cf793e44..82d532d21b 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Int32? -> Uint16
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yqls b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yqls
index afa021dd11..b33865217a 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Struct<Int32, String, Utf8?> -> Struct<Uint8?, Utf8?> (good)
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yqls b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yqls
index 4f2319f1ea..d2f7981b3d 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let targetType (TupleType (DataType 'Uint8) (DataType 'Utf8)))
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yqls b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yqls
index b533e16780..f8fa88c2f2 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yqls
@@ -1,7 +1,6 @@
 (
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 ### Tuple
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yqls b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yqls
index 1bc57c71bf..8e15c01763 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yqls b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yqls
index 0649383205..9fc52f4a12 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Config/PureCommit.cfg b/yql/essentials/tests/s-expressions/suites/Config/PureCommit.cfg
deleted file mode 100644
index e69de29bb2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Config/PureCommit.cfg
+++ /dev/null
diff --git a/yql/essentials/tests/s-expressions/suites/Config/PureCommit.yqls b/yql/essentials/tests/s-expressions/suites/Config/PureCommit.yqls
deleted file mode 100644
index 8578faff3c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Config/PureCommit.yqls
+++ /dev/null
@@ -1,5 +0,0 @@
-(
-#comment
-(let world (Commit! world (DataSink 'yt 'plato)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.cfg b/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.cfg
deleted file mode 100644
index 00dec6c3f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.cfg
+++ /dev/null
@@ -1 +0,0 @@
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.yqls b/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.yqls
deleted file mode 100644
index 606e06e0e4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.yqls
+++ /dev/null
@@ -1,6 +0,0 @@
-(
-#comment
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/Copy.yqls b/yql/essentials/tests/s-expressions/suites/Dynamic/Copy.yqls
deleted file mode 100644
index 9b7882d255..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/Copy.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input1"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/Limit.yqls b/yql/essentials/tests/s-expressions/suites/Dynamic/Limit.yqls
deleted file mode 100644
index c7190c8f88..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/Limit.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input1"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let input (Take input (Int32 '"3")))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Unordered input) '('('type))))
-(let world (Commit! world res_sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/TablePull.yqls b/yql/essentials/tests/s-expressions/suites/Dynamic/TablePull.yqls
deleted file mode 100644
index 4ba424cb1e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/TablePull.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-
-(let x (Read! world mr_source
-    (Key '('table (String 'Input1)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) data '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/TableScheme.yqls b/yql/essentials/tests/s-expressions/suites/Dynamic/TableScheme.yqls
deleted file mode 100644
index b10df583ba..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/TableScheme.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input1)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/default.cfg b/yql/essentials/tests/s-expressions/suites/Dynamic/default.cfg
deleted file mode 100644
index 64df516e6f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/default.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 input1.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/input1.txt b/yql/essentials/tests/s-expressions/suites/Dynamic/input1.txt
deleted file mode 100644
index c2f900fd7c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/input1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{"key"="020";"subkey"="1";"value"="q"};
-{"key"="075";"subkey"="2";"value"="abc"};
-{"key"="075";"subkey"="3";"value"="abc"};
-{"key"="075";"subkey"="4";"value"="abc"};
-{"key"="075";"subkey"="5";"value"="abc"};
-{"key"="150";"subkey"="6";"value"="qzz"};
-{"key"="800";"subkey"="7";"value"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/Dynamic/input1.txt.attr
deleted file mode 100644
index 9e3c33c4cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/input1.txt.attr
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "_yql_row_spec"={
-        "Type"=["StructType";[
-            ["key"; ["DataType"; "String"]];
-            ["subkey"; ["DataType"; "String"]];
-            ["value"; ["DataType"; "String"]];
-        ]];
-        "SortMembers"=["key"; "subkey"];
-        "SortedBy"=["key"; "subkey"];
-        "SortDirections"=[1; 1];
-        "SortedByTypes"=[["DataType";"String"]; ["DataType";"String"]]
-    };
-    "_yql_dynamic"=%true;
-    "schema"=<
-        "strict" = %true;
-        "unique_keys" = %true
-    >[
-        {
-            "name" = "key";
-            "type" = "string";
-            "sort_order" = "ascending";
-        };
-        {
-            "name" = "subkey";
-            "type" = "string";
-            "sort_order" = "ascending";
-        };
-        {
-            "name" = "value";
-            "type" = "string";
-        };
-    ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.yqls
deleted file mode 100644
index 00d991912a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.cfg
deleted file mode 100644
index 48cd4555f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output non_empty.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.yqls
deleted file mode 100644
index 65db044c0d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.yqls
deleted file mode 100644
index b51c4e8418..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.cfg
deleted file mode 100644
index 48cd4555f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output non_empty.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.yqls
deleted file mode 100644
index 46099b0328..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'false) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.yqls
deleted file mode 100644
index 587bc78b08..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'false) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.yqls
deleted file mode 100644
index e9a055f5d1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.cfg
deleted file mode 100644
index bffc8451cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output sorted.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.yqls
deleted file mode 100644
index 6b7ac4b175..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.yqls
deleted file mode 100644
index 4aa7916884..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.cfg
deleted file mode 100644
index bffc8451cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output sorted.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.yqls
deleted file mode 100644
index 65db044c0d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.yqls
deleted file mode 100644
index 37fb7a1e86..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.yqls
deleted file mode 100644
index 1b314c3f2e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/Bug2318.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/Bug2318.yqls
deleted file mode 100644
index 5734271142..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/Bug2318.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-#USE plato;
-#INSERT INTO Output WITH TRUNCATE SELECT key FROM Input;
-#COMMIT;
-#INSERT INTO Output WITH TRUNCATE SELECT key FROM CONCAT(Input, Output);
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let read (Read! world source (MrTableConcat (Key '('table (String '"Input")))) '('"key") '()))
-(let world (Left! read))
-(let input (Right! read))
-(let output (FlatMap input (lambda '(item) (AsList (AsStruct '('"key" (Member item '"key")))))))
-(let world (Write! world sink (Key '('table (String '"Output"))) output '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let read (Read! world source (MrTableConcat (Key '('table (String '"Input"))) (Key '('table (String '"Output")))) '('"key") '()))
-(let world (Left! read))
-(let input (Right! read))
-(let output (FlatMap input (lambda '(item) (AsList (AsStruct '('"key" (Member item '"key")))))))
-(let world (Write! world sink (Key '('table (String '"Output"))) output '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.cfg
deleted file mode 100644
index 66737248b8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input sorted.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.yqls
deleted file mode 100644
index 110b23d6ed..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.yqls
+++ /dev/null
@@ -1,31 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String 'Output))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (> key (String '"020")) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.yqls
deleted file mode 100644
index c834415dd1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.yqls
deleted file mode 100644
index 5803f92df9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DropTable.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/DropTable.yqls
deleted file mode 100644
index ab423f96a3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DropTable.yqls
+++ /dev/null
@@ -1,45 +0,0 @@
-#USE plato;
-#INSERT INTO Output SELECT CAST(key as Int32) as item1, value as item2 FROM Input;
-#COMMIT;
-#DROP TABLE Output;
-#COMMIT;
-#INSERT INTO Output SELECT CAST(key as Int32) as item3, value as item4 FROM Input;
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let conv1 (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"item1" (Cast (Member item '"key") 'Int32)))
-  (let res (AddMember res '"item2" (Member item '"value")))
-  (return (AsList res))
-))))
-
-(let conv2 (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"item3" (Cast (Member item '"key") 'Int32)))
-  (let res (AddMember res '"item4" (Member item '"value")))
-  (return (AsList res))
-))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv1))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let world (Write! world sink (Key '('table (String 'Output))) (Void) '('('mode 'drop))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv2))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'append))))
-
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.cfg
deleted file mode 100644
index a26fadcaa7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-xfail
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.yqls
deleted file mode 100644
index 513c160992..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.cfg
deleted file mode 100644
index a26fadcaa7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-xfail
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.yqls
deleted file mode 100644
index 27a8f34398..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-#USE plato;
-#DROP TABLE Output;
-#INSERT INTO Output SELECT key FROM Input;
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let conv (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"key" (Member item '"key")))
-  (return (AsList res))
-))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) (Void) '('('mode 'drop))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'append))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.cfg
deleted file mode 100644
index a26fadcaa7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-xfail
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.yqls
deleted file mode 100644
index 914cff8c91..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-#USE plato;
-#INSERT INTO Output SELECT key FROM Input;
-#DROP TABLE Output;
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let conv (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"key" (Member item '"key")))
-  (return (AsList res))
-))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'append))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) (Void) '('('mode 'drop))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.cfg
deleted file mode 100644
index a26fadcaa7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-xfail
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.yqls
deleted file mode 100644
index f2047207e7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'append))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.cfg
deleted file mode 100644
index 48cd4555f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output non_empty.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.yqls
deleted file mode 100644
index f27a896172..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.yqls
deleted file mode 100644
index c08723a840..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.cfg
deleted file mode 100644
index bffc8451cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output sorted.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.yqls
deleted file mode 100644
index 383a70fad1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.yqls
deleted file mode 100644
index a29f76402f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world sink (Key '('table (String 'Output))) input '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.cfg
deleted file mode 100644
index bffc8451cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output sorted.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.yqls
deleted file mode 100644
index b43deb2cd9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'false) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.yqls
deleted file mode 100644
index 71c6b7ef4f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'false) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.cfg
deleted file mode 100644
index 50b4461ad2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output sorted_desc.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.yqls
deleted file mode 100644
index f27a896172..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.yqls
deleted file mode 100644
index 643a22242b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'false) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideType.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideType.yqls
deleted file mode 100644
index f9b513d556..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideType.yqls
+++ /dev/null
@@ -1,52 +0,0 @@
-#USE plato;
-#INSERT INTO Output SELECT CAST(key as Int32) as item1, value as item2 FROM Input;
-#COMMIT;
-#INSERT INTO Output SELECT CAST(key as Int32) as item1, value as item2 FROM Input;
-#COMMIT;
-#INSERT INTO Output WITH TRUNCATE SELECT CAST(key as Int32) as item3, value as item4 FROM Input;
-
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let conv1 (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"item1" (Cast (Member item '"key") 'Int32)))
-  (let res (AddMember res '"item2" (Member item '"value")))
-  (return (AsList res))
-))))
-
-(let conv2 (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"item3" (Cast (Member item '"key") 'Int32)))
-  (let res (AddMember res '"item4" (Member item '"value")))
-  (return (AsList res))
-))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv1))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'append))))
-
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv1))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'append))))
-
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv2))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'renew))))
-
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideWithSort.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideWithSort.yqls
deleted file mode 100644
index 946c9f2d68..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideWithSort.yqls
+++ /dev/null
@@ -1,65 +0,0 @@
-#USE plato;
-#INSERT INTO Output SELECT COALESCE(CAST(key as Uint64), 0) as age1, value as name1 FROM Input ORDER by age1;
-#COMMIT;
-#INSERT INTO Output WITH TRUNCATE SELECT age1 as age2, name1 as name2 FROM Output WHERE age1 < 100 ORDER BY name2;
-#COMMIT;
-#SELECT * FROM Output where name2 < "zzz";
-
-
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let conv1 (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"age1" (Coalesce (Cast (Member item '"key") 'Uint64) (Uint64 '0))))
-  (let res (AddMember res '"name1" (Member item '"value")))
-  (return (AsList res))
-))))
-(let out (FlatMap input conv1))
-(let out (Sort out (Bool 'true) (lambda '(item) (Member item '"age1"))))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let filter (lambda '(item) (block '(
-  (let age (Member item '"age1"))
-  (let res (Coalesce (< age (Uint64 '100)) (Bool 'false)))
-  (return res)
-)
-)))
-(let out (Filter input filter))
-(let conv2 (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"age2" (Member item '"age1")))
-  (let res (AddMember res '"name2" (Member item '"name1")))
-  (return (AsList res))
-))))
-(let out (FlatMap out conv2))
-(let out (Sort out (Bool 'true) (lambda '(item) (Member item '"name2"))))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let filter (lambda '(item) (block '(
-  (let name (Member item '"name2"))
-  (let res (Coalesce (< name (String '"zzz")) (Bool 'false)))
-  (return res)
-)
-)))
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/PredictSort.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/PredictSort.yqls
deleted file mode 100644
index b3f57179c3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/PredictSort.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (< key (String '"100")) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.cfg
deleted file mode 100644
index d611f0155e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-out Output2 output2.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.yqls
deleted file mode 100644
index f2266e36a6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.yqls
+++ /dev/null
@@ -1,46 +0,0 @@
-#USE plato;
-#INSERT INTO Output WITH TRUNCATE SELECT key as a, "value:" || value as b FROM Input;
-#COMMIT;
-#INSERT INTO Output2 WITH TRUNCATE SELECT 1 as x;
-#COMMIT;
-#SELECT * FROM Output;
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let conv (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"a" (Member item '"key")))
-  (let res (AddMember res '"b" (Concat (String '"value:") (Member item '"value"))))
-  (return (AsList res))
-))))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let out (FlatMap input conv))
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let fill (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"x" (Int64 '"1")))
-  (return (AsList res))
-))))
-
-(let out2 (FlatMap (AsList (Void)) fill))
-(let world (Write! world sink (Key '('table (String 'Output2))) out2 '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let world (Write! world result (Key) input '('('type) '('autoref))))
-(let world (Commit! world result))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.cfg
deleted file mode 100644
index 6f99339756..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.yqls
deleted file mode 100644
index ecb64cf46c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource 'yt '$all) 'Attr 'externaltx '"0-0-0-0"))
-(let x (Read! world mr_source
-    (Key '('tablescheme (String '"Input")))
-    (Void) '(
-        '('do_not_fail_on_invalid_schema)
-        '('infer_scheme)
-    )
-))
-(let scheme (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '()))
-(return (Commit! world res_sink))
-)
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmas.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmas.yqls
deleted file mode 100644
index f3c7e35b7d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmas.yqls
+++ /dev/null
@@ -1,63 +0,0 @@
-#USE plato;
-#PRAGMA yt.InferSchema = "1";
-#PRAGMA yt.MaxRowWeight = "128m";
-#INSERT INTO Output
-#select * from Input
-#WHERE key != "0";
-#commit;
-#PRAGMA yt.InferSchema = "3";
-#select * from Input;
-#PRAGMA yt.MaxRowWeight = "128m";
-#PRAGMA yt.InferSchema = "1";
-#select * from Input
-#WHERE key != "0";
-
-(
-(let source (DataSource 'yt 'plato))
-(let source_any (DataSource 'yt '"$all"))
-(let sink (DataSink 'yt 'plato))
-(let result (DataSink 'result))
-
-(let world (Configure! world source_any '"Attr" '"inferschema" '"1"))
-(let world (Configure! world source_any '"Attr" '"maxrowweight" '"128m"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let input (Right! r))
-(let world (Left! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (!= key (String '"0")) (Bool 'false)))
-  (return res)
-))))
-
-(let out (Filter input filter))
-
-(let world (Write! world sink (Key '('table (String '"Output"))) out '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let world (Configure! world source_any '"Attr" '"inferschema" '"3"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let input (Right! r))
-(let world (Left! r))
-
-(let world (Write! world result (Key) input '('('type) '('autoref))))
-(let world (Commit! world result))
-
-(let world (Configure! world source_any '"Attr" '"maxrowweight" '"128m"))
-(let world (Configure! world source_any '"Attr" '"inferschema" '"1"))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let input (Right! r))
-(let world (Left! r))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type) '('autoref))))
-
-(let world (Commit! world result))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/UseAndOverrideType.yqls b/yql/essentials/tests/s-expressions/suites/Epochs/UseAndOverrideType.yqls
deleted file mode 100644
index 7980440ada..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/UseAndOverrideType.yqls
+++ /dev/null
@@ -1,44 +0,0 @@
-#USE plato;
-#INSERT INTO Output SELECT CAST(key as Int32) as item1, value as item2 FROM Input;
-#COMMIT;
-#INSERT INTO Output WITH TRUNCATE SELECT COALESCE(CAST(item1 as String), "") as key, "." as subkey, item2 as value FROM Output;
-
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let conv (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"item1" (Cast (Member item '"key") 'Int32)))
-  (let res (AddMember res '"item2" (Member item '"value")))
-  (return (AsList res))
-))))
-(let out (FlatMap input conv))
-
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String 'Output))) (Void) '()))
-(let world (Left! r))
-(let out (Right! r))
-
-(let conv (lambda '(item) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"key" (Coalesce (Cast (Member item '"item1") 'String) (String '""))))
-  (let res (AddMember res '"subkey" (String '".")))
-  (let res (AddMember res '"value" (Member item '"item2")))
-  (return (AsList res))
-
-))))
-(let out (FlatMap out conv))
-
-(let world (Write! world sink (Key '('table (String 'Output))) out '('('mode 'renew))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/default.cfg b/yql/essentials/tests/s-expressions/suites/Epochs/default.cfg
deleted file mode 100644
index fe2b19a9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/default.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/input.txt b/yql/essentials/tests/s-expressions/suites/Epochs/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Epochs/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/non_empty.txt b/yql/essentials/tests/s-expressions/suites/Epochs/non_empty.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/non_empty.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/non_empty.txt.attr b/yql/essentials/tests/s-expressions/suites/Epochs/non_empty.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/non_empty.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/sorted.txt b/yql/essentials/tests/s-expressions/suites/Epochs/sorted.txt
deleted file mode 100644
index dd47b9a25e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/sorted.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="023";"subkey"="3";"value"="aaa"};
-{"key"="037";"subkey"="5";"value"="ddd"};
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="150";"subkey"="8";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/sorted.txt.attr b/yql/essentials/tests/s-expressions/suites/Epochs/sorted.txt.attr
deleted file mode 100644
index 16aab8884b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/sorted.txt.attr
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-     "_yql_row_spec"={
-         "SortMembers"=["key"];
-         "SortedBy"=["key"];
-         "SortDirections"=[1];
-         "SortedByTypes"=[["DataType";"String"]];
-         "Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"String"]];["value";["DataType";"String"]]]]
-     }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/sorted_desc.txt b/yql/essentials/tests/s-expressions/suites/Epochs/sorted_desc.txt
deleted file mode 100644
index ac8e34386d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/sorted_desc.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"_yql_column_0"="\xE0\xC7\xCF\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="800";"subkey"="2";"value"="ddd"};
-{"_yql_column_0"="\xE0\xCE\xCA\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="150";"subkey"="4";"value"="qzz"};
-{"_yql_column_0"="\xE0\xCF\xC8\xCA\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="075";"subkey"="1";"value"="abc"};
-{"_yql_column_0"="\xE0\xCF\xCD\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="020";"subkey"="3";"value"="q"};
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/sorted_desc.txt.attr b/yql/essentials/tests/s-expressions/suites/Epochs/sorted_desc.txt.attr
deleted file mode 100644
index 903b4c7d93..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Epochs/sorted_desc.txt.attr
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "SortMembers" = [
-            "key"
-        ];
-        "SortDirections" = [
-            0
-        ];
-        "UniqueKeys" = %false;
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ];
-        "SortedByTypes" = [
-            [
-                "DataType";
-                "String"
-            ]
-        ];
-        "SortedBy" = [
-            "_yql_column_0"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.cfg
deleted file mode 100644
index 0db7c8a4b8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-res result.txt
-in Input1 Bug15491_Input1.txt
-in Input2 Bug15491_Input2.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.yqls
deleted file mode 100644
index 89a1e02765..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey1 (Just (Member item 'subkey)))
-  '('value1 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Member item 'key))
-  '('subkey2 (Just (Member item 'subkey)))
-  '('value2 (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '('('flatten))))
-
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"key") (Member row '"subkey1"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input1.txt
deleted file mode 100644
index 1dc1bcc60b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="3";"value"="abd"};
-{"key"="800";"subkey"="3";"value"="ddd"};
-{"key"="021";"subkey"="3";"value"="q"};
-{"key"="151";"subkey"="3";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input1.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input2.txt
deleted file mode 100644
index 1dc1bcc60b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="3";"value"="abd"};
-{"key"="800";"subkey"="3";"value"="ddd"};
-{"key"="021";"subkey"="3";"value"="q"};
-{"key"="151";"subkey"="3";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input2.txt.attr
deleted file mode 100644
index e45f964f78..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491_Input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "Utf8"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "Utf8"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "Utf8"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.cfg
deleted file mode 100644
index c828977eed..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-res result.txt
-in Input1 Bug1716_Input1.txt
-in Input2 Bug1716_Input2.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.yqls
deleted file mode 100644
index 7f37ba29ab..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.yqls
+++ /dev/null
@@ -1,305 +0,0 @@
-(
-(let data.source (DataSource 'yt 'plato))
-(let data.sink (DataSink 'yt 'plato))
-
-(let first (String 'Input1))
-(let second (String 'Input2))
-(let output (String 'Output))
-
-(let first.read
-    (Read! world data.source 
-        (Key '('table first))
-        (Void)
-        '('('infer_scheme))
-    )
-)
-
-(let world (Left! first.read))
-(let first.read (Right! first.read))
-
-(let second.read
-    (Read! world data.source 
-        (Key '('table second))
-        (Void)
-        '('('infer_scheme))
-    )
-)
-
-(let world (Left! second.read))
-(let second.read (Right! second.read))
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('Inner
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('Left
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('Right
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('Full
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('LeftOnly
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('LeftSemi
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('RightOnly
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('RightSemi
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let data
-    (EquiJoin
-        '((RemoveSystemMembers first.read) 'left) '((RemoveSystemMembers second.read) 'right)
-        '('Exclusion
-          'left
-          'right
-          # '('left 'id 'left 'id.nonzero 'left 'name 'left 'name.nonzero)
-          '('left 'id 'left 'name)
-          # '('right 'id 'right 'id.nonzero 'right 'name 'right 'name.nonzero)
-          '('right 'id 'right 'name)
-          '('('left 'small) '('right 'small)))
-        '('('flatten))
-    )
-)
-
-(let data
-    (Sort data
-        '((Bool 'true) (Bool 'true))
-        (lambda '(row) '((Member row 'id) (Member row 'name)))
-    )
-)
-
-(let world
-    (Write! world (DataSink 'result)
-        (Key)
-        data
-        '('('type))
-    )
-)
-
-(let world (Commit! world (DataSink 'result)))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input1.txt
deleted file mode 100644
index 7138a62f40..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"field1"="1_1";"field2"="2_1_1";"id"="1";"name"="name_1_1"};
-{"field1"="1_1";"field2"="2_1_2";"id"="1";"name"="name_1_1"};
-{"field1"="1_2";"field2"="2_1_1";"id"="1";"name"="name_1_2"};
-{"field1"="1_2";"field2"="2_1_2";"id"="1";"name"="name_1_2"};
-{"field1"="1_2";"id"="2";"name"="name_2_1"};
-{"field1"="1_3";"id"="3";"name"="name_3_1"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input1.txt.attr
deleted file mode 100644
index 54366c43a1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input1.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type" = [ "StructType";  [["field1";["OptionalType";["DataType";"String"]]];["field2";["OptionalType";["DataType";"String"]]];["id";["OptionalType";["DataType";"String"]]];["name";["OptionalType";["DataType";"String"]]]]];"UniqueKeys" = %false}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input2.txt
deleted file mode 100644
index 67606ea5fc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"field3"="3_1";"id"="1";"name"="name_1_1"};
-{"field3"="3_2";"id"="2";"name"="name_2_1"};
-{"field3"="3_3";"id"="2";"name"="name_2_2"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input2.txt.attr
deleted file mode 100644
index 268c3c5a6d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716_Input2.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type" = [ "StructType";  [["field3";["OptionalType";["DataType";"String"]]];["id";["OptionalType";["DataType";"String"]]];["name";["OptionalType";["DataType";"String"]]]]];"UniqueKeys" = %false}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.sql b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.sql
deleted file mode 100644
index b14b63a04a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-USE plato;
-
-$hash = (select key as devid, key as mmetric_devid from Input);
-$rutaxi = (select key as DeviceID from Input);
-$device = (select key as devid, key as yuid from Input);
-$cripta = (select key as yuid, value as phones from Input);
-
-$x = 
-    (
-    select 
-        hash.devid as devid
-        from $rutaxi as rutaxi
-        right semi join $hash as hash
-        on rutaxi.DeviceID = hash.mmetric_devid
-    );
-
-$y = 
-    (
-    select
-        device.yuid as yuid
-        from $x as x
-        right semi join $device as device
-        using(devid)
-    );
-
-
-$z = 
-    (
-    select
-        cripta.phones as phones
-        from $y as y
-        right semi join $cripta as cripta on
-            y.yuid = cripta.yuid || ""
-    );
-    
-select 
-    x.phones AS phone
-from $z AS x;
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.yqls
deleted file mode 100644
index 3420c4b19a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.yqls
+++ /dev/null
@@ -1,117 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"InputSelf")))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (Map (EquiJoin '((block '(
-            (let select (block '(
-              (let core (EquiJoin '((block '(
-                (let select (block '(
-                  (let core (EquiJoin '((block '(
-                    (let select (block '(
-                      (let core table0)
-                      (let core (FlatMap core (lambda '(row) (block '(
-                        (let res (AsStruct '('"DeviceID" (Member row '"key"))))
-                        (let res (AsList res))
-                        (return res)
-                      )))))
-                      (return core)
-                    )))
-                    (return select)
-                  )) '"rutaxi") '((block '(
-                    (let select (block '(
-                      (let core table0)
-                      (let core (FlatMap core (lambda '(row) (block '(
-                        (let res (AsStruct '('"devid" (Member row '"key")) '('"mmetric_devid" (Member row '"key"))))
-                        (let res (AsList res))
-                        (return res)
-                      )))))
-                      (return core)
-                    )))
-                    (return select)
-                  )) '"hash") '('RightSemi '"rutaxi" '"hash" '('"rutaxi" '"DeviceID") '('"hash" '"mmetric_devid") '()) '()))
-                  (let core (FlatMap core (lambda '(row) (block '(
-                    (let res (AsStruct '('"devid" (Member row '"hash.devid"))))
-                    (let res (AsList res))
-                    (return res)
-                  )))))
-                  (return core)
-                )))
-                (return select)
-              )) '"x") '((block '(
-                (let select (block '(
-                  (let core table0)
-                  (let core (FlatMap core (lambda '(row) (block '(
-                    (let res (AsStruct '('"devid" (Member row '"key")) '('"yuid" (Member row '"key"))))
-                    (let res (AsList res))
-                    (return res)
-                  )))))
-                  (return core)
-                )))
-                (return select)
-              )) '"device") '('RightSemi '"x" '"device" '('"x" '"devid") '('"device" '"devid") '()) '()))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (AsStruct '('"yuid" (Member row '"device.yuid"))))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )) '"y") '((Map (block '(
-            (let select (block '(
-              (let core table0)
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (AsStruct '('"yuid" (Member row '"key")) '('"phones" (Member row '"value"))))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )) (lambda '(row) (block '(
-            (let row (AddMember row '"_equijoin_column_0" ("Concat" (Member row '"yuid") (String '""))))
-            (return row)
-          )))) '"cripta") '('RightSemi '"y" '"cripta" '('"y" '"yuid") '('"cripta" '"_equijoin_column_0") '()) '()) (lambda '(row) (block '(
-            (let row (ForceRemoveMember row '"cripta._equijoin_column_0"))
-            (return row)
-          )))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"phones" (Member row '"cripta.phones"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"phone" (Member row '"phones"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"phone"))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"phone")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.sql b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.sql
deleted file mode 100644
index b12f694803..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-use plato;
-pragma yt.MapJoinLimit="1m";
-$a = (select cast(key as Uint64) as key,subkey from Input1);
-$b = (select cast(key as Uint32) as key,subkey from Input1);
-select * from $a as a join $b as b on a.key = b.key;
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.yqls
deleted file mode 100644
index 69c04bb536..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.yqls
+++ /dev/null
@@ -1,56 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input1")))) '('"key" '"subkey") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '((block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"key" (Cast (Member row '"key") 'Uint64)) '('"subkey" (Member row '"subkey"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"a") '((block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"key" (Cast (Member row '"key") 'Uint32)) '('"subkey" (Member row '"subkey"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"b") '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key") '()) '()))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/DoAllJoinsExceptCross.yql.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/DoAllJoinsExceptCross.yql.txt
deleted file mode 100644
index 9ef17f1842..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/DoAllJoinsExceptCross.yql.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-(
-
-(let doAllJoinsExceptCross (lambda '(world t1 t2) ( block '(
-
-  (let mr_source (DataSource 'yt 'plato))
-  (let x (Read! world mr_source (Key '('table (String t1))) (Void) '()))
-  (let world (Left! x))
-  (let list1 (Right! x))
-
-  (let x (Read! world mr_source (Key '('table (String t2))) (Void) '()))
-  (let world (Left! x))
-  (let list2 (Right! x))
-
-  (let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key) '('b 'key) '()) '()))
-  (let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key) '('b 'key) '()) '()))
-
-  (let sortDir2 '((Bool 'true) (Bool 'true)))
-  (let sortDir1 '((Bool 'true)))
-  (let keySelectorAB (lambda '(row) '((Member row '"a.key") (Member row '"b.key"))))
-  (let keySelectorA (lambda '(row) '((Member row '"a.key"))))
-  (let keySelectorB (lambda '(row) '((Member row '"b.key"))))
-
-  (let res_sink (DataSink 'result))
-  (let world (Write! world res_sink (Key) (Sort joinInner sortDir2 keySelectorAB) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinLeft sortDir2 keySelectorAB) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinRight sortDir2 keySelectorAB) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinFull sortDir2 keySelectorAB) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir1 keySelectorA) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir1 keySelectorB) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinExclusion sortDir2 keySelectorAB) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir1 keySelectorA) '('('type))))
-  (let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir1 keySelectorB) '('('type))))
-
-  (let world (Commit! world res_sink))
-  (return world)
-
-))))
-
-(export doAllJoinsExceptCross)
-
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yqls
index 655f2a8207..9e53490c97 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList
   (AsStruct '('a.key1 (Int32 '-1)) '('k.value1 (Int32 '1)) '('k.s (String '"k1")))
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiCrossSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiCrossSelfStr.yqls
deleted file mode 100644
index 944bb5f6de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiCrossSelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Cross '"a" '"b" '() '() '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiExclusionSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiExclusionSelfStr.yqls
deleted file mode 100644
index 0b94fa907f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiExclusionSelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3OptStr.yqls
deleted file mode 100644
index dc7718c806..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Cross '"a" '"b" '() '() '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3Str.yqls
deleted file mode 100644
index 894e36e1b9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Cross '"a" '"b" '() '() '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3OptStr.yqls
deleted file mode 100644
index b115bd6907..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3Str.yqls
deleted file mode 100644
index 0683a16ba8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3OptStr.yqls
deleted file mode 100644
index db3690c50a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3Str.yqls
deleted file mode 100644
index 2339478283..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3OptStr.yqls
deleted file mode 100644
index 786062ec45..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3Str.yqls
deleted file mode 100644
index 4f4a0eda4d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3OptStr.yqls
deleted file mode 100644
index 293639aa22..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Left '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3Str.yqls
deleted file mode 100644
index 5d7c766dc5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Left '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3OptStr.yqls
deleted file mode 100644
index 0ed5172d92..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3Str.yqls
deleted file mode 100644
index bb8bb2e523..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3OptStr.yqls
deleted file mode 100644
index c5382a89c2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3Str.yqls
deleted file mode 100644
index 0afd1f691e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3OptStr.yqls
deleted file mode 100644
index 89ca16a047..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3Str.yqls
deleted file mode 100644
index b5016c4e11..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3OptStr.yqls
deleted file mode 100644
index d6e1605074..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3Str.yqls
deleted file mode 100644
index 97a13fa2b9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3OptStr.yqls
deleted file mode 100644
index a64f8a6705..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3OptStr.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3Str.yqls
deleted file mode 100644
index 951e1d462b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3Str.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Full
-    '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey") (Member row '"c.key") (Member row '"c.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfStr.yqls
deleted file mode 100644
index 1d50eb5959..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Full '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnNoOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnNoOpt1Opt2Str.yqls
deleted file mode 100644
index af309a36eb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnNoOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Full '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1NoOpt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1NoOpt2Str.yqls
deleted file mode 100644
index 536807ec3d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1NoOpt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Full '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1Opt2Str.yqls
deleted file mode 100644
index cae4788bf3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Full '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOptPartial1OptPartial2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOptPartial1OptPartial2Str.yqls
deleted file mode 100644
index 08748168f6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOptPartial1OptPartial2Str.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt1a (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Member row 'subkey))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let tableOpt1b (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Member row 'key))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let join (EquiJoin '(tableOpt1a 'a) '(tableOpt1b 'b) '('Full '"a" '"b" '('"a" '"key"  '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnStr.yqls
deleted file mode 100644
index 8f7d2e40d2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Full '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3OptStr.yqls
deleted file mode 100644
index 9f014d1580..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3OptStr.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Cross '"a" '"b" '() '() '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3Str.yqls
deleted file mode 100644
index b9c69bf087..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Cross '"a" '"b" '() '() '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerDiffIntTypes.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerDiffIntTypes.yqls
deleted file mode 100644
index 6d7b8198a6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerDiffIntTypes.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableKVInt64 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Int64) (Int64 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Member row 'value))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Member row 'key))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableKVInt64 'a) '(tableKVInt 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3OptStr.yqls
deleted file mode 100644
index 7f144be37f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3OptStr.yqls
+++ /dev/null
@@ -1,38 +0,0 @@
-# ignore runonopt plan diff
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3Str.yqls
deleted file mode 100644
index 769cfb1657..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3OptStr.yqls
deleted file mode 100644
index 5b0febe8af..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3OptStr.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3Str.yqls
deleted file mode 100644
index b2436aff7f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3OptStr.yqls
deleted file mode 100644
index 0c12e21175..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3OptStr.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3Str.yqls
deleted file mode 100644
index 598c2ef4ec..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3StrRename.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3StrRename.yqls
deleted file mode 100644
index a3258f553c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3StrRename.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) 
-    '('('rename '"a.key" 'col1) '('rename '"b.subkey" '"") '('rename '"c.value" 'ccc))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3OptStr.yqls
deleted file mode 100644
index be7f6267c8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3OptStr.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Left '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3Str.yqls
deleted file mode 100644
index 03aa454da5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Left '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3OptStr.yqls
deleted file mode 100644
index 5ec5cd9a3f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3OptStr.yqls
+++ /dev/null
@@ -1,38 +0,0 @@
-# ignore runonopt plan diff
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3Str.yqls
deleted file mode 100644
index a081fd1505..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3OptStr.yqls
deleted file mode 100644
index eebaf0acbd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3OptStr.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3Str.yqls
deleted file mode 100644
index 4b40b0c009..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypes.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypes.yqls
deleted file mode 100644
index 8a259534c3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypes.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableKVInt64 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Int64))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Member row 'value))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Member row 'key))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let join (EquiJoin '(tableKVInt64 'a) '(tableKVInt 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypesTwoColumn.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypesTwoColumn.yqls
deleted file mode 100644
index 9abc122fd9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypesTwoColumn.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableKVInt64 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Int64))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Member row 'value))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Member row 'key))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let join (EquiJoin '(tableKVInt64 'a) '(tableKVInt 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3OptStr.yqls
deleted file mode 100644
index b4b825991e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3OptStr.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3Str.yqls
deleted file mode 100644
index 4e11a1b8c0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3OptStr.yqls
deleted file mode 100644
index 2bf637ce0d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3OptStr.yqls
+++ /dev/null
@@ -1,38 +0,0 @@
-# ignore runonopt plan diff
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3Str.yqls
deleted file mode 100644
index f1f3eec7ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3OptStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3OptStr.yqls
deleted file mode 100644
index 6e5d4d95d0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3OptStr.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3Str.yqls
deleted file mode 100644
index 808c44795b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3Str.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"b" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntSameDiff.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntSameDiff.yqls
deleted file mode 100644
index de061d0050..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntSameDiff.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '666)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '777)))
-   ))
-)))))
-(let tableKVInt1 (Take tableKVInt (Uint64 '6)))
-(let tableKVInt2 (Take tableKVInt (Uint64 '6)))
-(let join (EquiJoin '(tableKVInt1 'a) '(tableKVInt2 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntTakeDiff.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntTakeDiff.yqls
deleted file mode 100644
index 479d476017..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntTakeDiff.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '666)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '777)))
-   ))
-)))))
-(let tableKVInt1 (Take tableKVInt (Uint64 '6)))
-(let tableKVInt2 (Take tableKVInt (Uint64 '7)))
-(let join (EquiJoin '(tableKVInt1 'a) '(tableKVInt2 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStr.yqls
deleted file mode 100644
index 9de2396e4d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStr.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStrRename.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStrRename.yqls
deleted file mode 100644
index 932539b39a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStrRename.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) 
-  '('('rename '"a.key" 'col1) '('rename '"b.subkey" '""))))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.subkey") (Member row '"a.value"))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnNoOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnNoOpt1Opt2Str.yqls
deleted file mode 100644
index d02d26aafb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnNoOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1NoOpt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1NoOpt2Str.yqls
deleted file mode 100644
index 168fab831b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1NoOpt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2Str.yqls
deleted file mode 100644
index 110a3b617b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne1.yqls
deleted file mode 100644
index 5a9f9ca659..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne1.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let tableOpt3a (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('a.key (Just (Member row 'key)))
-     '('a.subkey (Just (Member row 'subkey)))
-     '('a.value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3a '('a)) '(tableOpt3 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne12.yqls
deleted file mode 100644
index 0d5b7d1601..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne12.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3a (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('a.key (Just (Member row 'key)))
-     '('a.subkey (Just (Member row 'subkey)))
-     '('a.value (Just (Member row 'value)))
-   ))
-)))))
-(let tableOpt3b (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('b.key (Just (Member row 'key)))
-     '('b.subkey (Just (Member row 'subkey)))
-     '('b.value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3a '('a)) '(tableOpt3b '('b)) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne2.yqls
deleted file mode 100644
index 5d15a2bab8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne2.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let tableOpt3b (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('b.key (Just (Member row 'key)))
-     '('b.subkey (Just (Member row 'subkey)))
-     '('b.value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3b '('b)) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasTwo.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasTwo.yqls
deleted file mode 100644
index 4c2225f7c5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasTwo.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3a (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('a.key (Just (Member row 'key)))
-     '('a.subkey (Just (Member row 'subkey)))
-     '('c.value (Just (Member row 'value)))
-   ))
-)))))
-(let tableOpt3b (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('d.key (Just (Member row 'key)))
-     '('b.subkey (Just (Member row 'subkey)))
-     '('b.value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3a '('a 'c)) '(tableOpt3b '('b 'd)) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOptPartial1OptPartial2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOptPartial1OptPartial2Str.yqls
deleted file mode 100644
index c6d7543ed3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOptPartial1OptPartial2Str.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt1a (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Member row 'subkey))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let tableOpt1b (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Member row 'key))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let join (EquiJoin '(tableOpt1a 'a) '(tableOpt1b 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnStr.yqls
deleted file mode 100644
index 7444baa207..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.cfg
deleted file mode 100644
index 27d3c78b8e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-res result.txt
-file joins.yql DoAllJoinsExceptCross.yql.txt
-in  InputInt8      InputInt8.txt
-in  InputUint32    InputUint32.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.yqls
deleted file mode 100644
index c07a92aa2a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.yqls
+++ /dev/null
@@ -1,9 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8 'InputUint32))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.cfg
deleted file mode 100644
index a4a0bb2fd7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-res result.txt
-file joins.yql DoAllJoinsExceptCross.yql.txt
-in  InputInt8      InputInt8.txt
-in  InputInt8Opt   InputInt8Opt.txt
-in  InputUint8     InputUint8.txt
-in  InputUint8Opt  InputUint8Opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.yqls
deleted file mode 100644
index 8fdfeda61a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8 'InputUint8))
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8Opt 'InputUint8))
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8 'InputUint8Opt))
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8Opt 'InputUint8Opt))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.cfg
deleted file mode 100644
index 27d3c78b8e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-res result.txt
-file joins.yql DoAllJoinsExceptCross.yql.txt
-in  InputInt8      InputInt8.txt
-in  InputUint32    InputUint32.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.yqls
deleted file mode 100644
index f24772569c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8 'InputUint32))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.cfg
deleted file mode 100644
index a4a0bb2fd7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-res result.txt
-file joins.yql DoAllJoinsExceptCross.yql.txt
-in  InputInt8      InputInt8.txt
-in  InputInt8Opt   InputInt8Opt.txt
-in  InputUint8     InputUint8.txt
-in  InputUint8Opt  InputUint8Opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.yqls
deleted file mode 100644
index 54c482a624..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8 'InputUint8))
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8Opt 'InputUint8))
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8 'InputUint8Opt))
-(let world (Apply (bind join_module 'doAllJoinsExceptCross) world 'InputInt8Opt 'InputUint8Opt))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftOnlySelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftOnlySelfStr.yqls
deleted file mode 100644
index a7593fde40..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftOnlySelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfStr.yqls
deleted file mode 100644
index d589fcda91..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnNoOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnNoOpt1Opt2Str.yqls
deleted file mode 100644
index 78921fa69b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnNoOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1NoOpt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1NoOpt2Str.yqls
deleted file mode 100644
index 09a21c9a81..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1NoOpt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1Opt2Str.yqls
deleted file mode 100644
index 8f36e81eb5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOptPartial1OptPartial2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOptPartial1OptPartial2Str.yqls
deleted file mode 100644
index 25e1eb9240..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOptPartial1OptPartial2Str.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt1a (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Member row 'subkey))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let tableOpt1b (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Member row 'key))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let join (EquiJoin '(tableOpt1a 'a) '(tableOpt1b 'b) '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnStr.yqls
deleted file mode 100644
index c644c56a26..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSemiSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSemiSelfStr.yqls
deleted file mode 100644
index e9aaf3442f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSemiSelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfInt.yqls
deleted file mode 100644
index 5409c45d54..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableOptKVInt 'b) '('Full '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfStr.yqls
deleted file mode 100644
index 64ba1df974..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfInt.yqls
deleted file mode 100644
index ed5b9c6896..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableOptKVInt 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfStr.yqls
deleted file mode 100644
index 9ed83ad59e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfInt.yqls
deleted file mode 100644
index 4896831f5a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableOptKVInt 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfStr.yqls
deleted file mode 100644
index c7d3ee062d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfInt.yqls
deleted file mode 100644
index 69e10681b2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableOptKVInt 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfStr.yqls
deleted file mode 100644
index 64ba1df974..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfInt.yqls
deleted file mode 100644
index e664996232..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableKVInt 'b) '('Full '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfStr.yqls
deleted file mode 100644
index 24de4a45d8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfInt.yqls
deleted file mode 100644
index c2340bb816..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableKVInt 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfStr.yqls
deleted file mode 100644
index 9fe63d8ec2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfInt.yqls
deleted file mode 100644
index 4cfb26b64e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableKVInt 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfStr.yqls
deleted file mode 100644
index 5fa76d8942..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfInt.yqls
deleted file mode 100644
index fed99eefc5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableOptKVInt 'a) '(tableKVInt 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfStr.yqls
deleted file mode 100644
index 24de4a45d8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfInt.yqls
deleted file mode 100644
index 02b042ac3a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableKVInt 'a) '(tableOptKVInt 'b) '('Full '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfStr.yqls
deleted file mode 100644
index ba2798678f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfInt.yqls
deleted file mode 100644
index 435fdc1a9c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableKVInt 'a) '(tableOptKVInt 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfStr.yqls
deleted file mode 100644
index d61db9da69..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfInt.yqls
deleted file mode 100644
index 924287c0f9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableKVInt 'a) '(tableOptKVInt 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfStr.yqls
deleted file mode 100644
index 3d1c3605fc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfInt.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfInt.yqls
deleted file mode 100644
index a2a085a722..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfInt.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOptKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (FromString (Member row 'key) 'Uint32))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (FromString (Member row 'value) 'Uint32))
-   ))
-)))))
-(let tableKVInt (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Coalesce (FromString (Member row 'key) 'Uint32) (Uint32 '888)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Coalesce (FromString (Member row 'value) 'Uint32) (Uint32 '999)))
-   ))
-)))))
-(let join (EquiJoin '(tableKVInt 'a) '(tableOptKVInt 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfStr.yqls
deleted file mode 100644
index ba2798678f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfStr.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightOnlySelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightOnlySelfStr.yqls
deleted file mode 100644
index b528c14467..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightOnlySelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfStr.yqls
deleted file mode 100644
index 76b372e52f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnNoOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnNoOpt1Opt2Str.yqls
deleted file mode 100644
index 155db305bc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnNoOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(table 'a) '(tableOpt3 'b) '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1NoOpt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1NoOpt2Str.yqls
deleted file mode 100644
index dc0928a52c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1NoOpt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1Opt2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1Opt2Str.yqls
deleted file mode 100644
index 0d550e7db3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1Opt2Str.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt3 (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Just (Member row 'value)))
-   ))
-)))))
-(let join (EquiJoin '(tableOpt3 'a) '(tableOpt3 'b) '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOptPartial1OptPartial2Str.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOptPartial1OptPartial2Str.yqls
deleted file mode 100644
index 9d539854bd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOptPartial1OptPartial2Str.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableOpt1a (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Just (Member row 'key)))
-     '('subkey (Member row 'subkey))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let tableOpt1b (Map table (lambda '(row) (block '(
-   (return (AsStruct
-     '('key (Member row 'key))
-     '('subkey (Just (Member row 'subkey)))
-     '('value (Member row 'value))
-   ))
-)))))
-
-(let join (EquiJoin '(tableOpt1a 'a) '(tableOpt1b 'b) '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnStr.yqls
deleted file mode 100644
index 5a6ff8cd0f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSemiSelfStr.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSemiSelfStr.yqls
deleted file mode 100644
index 71c2d26461..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSemiSelfStr.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner.yqls
deleted file mode 100644
index dee596e70a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey1 (Just (Member item 'subkey)))
-  '('value1 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey2 (Just (Member item 'subkey)))
-  '('value2 (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '('('flatten))))
-
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"key") (Member row '"subkey1"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner3.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner3.yqls
deleted file mode 100644
index ded633225d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner3.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey1 (Just (Member item 'subkey)))
-  '('value1 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey2 (Just (Member item 'subkey)))
-  '('value2 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey3 (Just (Member item 'subkey)))
-  '('value3 (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c)
-    '('Inner 
-       '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '())
-       '"c"  '('"a" '"key") '('"c" '"key" ) '())
-    '('('flatten))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInnerTwoColumns.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInnerTwoColumns.yqls
deleted file mode 100644
index 4cbe3482ed..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInnerTwoColumns.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value1 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value2 (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '('('flatten))))
-
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"key") (Member row '"subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.cfg
deleted file mode 100644
index 8402f5cd5f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-res result.txt
-in Input4 input4.txt
-in Input5 input5.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.yqls
deleted file mode 100644
index 9533ee9fb8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
- (let data.source (DataSource 'yt 'plato))
- (let data.sink (DataSink 'yt 'plato))
- (let input_left (Read! world data.source (Key '('table (String 'Input4))) (Void) '()))
- (let world (Left! input_left))
- (let input_left (Right! input_left))
-   
- (let input_right (Read! world data.source (Key '('table (String 'Input5))) (Void) '()))
- (let world (Left! input_right))
- (let input_right (Right! input_right))
- 
- (let output (EquiJoin '((RemoveSystemMembers input_left) 'left) '((RemoveSystemMembers input_right) 'right)
-   '('Left 'left 'right '('left 'id) '('right 'id) '()) '('('flatten))
- ))
-
- (let output (Map output (lambda '(item) (block '(
-   (let item (AddMember item 'val (String '"")))
-   (return item)
- )))))
-
- (let res_sink (DataSink 'result))
- (let world (Write! world res_sink (Key) output '('('type))))
- (let world (Commit! world res_sink))
- 
- (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi.yqls
deleted file mode 100644
index 2b3166643e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey1 (Just (Member item 'subkey)))
-  '('value1 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey2 (Just (Member item 'subkey)))
-  '('value2 (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '('('flatten))))
-
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"key") (Member row '"subkey1"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi3.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi3.yqls
deleted file mode 100644
index 4572699337..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi3.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey1 (Just (Member item 'subkey)))
-  '('value1 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey2 (Just (Member item 'subkey)))
-  '('value2 (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-(let table3 (Map table3 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey3 (Just (Member item 'subkey)))
-  '('value3 (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c)
-    '('Inner 
-       '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '())
-       '"c"  '('"a" '"key") '('"c" '"key" ) '())
-    '('('flatten))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoin.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoin.yqls
deleted file mode 100644
index d0c8c821b6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoin.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (String '1)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '(
-    '('left 'small)
-    )) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoinFat.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoinFat.yqls
deleted file mode 100644
index 94718f84d1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoinFat.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (String '1)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (String '800)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '(
-    '('left 'small)
-    )) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftUniqueRightMap.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftUniqueRightMap.yqls
deleted file mode 100644
index d77b848dc7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftUniqueRightMap.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"key" ) '('('left 'unique))) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoin.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoin.yqls
deleted file mode 100644
index 6e842ae76b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoin.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (String '1)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '(
-    '('right 'small)
-    )) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoinFat.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoinFat.yqls
deleted file mode 100644
index c9e4a7e0f6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoinFat.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (String '800)))
-  '('subkey (Just (String '1)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '(
-    '('right 'small)
-    )) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueInnerMap.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueInnerMap.yqls
deleted file mode 100644
index 16a90e3314..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueInnerMap.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '('('right 'unique))) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftMap.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftMap.yqls
deleted file mode 100644
index a3e4e456ea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftMap.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Left '"a" '"b" '('"a" '"key") '('"b" '"key" ) '('('right 'unique))) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftSemiShardedMap.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftSemiShardedMap.yqls
deleted file mode 100644
index c726a4c417..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftSemiShardedMap.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"150"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinshardcount" '"2"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Map table1 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let table2 (Map table2 (lambda '(item) (AsStruct
-  '('key (Just (Member item 'key)))
-  '('subkey (Just (Member item 'subkey)))
-  '('value (Just (Member item 'value)))))))
-
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '('('right 'unique))) 
-    '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.cfg
deleted file mode 100644
index 3673712415..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-res result.txt
-in Input InputSelf.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.yqls
deleted file mode 100644
index 707b389f4b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let tableLeft (Right! x))
-
-(let sorted (Sort tableLeft (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world mr_sink))
-
-(let x (Read! world mr_source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! x))
-(let tableRight (Right! x))
-
-(let tableLeft (Take tableLeft (Uint64 '3)))
-(let tableRight (Filter tableRight (lambda '(item) (Coalesce (< (Member item '"key") (String '"100")) (Bool 'false)))))
-
-(let join (EquiJoin '(tableLeft 'a) '(tableRight 'b) '('Inner '"a" '"b" '('"a" '"value") '('"b" '"value" ) '()) '()))
-(let join (Sort join (Bool 'true) (lambda '(item) (Member item '"a.key"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Take join (Uint64 '2)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8.txt
deleted file mode 100644
index c059f46f5b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"=-1;"value"="Int8_a"};
-{"key"=127;"value"="Int8_b"};
-{"key"=0;"value"="Int8_c"};
-{"key"=1;"value"="Int8_d"};
-{"key"=2;"value"="Int8_e"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8.txt.attr
deleted file mode 100644
index d89274ff75..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8.txt.attr
+++ /dev/null
@@ -1,6 +0,0 @@
-{"_yql_row_spec"={
-	"Type"=["StructType";[
-		["key";["DataType";"Int8"]];
-		["value";["DataType";"String"]]]
-	];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8Opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8Opt.txt
deleted file mode 100644
index 53ffddbb48..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8Opt.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"=-1;"value"="Int8Opt_a"};
-{"key"=127;"value"="Int8Opt_b"};
-{"key"=0;"value"="Int8Opt_c"};
-{"key"=1;"value"="Int8Opt_d"};
-{"key"=2;"value"="Int8Opt_e"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8Opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8Opt.txt.attr
deleted file mode 100644
index cbb7ba3fd9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputInt8Opt.txt.attr
+++ /dev/null
@@ -1,6 +0,0 @@
-{"_yql_row_spec"={
-	"Type"=["StructType";[
-		["key";["OptionalType";["DataType";"Int8"]]];
-		["value";["DataType";"String"]]]
-	];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf.txt
deleted file mode 100644
index 8ed0317c19..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="075";"subkey"=".";"value"="abc"};
-{"key"="911";"subkey"=".";"value"="kkk"};
-{"key"="023";"subkey"=".";"value"="075"};
-{"key"="527";"subkey"=".";"value"="bbb"};
-{"key"="037";"subkey"=".";"value"="ddd"};
-{"key"="761";"subkey"=".";"value"="023"};
-{"key"="200";"subkey"=".";"value"="qqq"};
-{"key"="150";"subkey"=".";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf2.txt
deleted file mode 100644
index cf8cf7a1e9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="075";"subkey"="1";"value"="7"};
-{"key"="x911";"subkey"="2";"value"="6"};
-{"key"="x023";"subkey"="3";"value"="3"};
-{"key"="x527";"subkey"="4";"value"="x023"};
-{"key"="x037";"subkey"="5";"value"="075"};
-{"key"="x761";"subkey"="6";"value"="2"};
-{"key"="x200";"subkey"="7";"value"="075"};
-{"key"="150";"subkey"="8";"value"="2"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf2.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputSelf2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint32.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint32.txt
deleted file mode 100644
index 5508f63735..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint32.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"=255u;"value"="Uint32_a"};
-{"key"=383u;"value"="Uint32_b"};
-{"key"=0u;"value"="Uint32_c"};
-{"key"=1u;"value"="Uint32_d"};
-{"key"=2u;"value"="Uint32_e"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint32.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint32.txt.attr
deleted file mode 100644
index 5ba9847c97..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint32.txt.attr
+++ /dev/null
@@ -1,6 +0,0 @@
-{"_yql_row_spec"={
-	"Type"=["StructType";[
-		["key";["DataType";"Uint32"]];
-		["value";["DataType";"String"]]]
-	];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8.txt
deleted file mode 100644
index 96864d084c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"=255u;"value"="Uint8_a"};
-{"key"=127u;"value"="Uint8_b"};
-{"key"=0u;"value"="Uint8_c"};
-{"key"=1u;"value"="Uint8_d"};
-{"key"=2u;"value"="Uint8_e"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8.txt.attr
deleted file mode 100644
index 8d7e3bcc24..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8.txt.attr
+++ /dev/null
@@ -1,6 +0,0 @@
-{"_yql_row_spec"={
-	"Type"=["StructType";[
-		["key";["DataType";"Uint8"]];
-		["value";["DataType";"String"]]]
-	];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8Opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8Opt.txt
deleted file mode 100644
index 3468f1080f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8Opt.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"=255u;"value"="Uint8Opt_a"};
-{"key"=127u;"value"="Uint8Opt_b"};
-{"key"=0u;"value"="Uint8Opt_c"};
-{"key"=1u;"value"="Uint8Opt_d"};
-{"key"=2u;"value"="Uint8Opt_e"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8Opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8Opt.txt.attr
deleted file mode 100644
index e3b512108c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InputUint8Opt.txt.attr
+++ /dev/null
@@ -1,6 +0,0 @@
-{"_yql_row_spec"={
-	"Type"=["StructType";[
-		["key";["OptionalType";["DataType";"Uint8"]]];
-		["value";["DataType";"String"]]]
-	];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yqls
index 59f07eb137..a58fc2bcda 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Int32 '1)) '('value1 (String 'A)))
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yqls
index 6245dd77bd..69e1b04b61 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Int32 '1)) '('value1 (String 'A))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yqls
index 0063b7b7ef..b9a16fa7b4 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('a.key1 (Int32 '1)) '('k.value1 (String 'A))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yqls
index 7807ba6e08..a2103a0841 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Int32 '1)) '('value1 (String 'A))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yqls
index 549fa2d302..93fa7a5dd6 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('a.key1 (Just (Int32 '1))) '('a.value1 (Just (String 'A)))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yqls
index 50ee09cda0..ce6361f91b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('a.key1 (Just (Int32 '1))) '('a.value1 (Just (String 'A)))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yqls
index 374fafce96..b188a2bdaa 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Just (Int32 '1))) '('value1 (Just (String 'A)))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yqls
index e9c47c9c76..98fed871c3 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('a.key1 (Just (Int32 '1))) '('c.value1 (Just (String 'A)))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yqls
index ef2ce92878..5a60fb9d69 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Int32 '1)) '('value1 (String 'A))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yqls
index 7e0a5a7fc2..6b91d2795a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Just (Int32 '1))) '('value1 (Just (String 'A))))
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yqls
index 759d3983ac..8d54c4ca5a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Just (Int32 '1))) '('value1 (Just (String 'A))))
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yqls
index 861a63112f..7d0599c079 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Int32 '1)) '('value1 (String 'A)))
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yqls
index 14636284d2..7ab64b0956 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1 (Int32 '1)) '('value1 (String 'A))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yqls
index 0b21ecc24d..d2c886b411 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1a (Int32 '1)) '('key1b (Uint32 '1)) '('value1 (String 'A))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yqls
index 66060097b8..0c4d1355b0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1a (Just (Int32 '1))) '('key1b (Just (Uint32 '1))) '('value1 (Just (String 'A)))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yqls
index 15834403dd..bc581daa4e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1a (Just (Int32 '1))) '('key1b (Just (Uint32 '1))) '('value1 (Just (String 'A)))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yqls
index 0ddee9815b..724b3e6bdb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   (AsStruct '('key1a (Int32 '1)) '('key1b (Uint32 '1)) '('value1 (String 'A))) 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.cfg
deleted file mode 100644
index 137266b187..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-res result.txt
-in Input SelfJoinLimit1.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.txt
deleted file mode 100644
index 717bdfe825..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key"="1";"subkey"="1";"value"="3"};
-{"key"="2";"subkey"="2";"value"="1"};
-{"key"="3";"subkey"="3";"value"="2"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.yqls
deleted file mode 100644
index f142bfd3d6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let table (Take table (Uint64 '2)))
-(let join (EquiJoin '(table 'a) '(table 'b) 
-'('Inner '"a" '"b" '('"a" '"key") '('"b" '"value") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinMergeFields.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinMergeFields.yqls
deleted file mode 100644
index e5a08be9c9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinMergeFields.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b) 
-'('Inner '"a" '"b" '('"a" '"key") '('"b" '"value") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SqlInToJoin.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/SqlInToJoin.yqls
deleted file mode 100644
index 46ad794a8b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SqlInToJoin.yqls
+++ /dev/null
@@ -1,59 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-
-
-(let list1 (AsList
-  (AsStruct '('k (String '800)))
-  (AsStruct '('k (String '020)))
-))
-
-(let list2 (AsList
-  (AsStruct '('k (String '020)))
-  (AsStruct '('k (String '800)))
-))
-
-(let list3 (AsList
-  (AsStruct '('k (String '021)))
-  (AsStruct '('k (String '800)))
-))
-
-
-(let filtered1 (FlatMap table1 (lambda '(item)
-  (OptionalIf (SqlIn list1 (Member item 'key) '('('tableSource)))
-              (AsStruct '('value (Member item 'value)) '('subkey (Member item 'subkey))))
-)))
-
-(let filtered2 (FlatMap table2 (lambda '(item) (block '(
-    (let sqlInPred (SqlIn list2 (Member item 'key) '('('tableSource))))
-    (return (OptionalIf (And sqlInPred (NotEqual (Member item 'value) (String 'ddd))) 
-                        (AsStruct '('value (Member item 'value)) '('subkey (Member item 'subkey)))))
-  ))
-)))
-
-(let filtered3 (FlatMap table3 (lambda '(item) (block '(
-    (let sqlInPred (SqlIn list3 (Member item 'key) '('('tableSource))))
-    (return (OptionalIf (And (NotEqual (Member item 'value) (String 'q)) sqlInPred)
-                        (AsStruct '('value (Member item 'value)) '('subkey (Member item 'subkey)))))
-  ))
-)))
-
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort filtered1 '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row 'value) (Member row 'subkey)))) '('('type))))
-(let world (Write! world res_sink (Key) (Sort filtered2 '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row 'value) (Member row 'subkey)))) '('('type))))
-(let world (Write! world res_sink (Key) (Sort filtered3 '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row 'value) (Member row 'subkey)))) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiCrossSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiCrossSelf.yqls
deleted file mode 100644
index 6d784c12f1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiCrossSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Cross '"a" '"b" '() '() '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiExclusionSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiExclusionSelf.yqls
deleted file mode 100644
index b3e903ce7b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiExclusionSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullSelf.yqls
deleted file mode 100644
index cf1497bcef..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Full '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullTwoFieldsSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullTwoFieldsSelf.yqls
deleted file mode 100644
index a682416eff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullTwoFieldsSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Full '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1EatOptSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1EatOptSelf.yqls
deleted file mode 100644
index 28be4deee9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1EatOptSelf.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '(table 'c) '('Inner
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) 
-    '"c" '('"a" '"value") '('"c" '"subkey" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1Self.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1Self.yqls
deleted file mode 100644
index 005fca072a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1Self.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '(table 'c) '('Inner
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) 
-    '"c" '('"a" '"value") '('"c" '"subkey" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1bSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1bSelf.yqls
deleted file mode 100644
index 676843a418..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1bSelf.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '(table 'c) '('Right
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) 
-    '"c" '('"b" '"value") '('"c" '"subkey" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested2Self.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested2Self.yqls
deleted file mode 100644
index ecfc4263ec..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested2Self.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '(table 'c) '(table 'd) '('Inner
-    '('Inner
-        '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '())
-        '"c" '('"b" '"key") '('"c" '"value" ) '())
-    '"d" '('"a" '"value") '('"d" '"subkey" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerSelf.yqls
deleted file mode 100644
index 633de6fcae..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerTwoFieldsSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerTwoFieldsSelf.yqls
deleted file mode 100644
index 793ee81306..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerTwoFieldsSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftOnlySelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftOnlySelf.yqls
deleted file mode 100644
index 867c048f8b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftOnlySelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSelf.yqls
deleted file mode 100644
index 1fc31dc350..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSemiSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSemiSelf.yqls
deleted file mode 100644
index 15fa410fc6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSemiSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftTwoFieldsSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftTwoFieldsSelf.yqls
deleted file mode 100644
index b305596d20..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftTwoFieldsSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptFullSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptFullSelf.yqls
deleted file mode 100644
index 2bb5d8dfc5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptFullSelf.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let table (Map table (lambda '(row) (AsStruct
-   '('key (Just (Member row 'key)))
-   '('subkey (Just (Member row 'subkey)))
-   '('value (Just (Member row 'value)))))))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Full '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptInnerSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptInnerSelf.yqls
deleted file mode 100644
index d37d7f696b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptInnerSelf.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let table (Map table (lambda '(row) (AsStruct
-   '('key (Just (Member row 'key)))
-   '('subkey (Just (Member row 'subkey)))
-   '('value (Just (Member row 'value)))))))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptLeftSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptLeftSelf.yqls
deleted file mode 100644
index 74edcb9ae2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptLeftSelf.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let table (Map table (lambda '(row) (AsStruct
-   '('key (Just (Member row 'key)))
-   '('subkey (Just (Member row 'subkey)))
-   '('value (Just (Member row 'value)))))))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Left '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptRightSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptRightSelf.yqls
deleted file mode 100644
index 47f1a8923a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptRightSelf.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let table (Map table (lambda '(row) (AsStruct
-   '('key (Just (Member row 'key)))
-   '('subkey (Just (Member row 'subkey)))
-   '('value (Just (Member row 'value)))))))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightOnlySelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightOnlySelf.yqls
deleted file mode 100644
index 0a0a502ca6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightOnlySelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSelf.yqls
deleted file mode 100644
index 9fe527324c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSemiSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSemiSelf.yqls
deleted file mode 100644
index 4e69796c1f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSemiSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightTwoFieldsSelf.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightTwoFieldsSelf.yqls
deleted file mode 100644
index d5145b4dec..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightTwoFieldsSelf.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputSelf))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"value" '"b" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf join)) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/default.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoin/default.cfg
index 41fe7506e0..00dec6c3f8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/default.cfg
@@ -1,6 +1 @@
 res result.txt
-in InputSelf InputSelf.txt
-in InputSelf2 InputSelf2.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input3 input3.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/input1.txt
deleted file mode 100644
index f53757c309..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="1";"value"="ddd"};
-{"key"="020";"subkey"="1";"value"="q"};
-{"key"="150";"subkey"="1";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/input1.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/input2.txt
deleted file mode 100644
index 07af3b4647..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="2";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="2";"value"="q"};
-{"key"="150";"subkey"="2";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/input2.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input3.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/input3.txt
deleted file mode 100644
index 1dc1bcc60b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="3";"value"="abd"};
-{"key"="800";"subkey"="3";"value"="ddd"};
-{"key"="021";"subkey"="3";"value"="q"};
-{"key"="151";"subkey"="3";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/input3.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input3.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input4.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/input4.txt
deleted file mode 100644
index 8852c0825e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input4.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{"payload_left"="aaa";"id"=1;};
-{"payload_left"="bbb";"id"=2;};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input4.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/input4.txt.attr
deleted file mode 100644
index 4cd0c640ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input4.txt.attr
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "_yql_row_spec" = {"Type" = [
-        "StructType";
-        [
-            [
-                "id";
-                [
-                    "DataType";
-                    "Int64"
-                ]
-            ];
-            [
-                "payload_left";
-                [
-                    "DataType";
-                    "String"
-                ]
-            ]
-        ]
-    ]};
-    "schema" = <
-        "strict" = %true;
-        "unique_keys" = %false
-    >
-    [
-        {
-            "name" = "payload_left";
-            "type" = "string"
-        };
-        {
-            "name" = "id";
-            "type" = "int64"
-        }
-    ];
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input5.txt b/yql/essentials/tests/s-expressions/suites/EquiJoin/input5.txt
deleted file mode 100644
index 398caa9279..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input5.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{"payload_right"="ccc";"id"=1;};
-{"payload_right"="ddd";"id"=3;};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/input5.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoin/input5.txt.attr
deleted file mode 100644
index cfc68e11aa..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/input5.txt.attr
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "_yql_row_spec" = {"Type" = [
-        "StructType";
-        [
-            [
-                "id";
-                [
-                    "DataType";
-                    "Int64"
-                ]
-            ];
-            [
-                "payload_right";
-                [
-                    "DataType";
-                    "String"
-                ]
-            ]
-        ]
-    ]};
-    "schema" = <
-        "strict" = %true;
-        "unique_keys" = %false
-    >
-    [
-        {
-            "name" = "payload_right";
-            "type" = "string"
-        };
-        {
-            "name" = "id";
-            "type" = "int64"
-        }
-    ];
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAllAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAllAny.yqls
deleted file mode 100644
index 283fccceff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAllAny.yqls
+++ /dev/null
@@ -1,9 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAll.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAll.yqls
deleted file mode 100644
index af7dbd189d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAll.yqls
+++ /dev/null
@@ -1,9 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAny.yqls
deleted file mode 100644
index e8016a1260..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAny.yqls
+++ /dev/null
@@ -1,9 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any) '('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yqls
index 0db96ff654..442451172c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yqls
@@ -3,7 +3,6 @@
 (import join_module '"joins.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # Same as InputKV1
 (let list1 (AsList 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yqls
index 42b1a60840..84919b6e58 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yqls
@@ -3,7 +3,6 @@
 (import join_module '"joins.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # Same as InputKV1
 (let list1 (AsList 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yqls
index 53b2d9eaae..de170e2af9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yqls
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yqls
@@ -3,7 +3,6 @@
 (import join_module '"joins.yql")
 
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # Same as InputKV1
 (let list1 (AsList 
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV1.txt
deleted file mode 100644
index 895634d4f4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="1";"v1"="v11"};
-{"key"="2";"v1"="v12"};
-{"key"="2";"v1"="v12"};
-{"key"="2";"v1"="v12"};
-{"key"="3";"v1"="v13"};
-{"key"="3";"v1"="v13"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV1.txt.attr
deleted file mode 100644
index 25b39416e2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV1.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{"_yql_row_spec"={
-  "Type"=["StructType";[
-    ["key";["DataType";"String"]];
-    ["v1";["DataType";"String"]]
-  ]];
-  "SortDirections"=[1;];
-  "SortedBy"=["key";];
-  "SortedByTypes"=[["DataType";"String";];];
-  "SortMembers"=["key";];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV2.txt
deleted file mode 100644
index b2ee98b41a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="2";"v2"="v22_extra_bytes"};
-{"key"="2";"v2"="v22_extra_bytes"};
-{"key"="3";"v2"="v23_extra_bytes"};
-{"key"="3";"v2"="v23_extra_bytes"};
-{"key"="3";"v2"="v23_extra_bytes"};
-{"key"="4";"v2"="v24_extra_bytes"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV2.txt.attr
deleted file mode 100644
index ca25d0f371..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InputKV2.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{"_yql_row_spec"={
-  "Type"=["StructType";[
-    ["key";["DataType";"String"]];
-    ["v2";["DataType";"String"]]
-  ]];
-  "SortDirections"=[1;];
-  "SortedBy"=["key";];
-  "SortedByTypes"=[["DataType";"String";];];
-  "SortMembers"=["key";];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAllAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAllAny.yqls
deleted file mode 100644
index cca73e9d75..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAllAny.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"lookupjoinlimit" '"64k"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAll.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAll.yqls
deleted file mode 100644
index e9547bfd31..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAll.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"lookupjoinlimit" '"64k"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAny.yqls
deleted file mode 100644
index e5bc5906b3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAny.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"lookupjoinlimit" '"64k"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any) '('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAllAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAllAny.yqls
deleted file mode 100644
index ad84352890..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAllAny.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAll.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAll.yqls
deleted file mode 100644
index 037e8aafc0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAll.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAny.yqls
deleted file mode 100644
index f1ce069c3e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAny.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any) '('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAllAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAllAny.yqls
deleted file mode 100644
index 5845432182..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAllAny.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAll.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAll.yqls
deleted file mode 100644
index 5f12b8e34e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAll.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAny.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAny.yqls
deleted file mode 100644
index eaad119c21..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAny.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-(library "joins.yql")
-(import join_module '"joins.yql")
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-
-(let world (Apply (bind join_module 'doAllJoinsExceptCrossLink) world 'Input1 'Input2 '('('left 'any) '('right 'any))))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/default.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/default.cfg
index c73c7f566e..aec9d0e088 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/default.cfg
@@ -1,4 +1,3 @@
 res result.txt
 file joins.yql DoAllJoinsExceptCross.yql.txt
-in  Input1  InputKV1.txt
-in  Input2  InputKV2.txt
+
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommon.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommon.yqls
deleted file mode 100644
index fd0cd3266b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommon.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonKey2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonKey2.yqls
deleted file mode 100644
index 04d4ac8e78..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonKey2.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1.yqls
deleted file mode 100644
index c2925077b4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12.yqls
deleted file mode 100644
index 4f530fd62f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12Key2.yqls
deleted file mode 100644
index 430c926921..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12Key2.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1Key2.yqls
deleted file mode 100644
index da741bd831..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1Key2.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2.yqls
deleted file mode 100644
index 10ceca2c98..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2Key2.yqls
deleted file mode 100644
index 0cd36f7c36..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2Key2.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key2"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key2") (Member row '"b.subkey2"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinCross sortDir4 keySelectorAB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/default.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/default.cfg
deleted file mode 100644
index 3986c38117..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/default.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-res result.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input1Opt input1opt.txt
-in Input2Opt input2opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1.txt
deleted file mode 100644
index 6cacacff58..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key1"=1;subkey1=".";"value1"="A"};
-{"key1"=4;subkey1=".";"value1"="C"};
-{"key1"=4;subkey1=".";"value1"="D"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1.txt.attr
deleted file mode 100644
index 8714765eb4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "DataType";
-                        "Int32"
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1opt.txt
deleted file mode 100644
index f03418b1bf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key1"=1;subkey1=".";"value1"="A"};
-{"key1"=4;subkey1=".";"value1"="C"};
-{"key1"=4;subkey1=".";"value1"="D"};
-{"key1"=#;subkey1=".";"value1"="E"};
-{"key1"=#;subkey1=".";"value1"="F"};
-{"key1"=#;subkey1=".";"value1"="G"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1opt.txt.attr
deleted file mode 100644
index de343fa9cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input1opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2.txt
deleted file mode 100644
index 7e4ea597de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2.txt.attr
deleted file mode 100644
index 824353dafc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "DataType";
-                        "Uint64"
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2opt.txt
deleted file mode 100644
index 17ff7232b7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
-{"key2"=#;subkey2=".";"value2"="P"};
-{"key2"=#;subkey2=".";"value2"="Q"};
-{"key2"=#;subkey2=".";"value2"="R"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2opt.txt.attr
deleted file mode 100644
index 990e5b6aee..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/input2opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Uint64"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMap.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMap.yqls
deleted file mode 100644
index 8739797e8f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMap.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapKey2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapKey2.yqls
deleted file mode 100644
index eef99f2886..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapKey2.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1.yqls
deleted file mode 100644
index e50b5b2bf5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12.yqls
deleted file mode 100644
index 64367c4c33..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12Key2.yqls
deleted file mode 100644
index 51af3fa6f0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12Key2.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1Key2.yqls
deleted file mode 100644
index 3a089710e9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1Key2.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2.yqls
deleted file mode 100644
index 678ed1b9ea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2Key2.yqls
deleted file mode 100644
index 2e36542a53..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2Key2.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinInner '('('type))))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-(let world (Write! world res_sink (Key) joinRight '('('type))))
-(let world (Write! world res_sink (Key) joinLeftOnly '('('type))))
-(let world (Write! world res_sink (Key) joinRightOnly '('('type))))
-(let world (Write! world res_sink (Key) joinLeftSemi '('('type))))
-(let world (Write! world res_sink (Key) joinRightSemi '('('type))))
-(let world (Write! world res_sink (Key) joinCross '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.cfg
deleted file mode 100644
index 45bd8b2b81..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-res result.txt
-in Input1 bug3054_1.txt
-in Input2 bug3054_2.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.yqls
deleted file mode 100644
index 58a877a388..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"mapjoinlimit" '"1m"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'key2) '('b 'key1 'b 'key2) '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) joinLeft '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_1.txt
deleted file mode 100644
index 6e6cc8a496..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key1"="2017-08-10";"key2"=1};
-{"key1"="2017-08-10";"key2"=2};
-{"key1"="2017-08-11";"key2"=1};
-{"key1"="2017-08-11";"key2"=#};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_1.txt.attr
deleted file mode 100644
index 42dbb6a49b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_1.txt.attr
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "key2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_2.txt
deleted file mode 100644
index b7262abbb7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key1"="2017-08-10";"key2"=1};
-{"key1"="2017-08-10";"key2"=2};
-{"key1"="2017-08-11";"key2"=1};
-{"key1"="2017-08-11";"key2"=2};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_2.txt.attr
deleted file mode 100644
index 42dbb6a49b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054_2.txt.attr
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "key2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/default.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/default.cfg
deleted file mode 100644
index 3986c38117..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/default.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-res result.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input1Opt input1opt.txt
-in Input2Opt input2opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1.txt
deleted file mode 100644
index 4b39db5bf3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key1"=1;subkey1="..";"value1"="A"};
-{"key1"=4;subkey1="..";"value1"="C"};
-{"key1"=4;subkey1="..";"value1"="D"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1.txt.attr
deleted file mode 100644
index 8714765eb4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "DataType";
-                        "Int32"
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1opt.txt
deleted file mode 100644
index 98331c5ee4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key1"=1;subkey1="...";"value1"="A"};
-{"key1"=4;subkey1="...";"value1"="C"};
-{"key1"=4;subkey1="...";"value1"="D"};
-{"key1"=#;subkey1="...";"value1"="E"};
-{"key1"=#;subkey1="...";"value1"="F"};
-{"key1"=#;subkey1="...";"value1"="G"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1opt.txt.attr
deleted file mode 100644
index de343fa9cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input1opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2.txt
deleted file mode 100644
index 7e4ea597de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2.txt.attr
deleted file mode 100644
index 824353dafc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "DataType";
-                        "Uint64"
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2opt.txt
deleted file mode 100644
index 17ff7232b7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
-{"key2"=#;subkey2=".";"value2"="P"};
-{"key2"=#;subkey2=".";"value2"="Q"};
-{"key2"=#;subkey2=".";"value2"="R"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2opt.txt.attr
deleted file mode 100644
index 990e5b6aee..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/input2opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Uint64"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.cfg
deleted file mode 100644
index 06f0f4538a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 bug2333_l.txt
-in Input2 bug2333_r.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.yqls
deleted file mode 100644
index c3583f0b2a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"2"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergeunsortedfactor" '"0.8"))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input1")))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input2")))) '('"key") '()))
-  (let world (Left! x))
-  (let table2 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '(table1 '"L") '(table2 '"R") '('Left '"L" '"R" '('"L" '"key") '('"R" '"key") '()) '()))
-      (let core (FlatMap core (lambda '(row) (AsList (AsStruct '('"L.key" (Member row '"L.key")) '('"R.key" (Member row '"R.key")) '('"IsJoined" ("!=" ("Not" ("Exists" (SqlColumn row '"key" '"R"))) (Bool '"true"))))))))
-      (let core (Aggregate core '('"IsJoined") '('('Count0 (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (SqlColumn row '"key" '"L")))))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"IsJoined" (Member row '"IsJoined")) '('"column1" (Member row 'Count0))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"IsJoined" '"column1")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Cross2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Cross2_12.yqls
deleted file mode 100644
index 9b331b9f82..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Cross2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Cross '"a" '"b" '() '() '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_12.yqls
deleted file mode 100644
index 3518a4c5d4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_1o2o.yqls
deleted file mode 100644
index 90b210133a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Exclusion '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_12.yqls
deleted file mode 100644
index 65f4e896c0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Exclusion '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_1o2o.yqls
deleted file mode 100644
index a6f66f231e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Exclusion '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12.yqls
deleted file mode 100644
index ebb11c9560..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12u.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12u.yqls
deleted file mode 100644
index 9047dae5cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12u.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2u))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1o2o.yqls
deleted file mode 100644
index 4f3b39aead..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2.yqls
deleted file mode 100644
index cce29bdeba..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1u))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2u.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2u.yqls
deleted file mode 100644
index b2025d9f13..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2u.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1u))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2u))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Full '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_12.yqls
deleted file mode 100644
index e73d11378c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Full '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_1o2o.yqls
deleted file mode 100644
index 02fe6bd9b7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Full '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12.yqls
deleted file mode 100644
index 6a0eca2a30..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12o.yqls
deleted file mode 100644
index 4aa5328146..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2.yqls
deleted file mode 100644
index e114fdd320..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2o.yqls
deleted file mode 100644
index dfef6fe6c8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12.yqls
deleted file mode 100644
index 28175bd604..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12o.yqls
deleted file mode 100644
index 981d1a26d3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2.yqls
deleted file mode 100644
index f217a74ac3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2o.yqls
deleted file mode 100644
index c397a2f86c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_123.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_123.yqls
deleted file mode 100644
index 5f4c36f6e0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_123.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinallowcolumnrenames" 'true))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value3) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_1o2o3o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_1o2o3o.yqls
deleted file mode 100644
index 959778c020..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_1o2o3o.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinallowcolumnrenames" 'true))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input3opt))) '('key 'subkey 'value3) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '"c" '('"a" '"key") '('"c" '"key") '()) '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_123.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_123.yqls
deleted file mode 100644
index af7186040d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_123.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinallowcolumnrenames" 'true))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value3) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '"c" '('"a" '"key" '"a" '"subkey") '('"c" '"key" '"c" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_1o2o3o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_1o2o3o.yqls
deleted file mode 100644
index f1e98e1303..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_1o2o3o.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinallowcolumnrenames" 'true))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input3opt))) '('key 'subkey 'value3) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b) '(table3 'c) 
-  '('Inner
-    '('Inner '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '"c" '('"a" '"key" '"a" '"subkey") '('"c" '"key" '"c" '"subkey") '()) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.cfg
deleted file mode 100644
index f73a18f37a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 input1.txt
-in Input2 infer_scheme.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.yqls
deleted file mode 100644
index 46c35ef2a9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergeunsortedfactor" '"3.0"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key) '('('infer_scheme))))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.cfg
deleted file mode 100644
index 68f6b6b97b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 bug2333_l.txt
-in Input2 sorted_desc.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.yqls
deleted file mode 100644
index b8db32f30b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"2"))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergeunsortedfactor" '"2"))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input1")))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input2")))) '('"key") '()))
-  (let world (Left! x))
-  (let table2 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '(table1 '"L") '(table2 '"R") '('Left '"L" '"R" '('"L" '"key") '('"R" '"key") '()) '()))
-      (let core (FlatMap core (lambda '(row) (AsList (AsStruct '('"L.key" (Member row '"L.key")) '('"R.key" (Member row '"R.key")) '('"IsJoined" ("!=" ("Not" ("Exists" (SqlColumn row '"key" '"R"))) (Bool '"true"))))))))
-      (let core (Aggregate core '('"IsJoined") '('('Count0 (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (SqlColumn row '"key" '"L")))))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"IsJoined" (Member row '"IsJoined")) '('"column1" (Member row 'Count0))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"IsJoined" '"column1")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_12.yqls
deleted file mode 100644
index 203d420f05..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Left '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_1o2o.yqls
deleted file mode 100644
index 1cc15375b5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Left '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey") (Member row '"b.value2"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_12.yqls
deleted file mode 100644
index f376fd59f5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_1o2o.yqls
deleted file mode 100644
index ecbcf52649..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Left '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_12.yqls
deleted file mode 100644
index 7ad7499a36..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_1o2o.yqls
deleted file mode 100644
index eee4c48726..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_1o2o.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_12.yqls
deleted file mode 100644
index 7983fd5c84..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftOnly '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_1o2o.yqls
deleted file mode 100644
index 72d92bae07..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_1o2o.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftOnly '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_12.yqls
deleted file mode 100644
index b9b78b1e30..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_1o2o.yqls
deleted file mode 100644
index cbfc95831d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_1o2o.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_12.yqls
deleted file mode 100644
index fb3e649ac7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftSemi '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_1o2o.yqls
deleted file mode 100644
index c97954aec4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_1o2o.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('LeftSemi '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_12.yqls
deleted file mode 100644
index c0cfeddbac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_1o2o.yqls
deleted file mode 100644
index 0d9096f170..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Right '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_12.yqls
deleted file mode 100644
index d6e27227a0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_1o2o.yqls
deleted file mode 100644
index 26a9da603e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('Right '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"a.key") (Member row '"a.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_12.yqls
deleted file mode 100644
index ac557b7c39..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_1o2o.yqls
deleted file mode 100644
index 818530c644..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_1o2o.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightOnly '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_12.yqls
deleted file mode 100644
index 57525fe5cd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightOnly '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_1o2o.yqls
deleted file mode 100644
index d94a379a98..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_1o2o.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightOnly '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_12.yqls
deleted file mode 100644
index 2d97e5de4f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_12.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_1o2o.yqls
deleted file mode 100644
index 78812b0504..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_1o2o.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightSemi '"a" '"b" '('"a" '"key") '('"b" '"key" ) '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_12.yqls
deleted file mode 100644
index 614f56af07..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_12.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightSemi '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_1o2o.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_1o2o.yqls
deleted file mode 100644
index 36754914d3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_1o2o.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1opt))) '('key 'subkey 'value1) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2opt))) '('key 'subkey 'value2) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let join (EquiJoin '(table1 'a) '(table2 'b)
-    '('RightSemi '"a" '"b" '('"a" '"key" '"a" '"subkey") '('"b" '"key" '"b" '"subkey") '()) 
-    '()))
-(let res_sink (DataSink 'result))
-(let sortDir '((Bool 'true) (Bool 'true)))
-(let keySelector (lambda '(row) '((Member row '"b.key") (Member row '"b.subkey"))))
-(let world (Write! world res_sink (Key) (Sort join sortDir keySelector) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_l.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_l.txt
deleted file mode 100644
index 629585c06e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_l.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-{"key"="020";"subkey"=1;"value1"="q"};
-{"key"="022";"subkey"=1;"value1"="q"};
-{"key"="030";"subkey"=1;"value1"="q"};
-{"key"="040";"subkey"=1;"value1"="abc"};
-{"key"="050";"subkey"=1;"value1"="abc"};
-{"key"="060";"subkey"=1;"value1"="abc"};
-{"key"="075";"subkey"=1;"value1"="abc"};
-{"key"="075";"subkey"=1;"value1"="qzz"};
-{"key"="100";"subkey"=1;"value1"="ddd"};
-{"key"="500";"subkey"=1;"value1"="ddd"};
-{"key"="800";"subkey"=1;"value1"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_l.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_l.txt.attr
deleted file mode 100644
index 636afb35de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_l.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"SortMembers"=["key"];"SortedBy"=["key"];"SortDirections"=[1];"SortedByTypes"=[["DataType";"String"]];"Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"Int32"]];["value1";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_r.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_r.txt
deleted file mode 100644
index a2389716e5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_r.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"="320";"subkey"=1;"value1"="q"};
-{"key"="065";"subkey"=1;"value1"="abc"};
-{"key"="075";"subkey"=1;"value1"="qzz"};
-{"key"="850";"subkey"=1;"value1"="ddd"};
-{"key"="800";"subkey"=1;"value1"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_r.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_r.txt.attr
deleted file mode 100644
index 905390e41e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/bug2333_r.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"Int32"]];["value1";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/default.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/default.cfg
deleted file mode 100644
index 17f55ef14f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/default.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-res result.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input1u input1u.txt
-in Input2u input2u.txt
-in Input3 input3.txt
-in Input1opt input1opt.txt
-in Input2opt input2opt.txt
-in Input3opt input3opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/infer_scheme.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/infer_scheme.txt
deleted file mode 100644
index 79c1bc3e75..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/infer_scheme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="020"};
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="150";"subkey"="4";"value"="qzz"};
-{"key"="800";"subkey"="2";"value"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/infer_scheme.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/infer_scheme.txt.attr
deleted file mode 100644
index 3c0f7e55c1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/infer_scheme.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "infer_schema" = %true
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1.txt
deleted file mode 100644
index ad71c8be16..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="020";"subkey"=1;"value1"="q"};
-{"key"="075";"subkey"=1;"value1"="abc"};
-{"key"="075";"subkey"=1;"value1"="qzz"};
-{"key"="800";"subkey"=1;"value1"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1.txt.attr
deleted file mode 100644
index 22819a0f3b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["DataType";"String"];["DataType";"Int32"]];"Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"Int32"]];["value1";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1opt.txt
deleted file mode 100644
index ad71c8be16..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1opt.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="020";"subkey"=1;"value1"="q"};
-{"key"="075";"subkey"=1;"value1"="abc"};
-{"key"="075";"subkey"=1;"value1"="qzz"};
-{"key"="800";"subkey"=1;"value1"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1opt.txt.attr
deleted file mode 100644
index bd2fbd34c0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1opt.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["OptionalType";["DataType";"String"]];["OptionalType";["DataType";"Int32"]]];"Type"=["StructType";[["key";["OptionalType";["DataType";"String"]]];["subkey";["OptionalType";["DataType";"Int32"]]];["value1";["OptionalType";["DataType";"String"]]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1u.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1u.txt
deleted file mode 100644
index 630726fbc7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1u.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key"="020";"subkey"=1;"value1"="q"};
-{"key"="075";"subkey"=1;"value1"="abc"};
-{"key"="800";"subkey"=1;"value1"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1u.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1u.txt.attr
deleted file mode 100644
index d666ee078f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input1u.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"UniqueKeys"=%true;"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["DataType";"String"];["DataType";"Int32"]];"Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"Int32"]];["value1";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2.txt
deleted file mode 100644
index ea8b550fc1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"=1;"value2"=3.};
-{"key"="075";"subkey"=2;"value2"=4.5};
-{"key"="150";"subkey"=1;"value2"=5.5};
-{"key"="800";"subkey"=1;"value2"=1.};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2.txt.attr
deleted file mode 100644
index 2f3f372953..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["DataType";"String"];["DataType";"Int32"]];"Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"Int32"]];["value2";["DataType";"Double"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2opt.txt
deleted file mode 100644
index ea8b550fc1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2opt.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"=1;"value2"=3.};
-{"key"="075";"subkey"=2;"value2"=4.5};
-{"key"="150";"subkey"=1;"value2"=5.5};
-{"key"="800";"subkey"=1;"value2"=1.};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2opt.txt.attr
deleted file mode 100644
index 4a4ea783a0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2opt.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["OptionalType";["DataType";"String"]];["OptionalType";["DataType";"Int32"]]];"Type"=["StructType";[["key";["OptionalType";["DataType";"String"]]];["subkey";["OptionalType";["DataType";"Int32"]]];["value2";["OptionalType";["DataType";"Double"]]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2u.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2u.txt
deleted file mode 100644
index 3e93a3a132..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2u.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="075";"subkey"=1;"value2"=3.};
-{"key"="150";"subkey"=1;"value2"=5.5};
-{"key"="800";"subkey"=1;"value2"=1.};
-{"key"="801";"subkey"=1;"value2"=1.1};
-{"key"="802";"subkey"=1;"value2"=1.2};
-{"key"="803";"subkey"=1;"value2"=1.3};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2u.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2u.txt.attr
deleted file mode 100644
index 8ffdb455dd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input2u.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"UniqueKeys"=%true;"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["DataType";"String"];["DataType";"Int32"]];"Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"Int32"]];["value2";["DataType";"Double"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3.txt
deleted file mode 100644
index 71e5aa381b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="021";"subkey"=3;"value3"=-67};
-{"key"="075";"subkey"=3;"value3"=23};
-{"key"="151";"subkey"=3;"value3"=666};
-{"key"="800";"subkey"=1;"value3"=567};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3.txt.attr
deleted file mode 100644
index 531b5fb378..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["DataType";"String"];["DataType";"Int32"]];"Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"Int32"]];["value3";["DataType";"Int64"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3opt.txt
deleted file mode 100644
index 71e5aa381b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3opt.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="021";"subkey"=3;"value3"=-67};
-{"key"="075";"subkey"=3;"value3"=23};
-{"key"="151";"subkey"=3;"value3"=666};
-{"key"="800";"subkey"=1;"value3"=567};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3opt.txt.attr
deleted file mode 100644
index 37e5810187..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/input3opt.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"SortMembers"=["key";"subkey"];"SortedBy"=["key";"subkey"];"SortDirections"=[1;1];"SortedByTypes"=[["OptionalType";["DataType";"String"]];["OptionalType";["DataType";"Int32"]]];"Type"=["StructType";[["key";["OptionalType";["DataType";"String"]]];["subkey";["OptionalType";["DataType";"Int32"]]];["value3";["OptionalType";["DataType";"Int64"]]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/sorted_desc.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/sorted_desc.txt
deleted file mode 100644
index ac8e34386d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/sorted_desc.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"_yql_column_0"="\xE0\xC7\xCF\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="800";"subkey"="2";"value"="ddd"};
-{"_yql_column_0"="\xE0\xCE\xCA\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="150";"subkey"="4";"value"="qzz"};
-{"_yql_column_0"="\xE0\xCF\xC8\xCA\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="075";"subkey"="1";"value"="abc"};
-{"_yql_column_0"="\xE0\xCF\xCD\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFE\xFC";"key"="020";"subkey"="3";"value"="q"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/sorted_desc.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/sorted_desc.txt.attr
deleted file mode 100644
index 903b4c7d93..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/sorted_desc.txt.attr
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "SortMembers" = [
-            "key"
-        ];
-        "SortDirections" = [
-            0
-        ];
-        "UniqueKeys" = %false;
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ];
-        "SortedByTypes" = [
-            [
-                "DataType";
-                "String"
-            ]
-        ];
-        "SortedBy" = [
-            "_yql_column_0"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrdered.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrdered.yqls
deleted file mode 100644
index d16765b530..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrdered.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedKey2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedKey2.yqls
deleted file mode 100644
index 86ddc7edea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedKey2.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1.yqls
deleted file mode 100644
index dc6553ace8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12.yqls
deleted file mode 100644
index 52ec551031..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12Key2.yqls
deleted file mode 100644
index c283681f65..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12Key2.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1Key2.yqls
deleted file mode 100644
index c0fd196bb3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1Key2.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2.yqls
deleted file mode 100644
index cc2f36e4b9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2Key2.yqls
deleted file mode 100644
index 06a7f9e790..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2Key2.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"joinmergetableslimit" '"10"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key1 'b 'subkey1) '()) '()))
-
-(let sortDir4 '((Bool 'true) (Bool 'true) (Bool 'true) (Bool 'true)))
-(let sortDir2 '((Bool 'true) (Bool 'true)))
-(let keySelectorAB (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1") (Member row '"a.value1") (Member row '"b.key1"))))
-(let keySelectorA (lambda '(row) '((Member row '"a.key1") (Member row '"a.subkey1"))))
-(let keySelectorB (lambda '(row) '((Member row '"b.key1") (Member row '"b.subkey1"))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Sort joinInner sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeft sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRight sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinFull sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftOnly sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightOnly sortDir2 keySelectorB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinExclusion sortDir4 keySelectorAB) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinLeftSemi sortDir2 keySelectorA) '('('type))))
-(let world (Write! world res_sink (Key) (Sort joinRightSemi sortDir2 keySelectorB) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/default.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/default.cfg
deleted file mode 100644
index 3986c38117..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/default.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-res result.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input1Opt input1opt.txt
-in Input2Opt input2opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1.txt
deleted file mode 100644
index 6cacacff58..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key1"=1;subkey1=".";"value1"="A"};
-{"key1"=4;subkey1=".";"value1"="C"};
-{"key1"=4;subkey1=".";"value1"="D"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1.txt.attr
deleted file mode 100644
index 886075ce6b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1.txt.attr
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "SortMembers"=["key1";"subkey1"];"SortedBy"=["key1";"subkey1"];"SortDirections"=[1;1];"SortedByTypes"=[["DataType";"Int32"];["DataType";"String"]];
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "DataType";
-                        "Int32"
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1opt.txt
deleted file mode 100644
index bfe21c14dd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key1"=#;subkey1="..";"value1"="E"};
-{"key1"=#;subkey1="..";"value1"="F"};
-{"key1"=#;subkey1="..";"value1"="G"};
-{"key1"=1;subkey1="..";"value1"="A"};
-{"key1"=4;subkey1="..";"value1"="C"};
-{"key1"=4;subkey1="..";"value1"="D"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1opt.txt.attr
deleted file mode 100644
index 21ebb68dc9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input1opt.txt.attr
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "SortMembers"=["key1";"subkey1"];"SortedBy"=["key1";"subkey1"];"SortDirections"=[1;1];"SortedByTypes"=[["OptionalType";["DataType";"Int32"]];["OptionalType";["DataType";"String"]]];
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2.txt
deleted file mode 100644
index 7536742f64..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key1"=2;subkey1=".";"value2"="U"};
-{"key1"=4;subkey1=".";"value2"="Y"};
-{"key1"=4;subkey1=".";"value2"="W"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2.txt.attr
deleted file mode 100644
index 094fd53483..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2.txt.attr
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "SortMembers"=["key1";"subkey1"];"SortedBy"=["key1";"subkey1"];"SortDirections"=[1;1];"SortedByTypes"=[["DataType";"Int32"];["DataType";"String"]];
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "DataType";
-                        "Int32"
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2opt.txt
deleted file mode 100644
index a620f354f1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key1"=#;subkey1="..";"value2"="P"};
-{"key1"=#;subkey1="..";"value2"="Q"};
-{"key1"=#;subkey1="..";"value2"="R"};
-{"key1"=2;subkey1="..";"value2"="U"};
-{"key1"=4;subkey1="..";"value2"="Y"};
-{"key1"=4;subkey1="..";"value2"="W"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2opt.txt.attr
deleted file mode 100644
index 97710dd6cd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/input2opt.txt.attr
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "SortMembers"=["key1";"subkey1"];"SortedBy"=["key1";"subkey1"];"SortDirections"=[1;1];"SortedByTypes"=[["OptionalType";["DataType";"Int32"]];["OptionalType";["DataType";"String"]]];
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinType.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinType.yqls
deleted file mode 100644
index 16d3de6d28..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinType.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeKey2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeKey2.yqls
deleted file mode 100644
index 7fc7ecf8ab..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeKey2.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1.yqls
deleted file mode 100644
index a20d8aec9b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12.yqls
deleted file mode 100644
index d566b92b1c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12Key2.yqls
deleted file mode 100644
index b2027e278b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12Key2.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1Key2.yqls
deleted file mode 100644
index 5ab66d2fc5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1Key2.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1Opt))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2.yqls
deleted file mode 100644
index 96f210378d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1) '('b 'key2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2Key2.yqls b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2Key2.yqls
deleted file mode 100644
index e5f7c57d6d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2Key2.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2Opt))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (EquiJoin '(list1 'a) '(list2 'b) '('Inner 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeft (EquiJoin '(list1 'a) '(list2 'b) '('Left 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRight (EquiJoin '(list1 'a) '(list2 'b) '('Right 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinFull (EquiJoin '(list1 'a) '(list2 'b) '('Full 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftOnly (EquiJoin '(list1 'a) '(list2 'b) '('LeftOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightOnly (EquiJoin '(list1 'a) '(list2 'b) '('RightOnly 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinExclusion (EquiJoin '(list1 'a) '(list2 'b) '('Exclusion 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinLeftSemi (EquiJoin '(list1 'a) '(list2 'b) '('LeftSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinRightSemi (EquiJoin '(list1 'a) '(list2 'b) '('RightSemi 'a 'b '('a 'key1 'a 'subkey1) '('b 'key2 'b 'subkey2) '()) '()))
-(let joinCross (EquiJoin '(list1 'a) '(list2 'b) '('Cross 'a 'b '() '() '()) '()))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Concat (String '"Inner: ") (FormatType (TypeOf joinInner))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Left: ") (FormatType (TypeOf joinLeft))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Right: ") (FormatType (TypeOf joinRight))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Full: ") (FormatType (TypeOf joinFull))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftOnly: ") (FormatType (TypeOf joinLeftOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightOnly: ") (FormatType (TypeOf joinRightOnly))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Exclusion: ") (FormatType (TypeOf joinExclusion))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"LeftSemi: ") (FormatType (TypeOf joinLeftSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"RightSemi: ") (FormatType (TypeOf joinRightSemi))) '()))
-(let world (Write! world res_sink (Key) (Concat (String '"Cross: ") (FormatType (TypeOf joinCross))) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/default.cfg b/yql/essentials/tests/s-expressions/suites/EquiJoinType/default.cfg
deleted file mode 100644
index 3986c38117..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/default.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-res result.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input1Opt input1opt.txt
-in Input2Opt input2opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1.txt
deleted file mode 100644
index 6cacacff58..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key1"=1;subkey1=".";"value1"="A"};
-{"key1"=4;subkey1=".";"value1"="C"};
-{"key1"=4;subkey1=".";"value1"="D"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1.txt.attr
deleted file mode 100644
index 8714765eb4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "DataType";
-                        "Int32"
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1opt.txt
deleted file mode 100644
index f03418b1bf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key1"=1;subkey1=".";"value1"="A"};
-{"key1"=4;subkey1=".";"value1"="C"};
-{"key1"=4;subkey1=".";"value1"="D"};
-{"key1"=#;subkey1=".";"value1"="E"};
-{"key1"=#;subkey1=".";"value1"="F"};
-{"key1"=#;subkey1=".";"value1"="G"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1opt.txt.attr
deleted file mode 100644
index de343fa9cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input1opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2.txt
deleted file mode 100644
index 7e4ea597de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2.txt.attr
deleted file mode 100644
index 824353dafc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "DataType";
-                        "Uint64"
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2opt.txt b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2opt.txt
deleted file mode 100644
index 17ff7232b7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
-{"key2"=#;subkey2=".";"value2"="P"};
-{"key2"=#;subkey2=".";"value2"="Q"};
-{"key2"=#;subkey2=".";"value2"="R"};
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2opt.txt.attr b/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2opt.txt.attr
deleted file mode 100644
index 990e5b6aee..0000000000
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/input2opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Uint64"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yqls b/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yqls
index b6d23e3c3e..d6f491ee21 100644
--- a/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yqls
@@ -1,7 +1,6 @@
 # canonize yson here
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let world (Configure! world config 'AddFileByUrl 'Tony 'https://yadi.sk/a/pk0iwMkNuNYgM/57b9c14c6fcc2a565515fab9))
 
 (let res_sink (DataSink 'result))
diff --git a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yqls b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yqls
index 6e65cc1e65..292d0ac7a4 100644
--- a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let results (AsDict
diff --git a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yqls b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yqls
index 6e65cc1e65..292d0ac7a4 100644
--- a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let results (AsDict
diff --git a/yql/essentials/tests/s-expressions/suites/File/FileContent.yqls b/yql/essentials/tests/s-expressions/suites/File/FileContent.yqls
index 3e34cb8a58..2d716be60b 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FileContent.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/FileContent.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (FileContent 'MyFile) '()))
diff --git a/yql/essentials/tests/s-expressions/suites/File/FilePath.yqls b/yql/essentials/tests/s-expressions/suites/File/FilePath.yqls
index 1b036e6da4..3bdb0d5d60 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FilePath.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/FilePath.yqls
@@ -2,7 +2,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (FilePath 'MyFile) '()))
diff --git a/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yqls b/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yqls
index fa4d5835ce..be1d4a7300 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yqls
@@ -2,7 +2,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (FilePath '/home/MyFile) '()))
diff --git a/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.cfg b/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.cfg
deleted file mode 100644
index 5c9bcce3f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-file MyFile file1.txt
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.yqls b/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.yqls
deleted file mode 100644
index 203ac40254..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let data (AsList 
-(AsStruct '('key (String 'key1)) '('subkey (String '"")) '('value (FileContent 'MyFile)))
-))
-
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/File/FolderPath.yqls b/yql/essentials/tests/s-expressions/suites/File/FolderPath.yqls
deleted file mode 100644
index e676a8a14d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/FolderPath.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-# canonize yson here
-(
-#comment
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FolderPath '"/lib") '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yqls b/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yqls
index 78799b4126..8e83fbc1aa 100644
--- a/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yqls
@@ -2,7 +2,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Files '/home) '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.cfg b/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.cfg
deleted file mode 100644
index 5c9bcce3f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-file MyFile file1.txt
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.yqls b/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.yqls
deleted file mode 100644
index d481de6809..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let newValue (FileContent 'MyFile))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.cfg b/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.cfg
deleted file mode 100644
index b99236a7de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-file MyFile file1.txt
-in Input input.txt
-out Output output.txt
-udf re2_udf
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.yqls b/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.yqls
deleted file mode 100644
index fcd006e0aa..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-# canonize yson here
-(
-#comment
-(let udf (Udf '"Re2.Replace" '((String '"(^|.*/)([^/]+)$") (Null))))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let newValue (FilePath 'MyFile))
-   (let newValue (Apply udf newValue (String '"./\\2")))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.cfg b/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.cfg
deleted file mode 100644
index f1a778e02d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-mount ../mounts.txt
-udf re2_udf
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.yqls b/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.yqls
deleted file mode 100644
index a9bd5a3ada..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-# canonize yson here
-(
-#comment
-(let udf (Udf '"Re2.Replace" '((String '"(^|.*/)([^/]+/?)$") (Null))))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let newValue (FolderPath '"/lib"))
-   (let newValue (Apply udf newValue (String '"./\\2")))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/File/RootFiles.yqls b/yql/essentials/tests/s-expressions/suites/File/RootFiles.yqls
index cf275fb841..7c09de2b11 100644
--- a/yql/essentials/tests/s-expressions/suites/File/RootFiles.yqls
+++ b/yql/essentials/tests/s-expressions/suites/File/RootFiles.yqls
@@ -2,7 +2,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Files '/) '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/File/input.txt b/yql/essentials/tests/s-expressions/suites/File/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/File/input.txt.attr b/yql/essentials/tests/s-expressions/suites/File/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/File/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/AggregateWithFilter.yqls b/yql/essentials/tests/s-expressions/suites/Filter/AggregateWithFilter.yqls
deleted file mode 100644
index 0f811313c6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/AggregateWithFilter.yqls
+++ /dev/null
@@ -1,51 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) '('"key" '"subkey") '()))
-(let world (Left! r))
-(let input (Right! r))
-(let filter (lambda '(rec) (block '(
-  (return (Coalesce (> (Member rec '"key") (String '"100")) (Bool 'false)))
-))))
-(let res (Filter input filter))
-(let l1 (lambda '(rec) (block '(
-  (return (Convert (Exists (Member rec '"subkey")) 'Uint64))
-))))
-(let l2 (lambda '(rec state) (block '(
-  (let l (lambda '(r1 r2) (block '(
-    (return (+ r1 r2))
-  ))))
-  (let state (OptionalReduce state (Convert (Exists (Member rec '"subkey")) 'Uint64) l))
-  (return state)
-))))
-(let identity (lambda '(s) (block '(
-  (return s)
-))))
-(let l5 (lambda '(rec state) (block '(
-  (let l (lambda '(r1 r2) (block '(
-    (return (+ r1 r2))
-  ))))
-  (return (OptionalReduce rec state l))
-))))
-(let res (Aggregate res '('"key") '('('Count0 (AggregationTraits (ListItemType (TypeOf res)) l1 l2 identity identity l5 identity (Null))))))
-(let l (lambda '(state) (block '(
-  (let res (Struct))
-  (let res (AddMember res '"key" (Member state '"key")))
-  (let res (AddMember res '"subkey" (Cast (Member state 'Count0) 'String)))
-  (let res (AddMember res '"value" (String '"")))
-  (return (AsList res))
-))))
-(let res (FlatMap res l))
-(let world (Write! world sink (Key '('table (String '"Output"))) res '()))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/CloseRange.yqls b/yql/essentials/tests/s-expressions/suites/Filter/CloseRange.yqls
deleted file mode 100644
index 8f8a2ebb28..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/CloseRange.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (And (>= key (String '"020")) (<= key (String '"700"))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/CloseRangeOnSortedInput.yqls b/yql/essentials/tests/s-expressions/suites/Filter/CloseRangeOnSortedInput.yqls
deleted file mode 100644
index 67767e39c0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/CloseRangeOnSortedInput.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (And (>= key (String '"020")) (<= key (String '"700"))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRange.yqls b/yql/essentials/tests/s-expressions/suites/Filter/EmptyRange.yqls
deleted file mode 100644
index 5e3c989afa..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRange.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (And (>= key (String '"100")) (< key (String '"090"))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRangeOnSortedInput.yqls b/yql/essentials/tests/s-expressions/suites/Filter/EmptyRangeOnSortedInput.yqls
deleted file mode 100644
index 4dca20b467..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRangeOnSortedInput.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (And (>= key (String '"100")) (< key (String '"090"))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/Equal.yqls b/yql/essentials/tests/s-expressions/suites/Filter/Equal.yqls
deleted file mode 100644
index 77d9b0ea8a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/Equal.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (== key (String '"020")) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/EqualOnSortedInput.yqls b/yql/essentials/tests/s-expressions/suites/Filter/EqualOnSortedInput.yqls
deleted file mode 100644
index f69dde24bf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/EqualOnSortedInput.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (== key (String '"020")) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.cfg
deleted file mode 100644
index f03903c558..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui8.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.yqls
deleted file mode 100644
index 25e70ab080..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.yqls
+++ /dev/null
@@ -1,40 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Double '0)) (< key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0)) (<= key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-0.5)) (< key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-0.5)) (<= key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '0.5)) (< key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0.5)) (<= key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0)) (<= key (Double '1000))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0)) (<= key (Double '255))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '0)) (< key (Double '255))))))
-(let world (Apply test world (lambda '(key) (> key (Double '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Double '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Double '1000)))))
-(let world (Apply test world (lambda '(key) (< key (Double '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Double '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.cfg
deleted file mode 100644
index f03903c558..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui8.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.yqls
deleted file mode 100644
index 7e51737f4f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.yqls
+++ /dev/null
@@ -1,40 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Float '0)) (< key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0)) (<= key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-0.5)) (< key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-0.5)) (<= key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '0.5)) (< key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0.5)) (<= key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0)) (<= key (Float '1000))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0)) (<= key (Float '255))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '0)) (< key (Float '255))))))
-(let world (Apply test world (lambda '(key) (> key (Float '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Float '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Float '1000)))))
-(let world (Apply test world (lambda '(key) (< key (Float '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Float '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.cfg
deleted file mode 100644
index f03903c558..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui8.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.yqls
deleted file mode 100644
index 9b61dfc633..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '-10)) (<= key (Int32 '1000))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '0)) (<= key (Int32 '255))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int32 '0)) (< key (Int32 '255))))))
-(let world (Apply test world (lambda '(key) (> key (Int32 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Int32 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Int32 '1000)))))
-(let world (Apply test world (lambda '(key) (< key (Int32 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int32 '0)))))
-(let world (Apply test world (lambda '(key) (< key (Int32 '-10)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.cfg
deleted file mode 100644
index f03903c558..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui8.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.yqls
deleted file mode 100644
index bd121653b7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '-10)) (< key (Int64 '1000))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '0)) (<= key (Int64 '255))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '0)) (< key (Int64 '255))))))
-(let world (Apply test world (lambda '(key) (> key (Int64 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Int64 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Int64 '1000)))))
-(let world (Apply test world (lambda '(key) (< key (Int64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int64 '0)))))
-(let world (Apply test world (lambda '(key) (< key (Int64 '-10)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.cfg
deleted file mode 100644
index f03903c558..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui8.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.yqls
deleted file mode 100644
index 91c443c6a8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.yqls
+++ /dev/null
@@ -1,34 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint32 '0)) (<= key (Uint32 '1000))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Uint32 '0)) (<= key (Uint32 '255))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint32 '0)) (< key (Uint32 '255))))))
-(let world (Apply test world (lambda '(key) (> key (Uint32 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint32 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint32 '1000)))))
-(let world (Apply test world (lambda '(key) (< key (Uint32 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint32 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.cfg
deleted file mode 100644
index f03903c558..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui8.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.yqls
deleted file mode 100644
index dcd71898d4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.yqls
+++ /dev/null
@@ -1,34 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (<= key (Uint64 '1000))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (<= key (Uint64 '255))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint64 '0)) (< key (Uint64 '255))))))
-(let world (Apply test world (lambda '(key) (> key (Uint64 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint64 '255)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint64 '1000)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint64 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.cfg
deleted file mode 100644
index 6eef6ec30d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_dbl.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.yqls
deleted file mode 100644
index f3e31ddd82..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Uint8 '0)) (<= key (Uint8 '10))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.cfg
deleted file mode 100644
index 6eef6ec30d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_dbl.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.yqls
deleted file mode 100644
index 01b53116ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Float '-10)) (< key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-10)) (<= key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-10.5)) (< key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-10.5)) (<= key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-9.5)) (< key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-9.5)) (<= key (Float '9.5))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.cfg
deleted file mode 100644
index 6eef6ec30d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_dbl.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.yqls
deleted file mode 100644
index 9c6f02ce77..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '-10)) (< key (Int32 '20))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.cfg
deleted file mode 100644
index 6eef6ec30d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_dbl.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.yqls
deleted file mode 100644
index c2e5812eaf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '-10)) (< key (Int64 '20))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '-9223372036854775808)) (< key (Int64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (> key (Int64 '3147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Int64 '-3147483647)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.cfg
deleted file mode 100644
index 6eef6ec30d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_dbl.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.yqls
deleted file mode 100644
index ddf42e56cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint32 '0)) (<= key (Uint32 '1000))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint32 '0)) (< key (Uint32 '1000))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.cfg
deleted file mode 100644
index 6eef6ec30d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_dbl.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.yqls
deleted file mode 100644
index f34acbcdba..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (< key (Uint64 '20))))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.cfg
deleted file mode 100644
index 1ecb755e34..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_flt.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.yqls
deleted file mode 100644
index ea85b0f4f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10)) (< key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-10)) (<= key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10.5)) (< key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-10.5)) (<= key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-9.5)) (< key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-9.5)) (<= key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-3147483647)) (<= key (Double '3147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Double '3147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Double '-3147483647)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.cfg
deleted file mode 100644
index 1ecb755e34..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_flt.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.yqls
deleted file mode 100644
index 9c6f02ce77..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '-10)) (< key (Int32 '20))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.cfg
deleted file mode 100644
index 1ecb755e34..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_flt.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.yqls
deleted file mode 100644
index c2e5812eaf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '-10)) (< key (Int64 '20))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '-9223372036854775808)) (< key (Int64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (> key (Int64 '3147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Int64 '-3147483647)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.cfg
deleted file mode 100644
index 1ecb755e34..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_flt.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.yqls
deleted file mode 100644
index ddf42e56cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint32 '0)) (<= key (Uint32 '1000))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint32 '0)) (< key (Uint32 '1000))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.cfg
deleted file mode 100644
index 1ecb755e34..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_flt.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.yqls
deleted file mode 100644
index f34acbcdba..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (< key (Uint64 '20))))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.cfg
deleted file mode 100644
index cc557dfb6e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.yqls
deleted file mode 100644
index 7fd743bdee..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.yqls
+++ /dev/null
@@ -1,40 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10)) (< key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-10)) (<= key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10.5)) (< key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-10.5)) (<= key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-9.5)) (< key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-9.5)) (<= key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-2147483648)) (<= key (Double '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-2147483648)) (< key (Double '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-3147483648)) (< key (Double '3147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10223372036854775808)) (< key (Double '18446744073709551615))))))
-(let world (Apply test world (lambda '(key) (> key (Double '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Double '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Double '-2147483648)))))
-(let world (Apply test world (lambda '(key) (<= key (Double '-2147483648)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.cfg
deleted file mode 100644
index cc557dfb6e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.yqls
deleted file mode 100644
index 520276f126..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.yqls
+++ /dev/null
@@ -1,38 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Float '-10)) (< key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-10)) (<= key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-10.5)) (< key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-10.5)) (<= key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-9.5)) (< key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-9.5)) (<= key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-2147483648)) (<= key (Float '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-2147483648)) (< key (Float '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-3147483648)) (< key (Float '3147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Float '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Float '-2147483648)))))
-(let world (Apply test world (lambda '(key) (<= key (Float '-2147483648)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.cfg
deleted file mode 100644
index cc557dfb6e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.yqls
deleted file mode 100644
index b921b10b20..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.yqls
+++ /dev/null
@@ -1,34 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '-10)) (< key (Int64 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '-2147483648)) (<= key (Int64 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '-2147483648)) (< key (Int64 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '-9223372036854775808)) (< key (Int64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (> key (Int64 '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Int64 '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Int64 '-2147483648)))))
-(let world (Apply test world (lambda '(key) (<= key (Int64 '-2147483648)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.cfg
deleted file mode 100644
index cc557dfb6e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.yqls
deleted file mode 100644
index 6dc9e5769c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint32 '0)) (<= key (Uint32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint32 '0)) (< key (Uint32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Uint32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Uint32 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint32 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.cfg
deleted file mode 100644
index cc557dfb6e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.yqls
deleted file mode 100644
index df99564b89..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.yqls
+++ /dev/null
@@ -1,34 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (< key (Uint64 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (<= key (Uint64 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint64 '0)) (< key (Uint64 '2147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Uint64 '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint64 '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint64 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.yqls
deleted file mode 100644
index cbfb7cad03..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10)) (< key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-10)) (<= key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10.5)) (< key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-10.5)) (<= key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-9.5)) (< key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-9.5)) (<= key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-9223372036854775808)) (<= key (Double '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-9223372036854775808)) (< key (Double '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-10223372036854775808)) (< key (Double '18446744073709551615))))))
-(let world (Apply test world (lambda '(key) (> key (Double '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (>= key (Double '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (< key (Double '-9223372036854775808)))))
-(let world (Apply test world (lambda '(key) (<= key (Double '-9223372036854775808)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.yqls
deleted file mode 100644
index b94c11aecc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.yqls
+++ /dev/null
@@ -1,34 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Float '-10)) (< key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-10)) (<= key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-10.5)) (< key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-10.5)) (<= key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-9.5)) (< key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-9.5)) (<= key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (> key (Float '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Float '-2147483648)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.yqls
deleted file mode 100644
index e3a5b10cbb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '-10)) (< key (Int32 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '-2147483648)) (<= key (Int32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int32 '-2147483648)) (< key (Int32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Int32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Int32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Int32 '-2147483648)))))
-(let world (Apply test world (lambda '(key) (<= key (Int32 '-2147483648)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.yqls
deleted file mode 100644
index 6dc9e5769c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint32 '0)) (<= key (Uint32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint32 '0)) (< key (Uint32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Uint32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Uint32 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint32 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.yqls
deleted file mode 100644
index eb43b46130..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.yqls
+++ /dev/null
@@ -1,36 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (< key (Uint64 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (<= key (Uint64 '18446744073709551615))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint64 '0)) (< key (Uint64 '18446744073709551615))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (<= key (Uint64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint64 '0)) (< key (Uint64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (> key (Uint64 '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint64 '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '18446744073709551615)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint64 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.cfg
deleted file mode 100644
index d339183514..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.yqls
deleted file mode 100644
index d74c89079d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Double '0)) (< key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0)) (<= key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-0.5)) (< key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-0.5)) (<= key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '0.5)) (< key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0.5)) (<= key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0)) (<= key (Double '4294967295))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '0)) (< key (Double '4294967295))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-1000000000000)) (< key (Double '1000000000000))))))
-(let world (Apply test world (lambda '(key) (> key (Double '4294967295)))))
-(let world (Apply test world (lambda '(key) (>= key (Double '4294967295)))))
-(let world (Apply test world (lambda '(key) (< key (Double '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Double '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.cfg
deleted file mode 100644
index d339183514..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.yqls
deleted file mode 100644
index 119a06c083..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Float '0)) (< key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0)) (<= key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-0.5)) (< key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-0.5)) (<= key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '0.5)) (< key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0.5)) (<= key (Float '9.5))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.cfg
deleted file mode 100644
index d339183514..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.yqls
deleted file mode 100644
index 0ef31b3b21..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '-10)) (< key (Int32 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '0)) (<= key (Int32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int32 '0)) (< key (Int32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Int32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Int32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Int32 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int32 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.cfg
deleted file mode 100644
index d339183514..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.yqls
deleted file mode 100644
index 029097b6fd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '-10)) (< key (Int64 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '0)) (<= key (Int64 '4294967295))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '0)) (< key (Int64 '4294967295))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '-9223372036854775808)) (< key (Int64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (> key (Int64 '4294967295)))))
-(let world (Apply test world (lambda '(key) (>= key (Int64 '4294967295)))))
-(let world (Apply test world (lambda '(key) (< key (Int64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int64 '-10)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.cfg
deleted file mode 100644
index d339183514..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui32.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.yqls
deleted file mode 100644
index 5350dcda71..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (<= key (Uint64 '1000))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Uint64 '0)) (<= key (Uint64 '4294967295))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint64 '0)) (< key (Uint64 '4294967295))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint64 '0)) (< key (Uint64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (> key (Uint64 '1000000000000)))))
-(let world (Apply test world (lambda '(key) (> key (Uint64 '4294967295)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint64 '4294967295)))))
-(let world (Apply test world (lambda '(key) (< key (Uint64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint64 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.cfg
deleted file mode 100644
index fa976ebe64..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.yqls
deleted file mode 100644
index d7caabfc19..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Double '0)) (< key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0)) (<= key (Double '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '-0.5)) (< key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '-0.5)) (<= key (Double '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '0.5)) (< key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0.5)) (<= key (Double '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Double '0)) (<= key (Double '18446744073709551615))))))
-(let world (Apply test world (lambda '(key) (And (> key (Double '0)) (< key (Double '18446744073709551615))))))
-(let world (Apply test world (lambda '(key) (> key (Double '18446744073709551615)))))
-(let world (Apply test world (lambda '(key) (>= key (Double '18446744073709551615)))))
-(let world (Apply test world (lambda '(key) (< key (Double '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Double '0)))))
-(let world (Apply test world (lambda '(key) (< key (Double '-10)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.cfg
deleted file mode 100644
index fa976ebe64..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.yqls
deleted file mode 100644
index 119a06c083..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (> key (Float '0)) (< key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0)) (<= key (Float '10))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '-0.5)) (< key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '-0.5)) (<= key (Float '10.5))))))
-(let world (Apply test world (lambda '(key) (And (> key (Float '0.5)) (< key (Float '9.5))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Float '0.5)) (<= key (Float '9.5))))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.cfg
deleted file mode 100644
index fa976ebe64..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.yqls
deleted file mode 100644
index 638bf6954a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.yqls
+++ /dev/null
@@ -1,34 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '-10)) (< key (Int32 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int32 '0)) (<= key (Int32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int32 '0)) (< key (Int32 '2147483647))))))
-(let world (Apply test world (lambda '(key) (> key (Int32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (>= key (Int32 '2147483647)))))
-(let world (Apply test world (lambda '(key) (< key (Int32 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int32 '0)))))
-(let world (Apply test world (lambda '(key) (< key (Int32 '-10)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.cfg
deleted file mode 100644
index fa976ebe64..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.yqls
deleted file mode 100644
index 7e29e229f3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '-10)) (< key (Int64 '20))))))
-(let world (Apply test world (lambda '(key) (And (>= key (Int64 '0)) (<= key (Int64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '0)) (< key (Int64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (And (> key (Int64 '-9223372036854775808)) (< key (Int64 '9223372036854775807))))))
-(let world (Apply test world (lambda '(key) (> key (Int64 '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (>= key (Int64 '9223372036854775807)))))
-(let world (Apply test world (lambda '(key) (< key (Int64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int64 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Int64 '-10)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.cfg b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.cfg
deleted file mode 100644
index fa976ebe64..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_ui64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.yqls b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.yqls
deleted file mode 100644
index 9cf0b972e2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let value (Member item 'value))
-    (let res (Coalesce (Apply cmp value) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(key) (And (>= key (Uint32 '0)) (<= key (Uint32 '4294967295))))))
-(let world (Apply test world (lambda '(key) (And (> key (Uint32 '0)) (< key (Uint32 '4294967295))))))
-(let world (Apply test world (lambda '(key) (> key (Uint32 '4294967295)))))
-(let world (Apply test world (lambda '(key) (>= key (Uint32 '4294967295)))))
-(let world (Apply test world (lambda '(key) (< key (Uint32 '0)))))
-(let world (Apply test world (lambda '(key) (<= key (Uint32 '0)))))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.cfg b/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.cfg
deleted file mode 100644
index aa782f323c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.yqls b/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.yqls
deleted file mode 100644
index d6e6d8fe10..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.yqls
+++ /dev/null
@@ -1,53 +0,0 @@
-(
-# read data from Input table
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let res_sink (DataSink 'result))
-
-(let x (Read! world mr_source  (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let table (Right! x))
-
-(let sorted (Sort table (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world mr_sink))
-
-(let x (Read! world mr_source  (Key '('table (String 'Output))) (Void) '()))
-(let world (Left! x))
-(let table (Right! x))
-
-# prepare python udf
-(let streamType (StreamType (ListItemType (TypeOf table))))
-(let udfType (CallableType '() '(streamType) '(streamType)))
-(let udfScript (String '@@
-def MyFunc(list):
-    return list
-@@))
-(let udf (ScriptUdf 'Python3 'MyFunc udfType udfScript))
-
-# filter keys less than '100'
-(let table (Filter table (lambda '(item)
-    (Coalesce (> (Member item 'key) (String '100)) (Bool 'false))
-)))
-# Produce LMap
-(let table (LMap table (lambda '($stream) (Apply udf $stream))))
-
-(let Count_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-(let Count_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-(let Count_save (lambda '(state) state))
-(let Count_load (lambda '(item) item))
-(let Count_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-(let Count_finish (lambda '(state) state))
-(let table (Aggregate table '('"key") '('('Count0 (AggregationTraits (DataType 'String)
-    Count_create Count_update Count_save Count_load Count_merge Count_finish (Uint64 '0)) '"value"))))
-(let table (Sort table '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row '"key") (Member row '"Count0")))))
-
-# write table
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table '('('mode 'renew))))
-(let world (Write! world res_sink (Key) table '()))
-
-# finish
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.cfg b/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.cfg
deleted file mode 100644
index aa782f323c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.yqls b/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.yqls
deleted file mode 100644
index f5981f92ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.yqls
+++ /dev/null
@@ -1,43 +0,0 @@
-(
-# read data from Input table
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let res_sink (DataSink 'result))
-
-(let x (Read! world mr_source  (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let table (Right! x))
-
-(let sorted (Sort table (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) sorted '('('mode 'renew))))
-(let world (Commit! world mr_sink))
-
-(let x (Read! world mr_source  (Key '('table (String 'Output))) (Void) '()))
-(let world (Left! x))
-(let table (Right! x))
-
-# prepare python udf
-(let streamType (StreamType (ListItemType (TypeOf table))))
-(let udfType (CallableType '() '(streamType) '(streamType)))
-(let udfScript (String '@@
-def MyFunc(list):
-    return list
-@@))
-(let udf (ScriptUdf 'Python3 'MyFunc udfType udfScript '('('cpu '"5.0") '('extraMem '"12345"))))
-
-# filter keys less than '100'
-(let table (Filter table (lambda '(item)
-    (Coalesce (> (Member item 'key) (String '100)) (Bool 'false))
-)))
-# Produce LMap
-(let table (LMap table (lambda '($stream) (Apply udf $stream))))
-
-# write table
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table '('('mode 'renew))))
-(let world (Write! world res_sink (Key) table '()))
-
-# finish
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.cfg b/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.yqls b/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.yqls
deleted file mode 100644
index 8d737e225f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"value"))
-  (let res (Coalesce (And (> key (Int32 '0)) (< key (Int64 '700))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.cfg b/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.yqls b/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.yqls
deleted file mode 100644
index 702b00544b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"value"))
-  (let res (Coalesce (< key (Nothing (OptionalType (DataType 'Int64)))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/OpenRange.yqls b/yql/essentials/tests/s-expressions/suites/Filter/OpenRange.yqls
deleted file mode 100644
index dcc95c7353..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/OpenRange.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (And (> key (String '"020")) (< key (String '"700"))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/OpenRangeOnSortedInput.yqls b/yql/essentials/tests/s-expressions/suites/Filter/OpenRangeOnSortedInput.yqls
deleted file mode 100644
index 83df5958d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/OpenRangeOnSortedInput.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let res (Coalesce (And (> key (String '"020")) (< key (String '"700"))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.cfg b/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.cfg
deleted file mode 100644
index 33b4e93ec7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_i64.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.yqls b/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.yqls
deleted file mode 100644
index 7f4a8281fb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"value"))
-  (let res (Coalesce (< key (Just (Int64 '700))) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.cfg b/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.cfg
deleted file mode 100644
index eb5df7a613..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input partkey.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.yqls b/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.yqls
deleted file mode 100644
index 0d5342fa93..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let test (lambda '(world cmp) (block '(
-  (let filter (lambda '(item) (block '(
-    (let key (Member item '"key"))
-    (let subkey (Member item '"subkey"))
-    (let res (Coalesce (Apply cmp '(key subkey)) (Bool 'false)))
-    (return res)
-  ))))
-
-  (let out (Filter input filter))
-  (let world (Write! world result (Key) out '()))
-  (return world)
-))))
-
-(let world (Apply test world (lambda '(item) (And (> (Nth item '0) (String '"020")) (<= (Nth item '0) (String '"150"))) )))
-(let world (Apply test world (lambda '(item) (And (== (Nth item '0) (String '"075")) (And (> (Nth item '1) (String '"2")) (<= (Nth item '1) (String '"5")))) )))
-
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersection.yqls b/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersection.yqls
deleted file mode 100644
index 35aec35fb1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersection.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let a1 (And (> key (String '"100")) (< key (String '"400"))))
-  (let a2 (And (> key (String '"020")) (< key (String '"200"))))
-  (let res (Coalesce (And a1 a2) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersectionOnSortedInput.yqls b/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersectionOnSortedInput.yqls
deleted file mode 100644
index 59803168e1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersectionOnSortedInput.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let source (DataSource '"yt" '"plato"))
-(let sink (DataSink '"yt" '"plato"))
-(let result (DataSink 'result))
-
-(let r (Read! world source (Key '('table (String '"Input"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-(let sorted (Sort input (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String 'Output))) sorted '('('mode 'append))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (Key '('table (String '"Output"))) (Void) '()))
-(let world (Left! r))
-(let input (Right! r))
-
-(let filter (lambda '(item) (block '(
-  (let key (Member item '"key"))
-  (let a1 (And (> key (String '"100")) (< key (String '"400"))))
-  (let a2 (And (> key (String '"020")) (< key (String '"200"))))
-  (let res (Coalesce (And a1 a2) (Bool 'false)))
-  (return res)
-)
-)))
-
-(let out (Filter input filter))
-
-(let world (Write! world result (Key) out '('('type))))
-(let world (Commit! world sink))
-(let world (Commit! world result))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/default.cfg b/yql/essentials/tests/s-expressions/suites/Filter/default.cfg
deleted file mode 100644
index fe2b19a9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/default.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input.txt b/yql/essentials/tests/s-expressions/suites/Filter/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_dbl.txt b/yql/essentials/tests/s-expressions/suites/Filter/input_dbl.txt
deleted file mode 100644
index 9e8c8c997b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_dbl.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"value"=-1000.};
-{"value"=-10.};
-{"value"=0.};
-{"value"=10.};
-{"value"=1000.};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_dbl.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input_dbl.txt.attr
deleted file mode 100644
index 8aaee30aa6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_dbl.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "_yql_row_spec"={
-        "Type"=["StructType";[
-            ["value";["DataType";"Double"]]
-        ]];
-        "SortMembers"=["value"];
-        "SortedBy"=["value"];
-        "SortDirections"=[1];
-        "SortedByTypes"=[["DataType";"Double"]]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_flt.txt b/yql/essentials/tests/s-expressions/suites/Filter/input_flt.txt
deleted file mode 100644
index 9e8c8c997b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_flt.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"value"=-1000.};
-{"value"=-10.};
-{"value"=0.};
-{"value"=10.};
-{"value"=1000.};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_flt.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input_flt.txt.attr
deleted file mode 100644
index 69560d7e0b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_flt.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "_yql_row_spec"={
-        "Type"=["StructType";[
-            ["value";["DataType";"Float"]]
-        ]];
-        "SortMembers"=["value"];
-        "SortedBy"=["value"];
-        "SortDirections"=[1];
-        "SortedByTypes"=[["DataType";"Float"]]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_i32.txt b/yql/essentials/tests/s-expressions/suites/Filter/input_i32.txt
deleted file mode 100644
index f71e6df2d4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_i32.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"value"=-2147483648};
-{"value"=-10};
-{"value"=0};
-{"value"=10};
-{"value"=2147483647};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_i32.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input_i32.txt.attr
deleted file mode 100644
index 7fcf7442be..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_i32.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "schema" = <"strict" = %true;"unique_keys" = %false>
-        [
-            {
-                "name" = "value";
-                "sort_order" = "ascending";
-                "type" = "int32";
-                "required" = %true;
-            }
-        ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_i64.txt b/yql/essentials/tests/s-expressions/suites/Filter/input_i64.txt
deleted file mode 100644
index 355772bb75..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_i64.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"value"=-9223372036854775808};
-{"value"=-10};
-{"value"=0};
-{"value"=10};
-{"value"=9223372036854775807};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_i64.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input_i64.txt.attr
deleted file mode 100644
index 30006e3aad..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_i64.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "schema" = <"strict" = %true;"unique_keys" = %false>
-        [
-            {
-                "name" = "value";
-                "sort_order" = "ascending";
-                "type" = "int64"
-            }
-        ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_ui32.txt b/yql/essentials/tests/s-expressions/suites/Filter/input_ui32.txt
deleted file mode 100644
index 32d26ed58e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_ui32.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"value"=0u};
-{"value"=10u};
-{"value"=4294967295u};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_ui32.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input_ui32.txt.attr
deleted file mode 100644
index edb661f4ea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_ui32.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "schema" = <"strict" = %true;"unique_keys" = %false>
-        [
-            {
-                "name" = "value";
-                "sort_order" = "ascending";
-                "type" = "uint32";
-                "required" = %true;
-            }
-        ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_ui64.txt b/yql/essentials/tests/s-expressions/suites/Filter/input_ui64.txt
deleted file mode 100644
index c4e744a58c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_ui64.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"value"=0u};
-{"value"=10u};
-{"value"=18446744073709551615u};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_ui64.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input_ui64.txt.attr
deleted file mode 100644
index 5028e033d5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_ui64.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "schema" = <"strict" = %true;"unique_keys" = %false>
-        [
-            {
-                "name" = "value";
-                "sort_order" = "ascending";
-                "type" = "uint64";
-                "required" = %true;
-            }
-        ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_ui8.txt b/yql/essentials/tests/s-expressions/suites/Filter/input_ui8.txt
deleted file mode 100644
index d61b1d35da..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_ui8.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"value"=0u};
-{"value"=10u};
-{"value"=255u};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/input_ui8.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/input_ui8.txt.attr
deleted file mode 100644
index 6d04b983e9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/input_ui8.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "schema" = <"strict" = %true;"unique_keys" = %false>
-        [
-            {
-                "name" = "value";
-                "sort_order" = "ascending";
-                "type" = "uint8";
-                "required" = %true;
-            }
-        ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/partkey.txt b/yql/essentials/tests/s-expressions/suites/Filter/partkey.txt
deleted file mode 100644
index c2f900fd7c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/partkey.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{"key"="020";"subkey"="1";"value"="q"};
-{"key"="075";"subkey"="2";"value"="abc"};
-{"key"="075";"subkey"="3";"value"="abc"};
-{"key"="075";"subkey"="4";"value"="abc"};
-{"key"="075";"subkey"="5";"value"="abc"};
-{"key"="150";"subkey"="6";"value"="qzz"};
-{"key"="800";"subkey"="7";"value"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/partkey.txt.attr b/yql/essentials/tests/s-expressions/suites/Filter/partkey.txt.attr
deleted file mode 100644
index ba33fb7074..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Filter/partkey.txt.attr
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "_yql_row_spec"={
-        "Type"=["StructType";[
-            ["key"; ["DataType"; "String"]];
-            ["subkey"; ["DataType"; "String"]];
-            ["value"; ["DataType"; "String"]];
-        ]];
-        "SortMembers"=["key"; "subkey"];
-        "SortedBy"=["key"; "subkey"];
-        "SortDirections"=[1; 1];
-        "SortedByTypes"=[["DataType";"String"]; ["DataType";"String"]]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yqls b/yql/essentials/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yqls
deleted file mode 100644
index da309347a4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let world (Configure! world (DataSource '"config") '"LLVM" '"OFF"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let list2 (Right! x))
-
-(let joinInner (GraceJoinCore
-(ExpandMap (ToFlow list1) (lambda '(m)(Member m 'key1)))
-(ExpandMap (ToFlow list2) (lambda '(m)(Member m 'key2)))
-'Inner  '('0) '('0) '('0 '0) '('0 '1) '('key1) '('key2) '()))
-
-(let res_sink (DataSink 'result))
-
-(let world (Write! world res_sink (Key) (Collect (NarrowMap joinInner (lambda '(a b) (AsStruct '('a a) '('b b))))) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yqls b/yql/essentials/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yqls
deleted file mode 100644
index e184b34935..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let world (Configure! world (DataSource '"config") '"LLVM" '"OFF"))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let list1 (Right! x))
-
-(let joinInner (GraceSelfJoinCore
-(ExpandMap (ToFlow list1) (lambda '(m)(Member m 'key1)))
-'Inner  '('0) '('0) '('0 '0) '('0 '1) '('key1) '('key1) '()))
-
-(let res_sink (DataSink 'result))
-
-(let world (Write! world res_sink (Key) (Collect (NarrowMap joinInner (lambda '(a b) (AsStruct '('a a) '('b b))))) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/default.cfg b/yql/essentials/tests/s-expressions/suites/GraceJoin/default.cfg
deleted file mode 100644
index 3986c38117..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/default.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-res result.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input1Opt input1opt.txt
-in Input2Opt input2opt.txt
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1.txt b/yql/essentials/tests/s-expressions/suites/GraceJoin/input1.txt
deleted file mode 100644
index 4393708fba..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key1"=1u;subkey1="..";"value1"="A"};
-{"key1"=4u;subkey1="..";"value1"="C"};
-{"key1"=4u;subkey1="..";"value1"="D"};
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/GraceJoin/input1.txt.attr
deleted file mode 100644
index 3f78440b17..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "DataType";
-                        "Uint64"
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1opt.txt b/yql/essentials/tests/s-expressions/suites/GraceJoin/input1opt.txt
deleted file mode 100644
index 98331c5ee4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key1"=1;subkey1="...";"value1"="A"};
-{"key1"=4;subkey1="...";"value1"="C"};
-{"key1"=4;subkey1="...";"value1"="D"};
-{"key1"=#;subkey1="...";"value1"="E"};
-{"key1"=#;subkey1="...";"value1"="F"};
-{"key1"=#;subkey1="...";"value1"="G"};
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1opt.txt.attr b/yql/essentials/tests/s-expressions/suites/GraceJoin/input1opt.txt.attr
deleted file mode 100644
index de343fa9cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input1opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Int32"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2.txt b/yql/essentials/tests/s-expressions/suites/GraceJoin/input2.txt
deleted file mode 100644
index 7e4ea597de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/GraceJoin/input2.txt.attr
deleted file mode 100644
index 824353dafc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "DataType";
-                        "Uint64"
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2opt.txt b/yql/essentials/tests/s-expressions/suites/GraceJoin/input2opt.txt
deleted file mode 100644
index 17ff7232b7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2opt.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key2"=2u;subkey2=".";"value2"="U"};
-{"key2"=4u;subkey2=".";"value2"="Y"};
-{"key2"=4u;subkey2=".";"value2"="W"};
-{"key2"=#;subkey2=".";"value2"="P"};
-{"key2"=#;subkey2=".";"value2"="Q"};
-{"key2"=#;subkey2=".";"value2"="R"};
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2opt.txt.attr b/yql/essentials/tests/s-expressions/suites/GraceJoin/input2opt.txt.attr
deleted file mode 100644
index 990e5b6aee..0000000000
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/input2opt.txt.attr
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "Uint64"
-                        ]
-                    ]
-                ];
-                [
-                    "subkey2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ];
-                [
-                    "value2";
-                    [
-                        "OptionalType";
-                        [
-	                    "DataType";
-                            "String"
-                        ]
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yqls
index dfc37d30de..8738a0907d 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let res (List (ListType (DataType 'Uint64))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yqls
index 9e4f52e93d..f534c127b1 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Int32, Uint16??? -> Int32???
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yqls
index a326656deb..a13e955336 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Int32 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yqls
index d3a2fa7c5a..d0480457ad 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Uint8 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yqls
index 478ba0b492..f8f8a961c7 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Uint8 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yqls
index 1008cf6499..3ecc05c6b4 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Uint64 '1))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yqls
index afe7c04735..8224ddbab0 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Uint8 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yqls
index 27ac41dba1..010fadc3ea 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Uint8 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yqls
index 9977eefc30..f828017510 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Coalesce (Nothing (OptionalType (DataType 'Uint32))) (Uint64 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yqls
index 4ea96cadab..12f1add222 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Coalesce (AsStruct '('"a" (Int32 '1))) (AsStruct)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yqls
index ce67a47d55..ba7e787cb7 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Just (Just (String 'a)))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yqls
index 88c2e397a7..aeb2cb22d4 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Just (Just (String 'a))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yqls
index 3f2fa9519d..1bded4e6f3 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let res (List (ListType (DataType 'Bool))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yqls
index 20547b0aaa..f33db6db5e 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Enumerate (AsList (String 'a) (String 'b)) (Int64 '2) (Uint32 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yqls
index 4da2353218..57e1d6a42c 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yqls
index bab448cfa0..f3c473f482 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yqls
index 17dbdd3de4..4d21ec9e6c 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yqls
index 9622fabe4b..3186764376 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yqls
index 468cab9df7..37b45977be 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yqls
index ae8830e61f..4ca0652d7e 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yqls
index 3461a8d239..432c857f09 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yqls
index a6de909851..f227075fbc 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yqls
index 28dd639e69..a15c106e6f 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yqls
index f7393666cc..91bedcc979 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (AsDict '((Uint32 '12) (Uint32 '34)))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yqls
index b2259327f1..d0f8599958 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (AsList (Int64 '12))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yqls
index bd0adcd454..1fcce71001 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (AsList (Uint32 '12))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yqls
index ddf3ad70b0..0011484574 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Just (Int64 '12))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yqls
index 52b4d2872a..c65b09ab32 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Just (Uint32 '12))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yqls
index 4bf5f79adb..f09e071b06 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (AsStruct '('key (Just (Int64 '12))))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yqls
index 69051e7c19..8a7a892bd6 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (AsStruct '('x (Uint32 '12)))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yqls
index a06b03fe9d..0500582fd2 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList '((Just (Int64 '12)))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yqls
index 28da7c8617..b7181fab03 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList '((Uint32 '12))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yqls
index 2acee2f12b..a32da0f8d7 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Variant over tuple
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yqls
index bbc1bfa584..ea1da1837f 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 # Variant over struct
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yqls
index 8c5bc62595..8da8257e21 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (AsStruct '('key (Just (Int64 '12))))))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yqls
index cf59f2bb0c..2b4c44ab98 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let ct (ParseType '"(Uint32?,Uint32)->Uint32"))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yqls
index 718fabeac3..ca5611d87d 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (ShiftLeft (Int32 '"1") (Int64 '"10")))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yqls
index e906d237e5..729fdb1bfc 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Skip (AsList (String 'a) (String 'b)) (Int64 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yqls
index 2de7c5efe9..649aeb5be9 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Substring (String 'abcde) (Int64 '2) (Uint64 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yqls
index b91a23e1de..721c00f27f 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Take (AsList (String 'a) (String 'b)) (Int64 '1)))
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yqls
index a2d9759568..5fac5c72de 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error: Failed to convert type: Variant<'A':Int32,'B':Int32,'C':Int32,'D':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yqls
index ac57358f03..213e112427 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<'A':Int32,'B':Int32,'X':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yqls
index a4e5f7dd40..c84a22312a 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<'A':Int32,'C':Int32,'X':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yqls
index a7bfc3ca2a..cc37420908 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error: Failed to convert type: Variant<'A':Int32,'B':Float,'C':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yqls
index cc6a372e44..4a3e6a91d3 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<'A':Int32,'B':Int32,'C':Float> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yqls
index d6e73eab29..e36ad06513 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error: Failed to convert type: Variant<Int32,Int32,Int32,Int32> to Variant<Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yqls
index e0419e94da..a44c8483bc 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error: Failed to convert type: Variant<Int32,Int32,Int32> to Variant<Int32,Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yqls
index 615950d586..82b30b4d4b 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<Int32,Float,Int32> to Variant<Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yqls
index b9d7408383..f69cfaaab3 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error: Failed to convert type: Variant<Int32,Int32,Float> to Variant<Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yqls
index d58f23fe27..2a0ca17bf6 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<Int32,Int32,Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -16,4 +16,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yqls
index 80492a709e..c081180cc7 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<'A':Int32,'B':Int32,'C':Int32,'D':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yqls
index b71b50dff7..6dd91fa214 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<'A':Int32,'B':Int32,'X':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yqls
index bd91e105e0..254361eaf7 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<'A':Int32,'C':Int32,'X':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yqls
index f40ab1d5d8..29df2cf780 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<'A':Int32,'B':Float,'C':Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yqls
index aa0ab07e67..c8b6d4d855 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error: Failed to convert type: Variant<'A':Int32,'B':Int32,'C':Float> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yqls
index 5c9d947981..60830468a7 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yqls
@@ -1,6 +1,6 @@
+/* custom error:Failed to convert type: Variant<Int32,Int32,Int32,Int32> to Variant<Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yqls
index 2ececbce27..dfbefedea2 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<Int32,Int32,Int32> to Variant<Int32,Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yqls
index 21c992bea5..072e25c972 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<Int32,Float,Int32> to Variant<Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yqls
index be762d2421..9818059f1b 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<Int32,Int32,Float> to Variant<Int32,Int32,Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (TupleType (DataType 'Int32) (DataType 'Int32) (DataType 'Int32))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yqls b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yqls
index 01a658c16e..c2834203dc 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yqls
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yqls
@@ -1,6 +1,6 @@
+# /* custom error:Failed to convert type: Variant<Int32,Int32,Int32> to Variant<'A':Int32,'B':Int32,'C':Int32>*/
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let origType (VariantType (StructType '('A (DataType 'Int32)) '('B (DataType 'Int32)) '('C (DataType 'Int32)))))
@@ -19,4 +19,4 @@
 (let world (Write! world res_sink (Key) testcase '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yqls
index e41c01a7b4..e0302e946c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t (ToDict (AsList '((String 'dkey1) (String 'dvalue1)) '((String 'dkey2) (String 'dvalue2)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yqls b/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yqls
index c84047a295..0f08c2719c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yqls b/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yqls
index e47215ae95..406f7e2270 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import core_module '"/lib/yql/core.yqls")
 (let res_sink (DataSink 'result))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yqls
index 6be3f9bffc..8bba7ecddc 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (ByteAt (String 'ab) (Uint32 '1)) '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Collect.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Collect.yqls
index e62000f1ee..6b1bf3e2f9 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Collect.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Collect.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (String 'aaa) (String 'bbb) (String 'ccc)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yqls b/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yqls
index 1e399b48cc..7240963c1e 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yqls b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yqls
index 112fc7f534..56119bcbcb 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yqls b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yqls
index 5d9ca77381..81e0b22f1b 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yqls b/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yqls
index b51f864573..dee291abc2 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.yqls
index 270e1a1bb4..79c4ee46e2 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.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/InMem/CountBits.yqls b/yql/essentials/tests/s-expressions/suites/InMem/CountBits.yqls
index 5f688a5075..87826864f3 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CountBits.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CountBits.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (CountBits (Int8 '-1)) '('('type))))
@@ -15,4 +14,4 @@
 
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Default.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Default.yqls
index a7f8667067..a65bde4933 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Default.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Default.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let test (lambda '(world type) (block '(
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Demux.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Demux.yqls
index 6fd4b3f3cd..1bef5b716a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Demux.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Demux.yqls
@@ -2,7 +2,6 @@
 #comment
 (let res_sink (DataSink 'result))
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let varTuple (VariantType (TupleType (DataType 'String) (DataType 'Bool) (DataType 'Uint32))))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yqls
index b12be636c8..9706bc181a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t1 (OptionalType (DataType 'Uint32)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yqls b/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yqls
index 4c9e5b46d5..45d4ec426e 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t1 (TupleType (OptionalType (DataType 'Uint32)) (DataType 'String)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yqls b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yqls
index 25e92e7eff..5ff187892c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t1 (DataType 'Uint32))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yqls b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yqls
index d7c81831cb..f98cf92deb 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t1 (DataType 'Uint32))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yqls
index ed1ea53868..f58532f7fe 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yqls b/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yqls
index 6d14f0d268..8cff53556c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yqls b/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yqls
index ee25f707f1..cf1f96f3eb 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (Int32 '1) (Int32 '2) (Int32 '3) (Int32 '4) (Int32 '5) (Int32 '6) (Int32 '7) (Int32 '8) (Int32 '9)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yqls b/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yqls
index 306f073803..a17385b828 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yqls b/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yqls
index 02b70ad22b..bdb6764b74 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Inc (Double '3.3)) '('('type))))
@@ -11,4 +10,4 @@
 
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yqls b/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yqls
index efa89ba44c..a4e6ca3a77 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Mod (Double '3.3) (Double '1.7)) '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Fold.yqls
index 9f4ce156f3..be1dd053f2 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let doFold (lambda '(list) (Fold list (List (TypeOf list)) (lambda '(item state) (Append state item)))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yqls
index 751de45375..f3aa157814 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yqls
index 1a3aad97c9..5a3a72e284 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yqls
index c555c6df02..a09deb2bdd 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yqls b/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yqls
index fde736a37c..b737c7cd52 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yqls
index dfec8da682..1c6f611a7d 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (String 'aaa) (String 'bbb) (String 'ccc)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yqls
index 30fcbac0b5..a4d2a44862 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yqls b/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yqls
index c21c6b07d3..de538a6e5e 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Guess.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Guess.yqls
index 256b5de592..2dbcf80990 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Guess.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Guess.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import id_module '"/lib/yql/id.yql")
 (let id (bind id_module 'id))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yqls
index 0ae29c3594..24eb08da4e 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let timeExtractor (lambda '(item) (Just (Member item 'time))))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yqls
index b551ccbad0..8a02b3d564 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yqls
index 0cba17d6ea..eb6d7c5b26 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (String 'aaa) (String 'bbb) (String 'ccc)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/LMap.yqls b/yql/essentials/tests/s-expressions/suites/InMem/LMap.yqls
index 12ad41b0a7..ec58077b64 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/LMap.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/LMap.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yqls
index 6c3403e7d4..5e0ea8950f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let test (lambda '(world data) (block '(
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yqls
index 7bf690187b..cdacf55b8f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let intervalOneSec (Interval '"1000000"))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yqls
index fafe8bee40..64d56bf8e4 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let s (AsStruct
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Merge.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Merge.yqls
index 3e91e821c6..deba1f9585 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Merge.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Merge.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yqls b/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yqls
index 7a39c20b0a..87144ee446 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (Int32 '1) (Int32 '2) (Int32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Mux.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Mux.yqls
index 2a226541f3..fe751fc12f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Mux.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Mux.yqls
@@ -2,7 +2,6 @@
 #comment
 (let res_sink (DataSink 'result))
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList (String 'a1) (String 'a2) (String 'a3)))
 (let list2 (AsList (Bool 'true) (Bool 'false)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yqls
index 428da2f45f..c8a3f782ff 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t '(
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yqls b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yqls
index af112ea360..8424b34ba1 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yqls b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yqls
index a5c99fd3ee..f6e4c13233 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yqls b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yqls
index 81326641f1..be13fd2635 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yqls b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yqls
index 73f3a3f970..f403f45ba4 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Queue.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Queue.yqls
index 2589942a60..ba9edefc11 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Queue.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Queue.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yqls b/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yqls
index 5bf3868fcc..42a65654dd 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yqls b/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yqls
index 55e36075f5..8d48800ff9 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yqls b/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yqls
index 3a0c673d27..01f648ce6c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yqls b/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yqls
index e7c8c1d029..a086d24573 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yqls
index bb7203c502..b98c7cc94e 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let s (AsStruct '('a (String 'ccc)) '('b (Double '3.5))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Seq.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Seq.yqls
index ea9eec4131..18e1687b37 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Seq.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Seq.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yqls b/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yqls
index 8da7e768fd..2a7cd2e700 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yqls
index 3ef2f4081b..e287b2ab54 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yqls b/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yqls
index ddfb0a7e16..ae75b25f4c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yqls b/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yqls
index 9ad041b115..a7b2289dc5 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t '((Int32 '34) (String 'qwe)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yqls
index c4c247d675..6a8120bd88 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let default (lambda '(x) (block '(
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yqls
index adf904774d..b5a18c981f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (Uint32 '1) (Uint32 '2) (Uint32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yqls
index 0e04475199..2c69f27db7 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (Uint32 '1) (Uint32 '2) (Uint32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yqls
index ce40b9f8a9..c9ded8d591 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (Uint32 '1) (Uint32 '2) (Uint32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yqls
index 9a23a4d591..ead6ee28b7 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (Int32 '1) (Int32 '2) (Int32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yqls
index 5acfe5d46d..7109ba2831 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yqls
index 78557d82b8..26fe71a762 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yqls
index e58ebc251e..fbaf35ea06 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList '((Uint32 '1) (String 'a)) '((Uint32 '1) (String 'b)) '((Uint32 '2) (String 'c))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yqls
index 5eae4467ff..36c4e6c5ad 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList '((Uint32 '1) (String 'a)) '((Uint32 '1) (String 'b)) '((Uint32 '2) (String 'c))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yqls
index cb48729c8f..606121c0b6 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (Uint32 '1) (Uint32 '2) (Uint32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yqls
index 3d553a2b36..457ac6241f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (Uint32 '1) (Uint32 '2) (Uint32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yqls
index 0870b1aac3..60a99da52b 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (Uint32 '1) (Uint32 '2) (Uint32 '3)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yqls
index 9d5e42e3cf..085d1d3347 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yqls b/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yqls
index c6b3b3de2d..6fe27ccc7a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Switch.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Switch.yqls
index 9c17ddd66e..4b7277d5ec 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Switch.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Switch.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (String 'aaa) (String 'bbb) (String 'ccc)))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yqls b/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yqls
index 4ad7ec02d1..c66d299a0d 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (TimezoneName (TimezoneId (String '"Europe/Moscow"))) '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yqls
index aa9ed74d8f..a9d00db799 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yqls
index c66f952fa6..5ca753e43b 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yqls
index 0a2fab711e..a3069066b6 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yqls
index a76f483330..241bb1a61c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yqls
index bbb90c5408..fed104d6dc 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yqls b/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yqls
index b9e3d077ae..d0ed51ae14 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let test (lambda '(world data) (block '(
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Top.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Top.yqls
index 0e8ab78955..5215384aed 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Top.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Top.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yqls b/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yqls
index 5b2d4c3930..7c897a28ce 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import id_module '"/lib/yql/id.yql")
 (let id (bind id_module 'id))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Visit.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Visit.yqls
index 0616a5100c..620f9a5baf 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Visit.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Visit.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import id_module '"/lib/yql/id.yql")
 (let id (bind id_module 'id))
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Way.yqls b/yql/essentials/tests/s-expressions/suites/InMem/Way.yqls
index a1e2043ec3..b95f867d1d 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Way.yqls
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Way.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import id_module '"/lib/yql/id.yql")
 (let id (bind id_module 'id))
diff --git a/yql/essentials/tests/s-expressions/suites/Join/InputSelf.txt b/yql/essentials/tests/s-expressions/suites/Join/InputSelf.txt
deleted file mode 100644
index 8ed0317c19..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/InputSelf.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="075";"subkey"=".";"value"="abc"};
-{"key"="911";"subkey"=".";"value"="kkk"};
-{"key"="023";"subkey"=".";"value"="075"};
-{"key"="527";"subkey"=".";"value"="bbb"};
-{"key"="037";"subkey"=".";"value"="ddd"};
-{"key"="761";"subkey"=".";"value"="023"};
-{"key"="200";"subkey"=".";"value"="qqq"};
-{"key"="150";"subkey"=".";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Join/InputSelf.txt.attr b/yql/essentials/tests/s-expressions/suites/Join/InputSelf.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/InputSelf.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yqls b/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yqls
index aecec9aba2..385ef16d70 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList 
   '((Int32 '1) (String 'A)) 
diff --git a/yql/essentials/tests/s-expressions/suites/Join/JoinTypes.yqls b/yql/essentials/tests/s-expressions/suites/Join/JoinTypes.yqls
deleted file mode 100644
index dff7b4a5f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/JoinTypes.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input1)))
-    '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table2 (Map table1 (lambda '(item) (block '(
-  (return (AsStruct 
-     '('value (Member item 'key)) 
-     '('subkey (Member item 'subkey)) 
-     '('key (Member item 'value)))))
-))))
-
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let joinInner (Join table1 table2 keyExtractor keyExtractor 'Inner))
-(let joinLeft (Join table1 table2 keyExtractor keyExtractor 'Left))
-(let joinRight (Join table1 table2 keyExtractor keyExtractor 'Right))
-(let joinFull (Join table1 table2 keyExtractor keyExtractor 'Full))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf joinInner)) '()))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf joinLeft)) '()))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf joinRight)) '()))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf joinFull)) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Join/default.cfg b/yql/essentials/tests/s-expressions/suites/Join/default.cfg
index db91b7fd18..01ea5c1898 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Join/default.cfg
@@ -1,5 +1,2 @@
 res result.txt
-in InputSelf InputSelf.txt
-in Input1 input1.txt
-in Input2 input2.txt
-in Input3 input3.txt
+
diff --git a/yql/essentials/tests/s-expressions/suites/Join/input1.txt b/yql/essentials/tests/s-expressions/suites/Join/input1.txt
deleted file mode 100644
index f53757c309..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/input1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="1";"value"="ddd"};
-{"key"="020";"subkey"="1";"value"="q"};
-{"key"="150";"subkey"="1";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Join/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/Join/input1.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Join/input2.txt b/yql/essentials/tests/s-expressions/suites/Join/input2.txt
deleted file mode 100644
index 07af3b4647..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="2";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="2";"value"="q"};
-{"key"="150";"subkey"="2";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Join/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/Join/input2.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Join/input3.txt b/yql/essentials/tests/s-expressions/suites/Join/input3.txt
deleted file mode 100644
index 1dc1bcc60b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/input3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="3";"value"="abd"};
-{"key"="800";"subkey"="3";"value"="ddd"};
-{"key"="021";"subkey"="3";"value"="q"};
-{"key"="151";"subkey"="3";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Join/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/Join/input3.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Join/input3.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
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))
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldProject.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldProject.yqls
deleted file mode 100644
index 55b38fb1b9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldProject.yqls
+++ /dev/null
@@ -1,59 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input1"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input2"))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (UnionAll (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"A" (String '"1")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )) (block '(
-          (let core table1)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"A" (Int64 '"1")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        ))))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"column1" ("Concat" (Member row '"key") (String '"AAA"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key" '"column1")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldRead.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldRead.yqls
deleted file mode 100644
index 67becd3ffb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldRead.yqls
+++ /dev/null
@@ -1,58 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input1"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input2"))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (UnionAll (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"A" (String '"1")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )) (block '(
-          (let core table1)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"A" (Int64 '"1")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        ))))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.cfg b/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.cfg
deleted file mode 100644
index e5e19ca2fb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-in Input1 input1.txt
-in Input2 input1.txt
-in Input3 input1.txt
-in Input4 input1.txt
-in Input5 input1.txt
-in Input6 input1.txt
-in Input7 input1.txt
-in Input8 input1.txt
-in Input9 input1.txt
-in Input10 input1.txt
-in Input11 input1.txt
-in Input12 input1.txt
-in Input13 input1.txt
-in Input14 input1.txt
-in Input15 input1.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.yqls
deleted file mode 100644
index 89b7fd5a76..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.yqls
+++ /dev/null
@@ -1,58 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input4))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table4 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input5))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table5 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input6))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table6 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input7))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table7 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input8))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table8 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input9))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table9 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input10))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table10 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input11))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table11 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input12))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table12 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input13))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table13 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input14))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table14 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input15))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table15 (Right! x))
-(let lens (AsList
-   (Length table1) (Length table2) (Length table3) (Length table4) (Length table5)
-   (Length table6) (Length table7) (Length table8) (Length table9) (Length table10)
-   (Length table11) (Length table12) (Length table13) (Length table14) (Length table15)))
-(let result (Fold lens (Uint64 '0) (lambda '(x y) (+ x y))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ConcatSortedAndNonSorted.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ConcatSortedAndNonSorted.yqls
deleted file mode 100644
index a16749b54f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ConcatSortedAndNonSorted.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-(let source (DataSource 'yt 'plato))
-(let x (Read! world source (Key '('table (String 'Input1))) '('key 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let sorted (Sort table (Bool 'true) (lambda '(item) (Member item 'value))))
-(let result (Extend table sorted))
-(let sink (DataSink 'yt 'plato))
-(let world (Write! world sink (Key '('table (String 'Output))) result '()))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupAndSort.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupAndSort.yqls
deleted file mode 100644
index 08089395f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupAndSort.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let offset (Uint64 '5))
-(let result (Extend table1 table1))
-(let result (Sort result (Bool 'true) (lambda '(row) (block '(
-    (let res (Member row 'key))
-    (return res)
-)
-))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupByExtend.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupByExtend.yqls
deleted file mode 100644
index 0089378d22..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupByExtend.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let offset (Uint64 '5))
-(let result (Extend table1 table1))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ExtendBetweenSorts.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ExtendBetweenSorts.yqls
deleted file mode 100644
index 110b0a004a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ExtendBetweenSorts.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let result1 (Sort table1 (Bool 'true) (lambda '(row) (block '(
-    (let res (Member row 'value))
-    (return res)
-)
-))))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let offset (Uint64 '5))
-(let result2 (Extend result1 table2))
-(let result2 (Sort result2 '((Bool 'true) (Bool 'true)) (lambda '(row) (block '(
-    (let res '((Member row 'key) (Member row 'subkey)))
-    (return res)
-)
-))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result2 '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result2 '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterAfterExtend.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterAfterExtend.yqls
deleted file mode 100644
index 1c7045232c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterAfterExtend.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let tresh (String '100))
-(let result (Filter (Extend table1 table2) (lambda '(item) (< (Member item 'key) tresh))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterBeforeExtend.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterBeforeExtend.yqls
deleted file mode 100644
index 2f2f487eca..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterBeforeExtend.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let tresh (String '100))
-(let result (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let result (Extend result table2))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.cfg b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.cfg
deleted file mode 100644
index 656c5e8480..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input1 non_ksv_input1.txt
-in Input2 non_ksv_input2.txt
-out Output output.txt
-res result.txt
-mount ..\mounts.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.yqls
deleted file mode 100644
index 66b8685a80..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (MrTableConcat (Key '('table (String 'Input1))) (Key '('table (String 'Input2)))) (Void) '()))
-(let world (Left! x))
-(let core (Right! x))
-(let core (Aggregate core '('"age") '('('cnt (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (Void)))))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) core '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.cfg b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.cfg
deleted file mode 100644
index 31a57e15ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-in Input1 non_ksv_input1.txt
-in Input2 non_ksv_input3.txt
-in Input3 non_ksv_input1.txt
-in Input4 non_ksv_input3.txt
-in Input5 non_ksv_input1.txt
-in Input6 non_ksv_input3.txt
-out Output output.txt
-res result.txt
-mount ..\mounts.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.yqls
deleted file mode 100644
index 537c5d88ba..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.yqls
+++ /dev/null
@@ -1,57 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat 
-     (Key '('table (String '"Input1")))
-     (Key '('table (String '"Input2")))
-     (Key '('table (String '"Input3")))
-     (Key '('table (String '"Input4")))
-     (Key '('table (String '"Input5")))
-     (Key '('table (String '"Input6")))
-   ) (Void) '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"age" (Coalesce
-                   (TryMember row '"age" (Nothing (OptionalType (DataType 'Int64))))
-                   (FromYsonSimpleType (SqlAccess 'dict (TryMember row '"_other" (Just (Dict (DictType (DataType '"String") (DataType '"String"))))) (String '"age")) 'Int64)
-                   ))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (Aggregate core '('"age") '('('Count1 (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (Void)))))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" (Member row 'Count1)) '('"age" (Member row '"age"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let output (Sort output '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'column0) (Member item 'age)))))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0" '"age")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableRange.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableRange.yqls
deleted file mode 100644
index 40cb4dc92c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableRange.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let filter (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input3")))))
-(let x (Read! world mr_source (Key '('table (MrTableRange '"" filter))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let length (Length tables))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) (Just (AsStruct '('value length))) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) length '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableStrictRange.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableStrictRange.yqls
deleted file mode 100644
index b52191ad74..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableStrictRange.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let filter (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input3")))))
-(let x (Read! world mr_source (Key '('table (MrTableRangeStrict '"" filter))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let length (Length tables))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) (Just (AsStruct '('value length))) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) length '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTwoTables.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTwoTables.yqls
deleted file mode 100644
index 6855885d32..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTwoTables.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source '((Key '('table (String 'Input1))) (Key '('table (String 'Input2)))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let length (Length tables))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) (Just (AsStruct '('value length))) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) length '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfWeakConcatTables.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfWeakConcatTables.yqls
deleted file mode 100644
index b103b4e66e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfWeakConcatTables.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (MrTableConcat (Key '('table (String 'Input1))) (Key '('table (String 'Input2)))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let length (Length tables))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) (Just (AsStruct '('value length))) '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) length '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ManyTableRange.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ManyTableRange.yqls
deleted file mode 100644
index f5612e30a0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ManyTableRange.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let filter1 (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input1")))))
-(let filter3 (lambda '(name) (And (>= name (String '"Input3")) (<= name (String '"Input3")))))
-(let x (Read! world mr_source '(
-  (Key '('table (MrTableRange '"" filter1)))
-  (Key '('table (MrTableRange '"" filter3)))) 
-  (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapThreeTables.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapThreeTables.yqls
deleted file mode 100644
index 506868f4a8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapThreeTables.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-(let tresh (Int32 '100))
-(let result (FlatMap (Extend table1 (Extend table2 table3)) (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapTwoTables.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapTwoTables.yqls
deleted file mode 100644
index aca48ae0c8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapTwoTables.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let tresh (Int32 '100))
-(let result (FlatMap (Extend table1 table2) (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/Skip.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/Skip.yqls
deleted file mode 100644
index 1995fa124f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/Skip.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let offset (Uint64 '5))
-(let result (Skip (Extend table1 table2) offset))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SkipTakeThenMapTreeTables.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SkipTakeThenMapTreeTables.yqls
deleted file mode 100644
index a4b1c5f1c6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SkipTakeThenMapTreeTables.yqls
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input3))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table3 (Right! x))
-(let e (Extend table1 (Extend table2 table3)))
-(let e (Skip e (Uint64 '5))) 
-(let e (Take e (Uint64 '6))) 
-(let table1map (Map e (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String '"")))
-   (let s (AddMember s 'value value))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SortTwoTables.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SortTwoTables.yqls
deleted file mode 100644
index 799d9cb488..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SortTwoTables.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let offset (Uint64 '5))
-(let result (Extend table1 table2))
-(let result (Sort result '((Bool 'true) (Bool 'true)) (lambda '(row) (block '(
-    (let res '((Member row 'key) (Member row 'subkey)))
-    (return res)
-)
-))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SplitTableRange.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SplitTableRange.yqls
deleted file mode 100644
index 8793b592e7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SplitTableRange.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"maxinputtables" '"2"))
-(let x (Read! world mr_source (Key '('table (MrTableRange '"" (lambda '($i) (And (>= $i (String '"Input1")) (<= $i (String '"Input~")))) '""))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRange.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRange.yqls
deleted file mode 100644
index 5e16c9166d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRange.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let filter (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input3")))))
-(let x (Read! world mr_source (Key '('table (MrTableRange '"" filter))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRangeStrict.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRangeStrict.yqls
deleted file mode 100644
index 80647dd661..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRangeStrict.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let filter (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input3")))))
-(let x (Read! world mr_source (Key '('table (MrTableRangeStrict '"" filter))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverStrictTableRange.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverStrictTableRange.yqls
deleted file mode 100644
index 3cca68b2ab..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverStrictTableRange.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let filter1 (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input1")))))
-(let filter3 (lambda '(name) (And (>= name (String '"Input3")) (<= name (String '"Input3")))))
-(let x (Read! world mr_source (MrTableConcat 
-  (Key '('table (MrTableRangeStrict '"" filter1)))
-  (Key '('table (MrTableRangeStrict '"" filter3))))
-  (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverTableRange.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverTableRange.yqls
deleted file mode 100644
index b43c3f66d4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverTableRange.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let filter1 (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input1")))))
-(let filter3 (lambda '(name) (And (>= name (String '"Input3")) (<= name (String '"Input3")))))
-(let x (Read! world mr_source (MrTableConcat 
-  (Key '('table (MrTableRange '"" filter1)))
-  (Key '('table (MrTableRange '"" filter3)))) 
-  (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.cfg b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.cfg
deleted file mode 100644
index a87e460b09..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input1 non_ksv_input1.txt
-in Input2 non_ksv_input2.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.yqls
deleted file mode 100644
index a9ac514a99..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (MrTableConcat (Key '('table (String 'Input1))) (Key '('table (String 'Input2)))) (Void) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row 'name) (Member row 'name2)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '('('type))))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.cfg b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.cfg
deleted file mode 100644
index d7ef0e0048..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input1 non_ksv_input1_bad.txt
-in Input2 non_ksv_input2_bad.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.yqls b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.yqls
deleted file mode 100644
index da7c64aa5d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (MrTableConcat (Key '('table (String 'Input1))) (Key '('table (String 'Input2)))) '('name 'name2) '()))
-(let world (Left! x))
-(let tables (Right! x))
-(let tables (Sort tables '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row 'name) (Member row 'name2)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tables '()))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) tables '('('type))))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/default.cfg b/yql/essentials/tests/s-expressions/suites/ManyInputTables/default.cfg
deleted file mode 100644
index 5cdd7ddbf6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/default.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input1 input1.txt
-in Input2 input2.txt
-in Input3 input3.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input1.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/input1.txt
deleted file mode 100644
index f53757c309..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="1";"value"="ddd"};
-{"key"="020";"subkey"="1";"value"="q"};
-{"key"="150";"subkey"="1";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/input1.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input1.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input2.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/input2.txt
deleted file mode 100644
index 07af3b4647..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="2";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="2";"value"="q"};
-{"key"="150";"subkey"="2";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/input2.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input3.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/input3.txt
deleted file mode 100644
index 7a155c91b8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="3";"value"="abc"};
-{"key"="800";"subkey"="3";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="3";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/input3.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/input3.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1.txt
deleted file mode 100644
index dd7dace4b5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"=30;"name"="bob"};
-{"age"=16;"name"="alice"};
-{"age"=55;"name"="jone"};
-{"age"=45;"name"="silver"};
-{"age"=45;"name"="smith"};
-{"age"=90;"name"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1.txt.attr
deleted file mode 100644
index 984ced0f70..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["age";["DataType";"Int64"]];["name";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1_bad.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1_bad.txt
deleted file mode 100644
index dd7dace4b5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1_bad.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"=30;"name"="bob"};
-{"age"=16;"name"="alice"};
-{"age"=55;"name"="jone"};
-{"age"=45;"name"="silver"};
-{"age"=45;"name"="smith"};
-{"age"=90;"name"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1_bad.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1_bad.txt.attr
deleted file mode 100644
index 1ceba168e8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input1_bad.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["age";["DataType";"Int32"]];["name";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2.txt
deleted file mode 100644
index 72d5cb8767..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"=30u;"name2"="bob"};
-{"age"=16u;"name2"="alice"};
-{"age"=55u;"name2"="jone"};
-{"age"=45u;"name2"="silver"};
-{"age"=45u;"name2"="smith"};
-{"age"=90u;"name2"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2.txt.attr
deleted file mode 100644
index f6fe260020..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["age";["DataType";"Uint32"]];["name2";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2_bad.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2_bad.txt
deleted file mode 100644
index 72d5cb8767..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2_bad.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"=30u;"name2"="bob"};
-{"age"=16u;"name2"="alice"};
-{"age"=55u;"name2"="jone"};
-{"age"=45u;"name2"="silver"};
-{"age"=45u;"name2"="smith"};
-{"age"=90u;"name2"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2_bad.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2_bad.txt.attr
deleted file mode 100644
index e74a1cdc27..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input2_bad.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["age";["OptionalType";["DataType";"Uint32"]]];["name2";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input3.txt b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input3.txt
deleted file mode 100644
index dfe71abfe7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input3.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"=30;"name2"="bob"};
-{"age"=16;"name2"="alice"};
-{"age"=55;"name2"="jone"};
-{"age"=45;"name2"="silver"};
-{"age"=45;"name2"="smith"};
-{"age"=90;"name2"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input3.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input3.txt.attr
deleted file mode 100644
index 1c447d3475..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/non_ksv_input3.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "schema" = <
-        "strict" = %false;
-        "unique_keys" = %false
-    >
-    [{
-        "name" = "missing";
-        "type" = "string"
-    }];
-}
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.cfg b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.cfg
deleted file mode 100644
index f4ca3c4cf6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-in hits Bug1465_hits.txt
-out out1 out1.txt
-out out2 out2.txt
-res result.txt
-udf url_udf
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.sql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.sql
deleted file mode 100644
index f8488fb2e1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.sql
+++ /dev/null
@@ -1,181 +0,0 @@
-USE hahn;
-
-$minus_date = Python::minus_date(
-    @@(String?,String?)->Int64@@,
-    @@
-from datetime import datetime, timedelta
-def minus_date(date1, date2):
-    return (datetime.strptime(date1, "%Y-%m-%d") - datetime.strptime(date2, "%Y-%m-%d")).days
-    @@
-);
-
-$normalize_list = Python::normalize_list(
-    @@(List<Tuple<Int64,Int64?>>)->List<Tuple<Int64,Int64>>@@,
-    @@
-def normalize_list(values):
-    return sorted((x, y) for x, y in values if y)
-    @@
-);
-
-$urls = (
-FROM hits
-SELECT url AS Url, "2016-10-25" AS Date
-GROUP BY url
-);
-
-$flatten_factors = (
-FROM $urls AS target
-INNER JOIN hits AS history
-ON target.Url == history.url
-SELECT
-    target.Url AS Url,
-    target.Date AS Date,
-    history.*
-);
-
-INSERT INTO [Out1] WITH TRUNCATE FROM $flatten_factors SELECT *;
-COMMIT;
-
-$pool = (
-FROM [Out1]
-SELECT
-    Url,
-    Date,
-    Url::GetHost(Url) AS Host
-/*    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.metrika_all_total]))) AS metrika_all_total
-/*    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.yabro_mobile_unique]))) AS yabro_mobile_unique,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.metrika_counter_count]))) AS metrika_counter_count,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.metrika_yabro_desktop_total]))) AS metrika_yabro_desktop_total,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.metrika_yabro_desktop_unique]))) AS metrika_yabro_desktop_unique,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.metrika_all_unique]))) AS metrika_all_unique,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.metrika_yabro_mobile_unique]))) AS metrika_yabro_mobile_unique,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.yabro_desktop_total]))) AS yabro_desktop_total,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.yabro_desktop_unique]))) AS yabro_desktop_unique,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.yabro_mobile_total]))) AS yabro_mobile_total,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.metrika_yabro_mobile_total]))) AS metrika_yabro_mobile_total,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.cs_clicks]))) AS cs_clicks,
-    $normalize_list(LIST(($minus_date(Date, [history.date]), [history.cs_shows]))) AS cs_shows*/
-GROUP BY Url, Date
-);
-
-$hosts = (
-FROM $pool
-SELECT Host, "2016-10-25" AS Date
-GROUP BY Host
-);
-
-$host_features = (
-FROM $hosts AS hosts
-LEFT JOIN hits AS all_hits
-ON hosts.Host == Url::GetHost(all_hits.url)
-SELECT
-    hosts.Host AS Host,
-    hosts.Date AS Date,
-/*    SUM(all_hits.metrika_all_total) AS metrika_all_total_sum7,
-/*    MAX(all_hits.metrika_all_total) AS metrika_all_total_max7,
---     STDDEV(all_hits.metrika_all_total) AS metrika_all_total_stddev7,
-    MEDIAN(all_hits.metrika_all_total) AS metrika_all_total_median7,
-    PERCENTILE(all_hits.metrika_all_total, 0.25) AS metrika_all_total_25perc7,
-    PERCENTILE(all_hits.metrika_all_total, 0.75) AS metrika_all_total_75perc7,
-    COUNT_IF(all_hits.metrika_all_total > 0) AS metrika_all_total_nonzero7,
-    SUM(all_hits.yabro_mobile_unique) AS yabro_mobile_unique_sum7,
-    MAX(all_hits.yabro_mobile_unique) AS yabro_mobile_unique_max7,
---     STDDEV(all_hits.yabro_mobile_unique) AS yabro_mobile_unique_stddev7,
-    MEDIAN(all_hits.yabro_mobile_unique) AS yabro_mobile_unique_median7,
-    PERCENTILE(all_hits.yabro_mobile_unique, 0.25) AS yabro_mobile_unique_25perc7,
-    PERCENTILE(all_hits.yabro_mobile_unique, 0.75) AS yabro_mobile_unique_75perc7,
-    COUNT_IF(all_hits.yabro_mobile_unique > 0) AS yabro_mobile_unique_nonzero7,
-    SUM(all_hits.metrika_counter_count) AS metrika_counter_count_sum7,
-    MAX(all_hits.metrika_counter_count) AS metrika_counter_count_max7,
---     STDDEV(all_hits.metrika_counter_count) AS metrika_counter_count_stddev7,
-    MEDIAN(all_hits.metrika_counter_count) AS metrika_counter_count_median7,
-    PERCENTILE(all_hits.metrika_counter_count, 0.25) AS metrika_counter_count_25perc7,
-    PERCENTILE(all_hits.metrika_counter_count, 0.75) AS metrika_counter_count_75perc7,
-    COUNT_IF(all_hits.metrika_counter_count > 0) AS metrika_counter_count_nonzero7,
-    SUM(all_hits.metrika_yabro_desktop_total) AS metrika_yabro_desktop_total_sum7,
-    MAX(all_hits.metrika_yabro_desktop_total) AS metrika_yabro_desktop_total_max7,
---     STDDEV(all_hits.metrika_yabro_desktop_total) AS metrika_yabro_desktop_total_stddev7,
-    MEDIAN(all_hits.metrika_yabro_desktop_total) AS metrika_yabro_desktop_total_median7,
-    PERCENTILE(all_hits.metrika_yabro_desktop_total, 0.25) AS metrika_yabro_desktop_total_25perc7,
-    PERCENTILE(all_hits.metrika_yabro_desktop_total, 0.75) AS metrika_yabro_desktop_total_75perc7,
-    COUNT_IF(all_hits.metrika_yabro_desktop_total > 0) AS metrika_yabro_desktop_total_nonzero7,
-    SUM(all_hits.metrika_yabro_desktop_unique) AS metrika_yabro_desktop_unique_sum7,
-    MAX(all_hits.metrika_yabro_desktop_unique) AS metrika_yabro_desktop_unique_max7,
---     STDDEV(all_hits.metrika_yabro_desktop_unique) AS metrika_yabro_desktop_unique_stddev7,
-    MEDIAN(all_hits.metrika_yabro_desktop_unique) AS metrika_yabro_desktop_unique_median7,
-    PERCENTILE(all_hits.metrika_yabro_desktop_unique, 0.25) AS metrika_yabro_desktop_unique_25perc7,
-    PERCENTILE(all_hits.metrika_yabro_desktop_unique, 0.75) AS metrika_yabro_desktop_unique_75perc7,
-    COUNT_IF(all_hits.metrika_yabro_desktop_unique > 0) AS metrika_yabro_desktop_unique_nonzero7,
-    SUM(all_hits.metrika_all_unique) AS metrika_all_unique_sum7,
-    MAX(all_hits.metrika_all_unique) AS metrika_all_unique_max7,
---     STDDEV(all_hits.metrika_all_unique) AS metrika_all_unique_stddev7,
-    MEDIAN(all_hits.metrika_all_unique) AS metrika_all_unique_median7,
-    PERCENTILE(all_hits.metrika_all_unique, 0.25) AS metrika_all_unique_25perc7,
-    PERCENTILE(all_hits.metrika_all_unique, 0.75) AS metrika_all_unique_75perc7,
-    COUNT_IF(all_hits.metrika_all_unique > 0) AS metrika_all_unique_nonzero7,
-    SUM(all_hits.metrika_yabro_mobile_unique) AS metrika_yabro_mobile_unique_sum7,
-    MAX(all_hits.metrika_yabro_mobile_unique) AS metrika_yabro_mobile_unique_max7,
---     STDDEV(all_hits.metrika_yabro_mobile_unique) AS metrika_yabro_mobile_unique_stddev7,
-    MEDIAN(all_hits.metrika_yabro_mobile_unique) AS metrika_yabro_mobile_unique_median7,
-    PERCENTILE(all_hits.metrika_yabro_mobile_unique, 0.25) AS metrika_yabro_mobile_unique_25perc7,
-    PERCENTILE(all_hits.metrika_yabro_mobile_unique, 0.75) AS metrika_yabro_mobile_unique_75perc7,
-    COUNT_IF(all_hits.metrika_yabro_mobile_unique > 0) AS metrika_yabro_mobile_unique_nonzero7,
-    SUM(all_hits.yabro_desktop_total) AS yabro_desktop_total_sum7,
-    MAX(all_hits.yabro_desktop_total) AS yabro_desktop_total_max7,
---     STDDEV(all_hits.yabro_desktop_total) AS yabro_desktop_total_stddev7,
-    MEDIAN(all_hits.yabro_desktop_total) AS yabro_desktop_total_median7,
-    PERCENTILE(all_hits.yabro_desktop_total, 0.25) AS yabro_desktop_total_25perc7,
-    PERCENTILE(all_hits.yabro_desktop_total, 0.75) AS yabro_desktop_total_75perc7,
-    COUNT_IF(all_hits.yabro_desktop_total > 0) AS yabro_desktop_total_nonzero7,
-    SUM(all_hits.yabro_desktop_unique) AS yabro_desktop_unique_sum7,
-    MAX(all_hits.yabro_desktop_unique) AS yabro_desktop_unique_max7,
---     STDDEV(all_hits.yabro_desktop_unique) AS yabro_desktop_unique_stddev7,
-    MEDIAN(all_hits.yabro_desktop_unique) AS yabro_desktop_unique_median7,
-    PERCENTILE(all_hits.yabro_desktop_unique, 0.25) AS yabro_desktop_unique_25perc7,
-    PERCENTILE(all_hits.yabro_desktop_unique, 0.75) AS yabro_desktop_unique_75perc7,
-    COUNT_IF(all_hits.yabro_desktop_unique > 0) AS yabro_desktop_unique_nonzero7,
-    SUM(all_hits.yabro_mobile_total) AS yabro_mobile_total_sum7,
-    MAX(all_hits.yabro_mobile_total) AS yabro_mobile_total_max7,
---     STDDEV(all_hits.yabro_mobile_total) AS yabro_mobile_total_stddev7,
-    MEDIAN(all_hits.yabro_mobile_total) AS yabro_mobile_total_median7,
-    PERCENTILE(all_hits.yabro_mobile_total, 0.25) AS yabro_mobile_total_25perc7,
-    PERCENTILE(all_hits.yabro_mobile_total, 0.75) AS yabro_mobile_total_75perc7,
-    COUNT_IF(all_hits.yabro_mobile_total > 0) AS yabro_mobile_total_nonzero7,
-    SUM(all_hits.metrika_yabro_mobile_total) AS metrika_yabro_mobile_total_sum7,
-    MAX(all_hits.metrika_yabro_mobile_total) AS metrika_yabro_mobile_total_max7,
---     STDDEV(all_hits.metrika_yabro_mobile_total) AS metrika_yabro_mobile_total_stddev7,
-    MEDIAN(all_hits.metrika_yabro_mobile_total) AS metrika_yabro_mobile_total_median7,
-    PERCENTILE(all_hits.metrika_yabro_mobile_total, 0.25) AS metrika_yabro_mobile_total_25perc7,
-    PERCENTILE(all_hits.metrika_yabro_mobile_total, 0.75) AS metrika_yabro_mobile_total_75perc7,
-    COUNT_IF(all_hits.metrika_yabro_mobile_total > 0) AS metrika_yabro_mobile_total_nonzero7,*/
-    COUNT(*) AS url_day_count,
-    COUNT(DISTINCT(all_hits.url)) AS url_count
-GROUP BY hosts.Host, hosts.Date
-);
-
-INSERT INTO [Out2] WITH TRUNCATE
-FROM $pool AS pool
-LEFT JOIN $host_features AS host
-ON Url::GetHost(pool.Url) == host.Host AND pool.Date == host.Date
-SELECT *;
-/*    pool.Date AS Date,
-    pool.yabro_mobile_unique AS yabro_mobile_unique,
-    pool.Url AS Url,
-    pool.cs_clicks AS cs_clicks,
-    pool.cs_shows AS cs_shows,
-    pool.metrika_all_total AS metrika_all_total,
-    pool.metrika_all_unique AS metrika_all_unique,
-    pool.Host AS Host,
-    pool.metrika_yabro_desktop_total AS metrika_yabro_desktop_total,
-    pool.metrika_yabro_desktop_unique AS metrika_yabro_desktop_unique,
-    pool.metrika_yabro_mobile_total AS metrika_yabro_mobile_total,
-    pool.metrika_yabro_mobile_unique AS metrika_yabro_mobile_unique,
-    pool.yabro_desktop_total AS yabro_desktop_total,
-    pool.yabro_desktop_unique AS yabro_desktop_unique,
-    pool.yabro_mobile_total AS yabro_mobile_total,
-    pool.metrika_counter_count AS metrika_counter_count,
-    host.*;*/
-
-COMMIT;
-DROP TABLE [Out1];
-
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.yqls
deleted file mode 100644
index eaa0d95edb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.yqls
+++ /dev/null
@@ -1,192 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"hits"))) (Void) '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (EquiJoin '((block '(
-            (let select (block '(
-              (let core table0)
-              (let core (block '(
-                (return (Aggregate core '('"url") '()))
-              )))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (Struct))
-                (let res (AddMember res '"Url" (Member row '"url")))
-                (let res (AddMember res '"Date" (String '"2016-10-25")))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )) '"target") '(table0 '"history") '('Inner '"target" '"history" '('"target" '"Url") '('"history" '"url") '()) '()))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (SelectMembers row '('"history.")))
-            (let res (AddMember res '"Url" (Member row '"target.Url")))
-            (let res (AddMember res '"Date" (Member row '"target.Date")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"out1"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let hahn_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world hahn_sink))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"out1"))) '('"Url" '"Date") '()))
-  (let world (Left! x))
-  (let table3 (Right! x))
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"hits"))) '('"url") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (Map (EquiJoin '((Map (block '(
-        (let select (block '(
-          (let core table3)
-          (let core (block '(
-            (return (Aggregate core '('"Date" '"Url") '()))
-          )))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"Url" (Member row '"Url")))
-            (let res (AddMember res '"Date" (Member row '"Date")))
-            (let res (AddMember res '"Host" ("Apply" ("Udf" '"Url.GetHost") (Member row '"Url"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) (lambda '(row) (block '(
-        (let row (AddMember row '"_equijoin_column_0" ("Apply" ("Udf" '"Url.GetHost") (Member row '"Url"))))
-        (return row)
-      )))) '"pool") '((block '(
-        (let select (block '(
-          (let core (Map (EquiJoin '((block '(
-            (let select (block '(
-              (let core (block '(
-                (let select (block '(
-                  (let core table3)
-                  (let core (block '(
-                    (return (Aggregate core '('"Date" '"Url") '()))
-                  )))
-                  (let core (FlatMap core (lambda '(row) (block '(
-                    (let res (Struct))
-                    (let res (AddMember res '"Url" (Member row '"Url")))
-                    (let res (AddMember res '"Date" (Member row '"Date")))
-                    (let res (AddMember res '"Host" ("Apply" ("Udf" '"Url.GetHost") (Member row '"Url"))))
-                    (let res (AsList res))
-                    (return res)
-                  )))))
-                  (return core)
-                )))
-                (return select)
-              )))
-              (let core (block '(
-                (return (Aggregate core '('"Host") '()))
-              )))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (Struct))
-                (let res (AddMember res '"Host" (Member row '"Host")))
-                (let res (AddMember res '"Date" (String '"2016-10-25")))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )) '"hosts") '((Map table0 (lambda '(row) (block '(
-            (let row (AddMember row '"_equijoin_column_0" ("Apply" ("Udf" '"Url.GetHost") (Member row '"url"))))
-            (return row)
-          )))) '"all_hits") '('Left '"hosts" '"all_hits" '('"hosts" '"Host") '('"all_hits" '"_equijoin_column_0") '()) '()) (lambda '(row) (block '(
-            (let row (ForceRemoveMember row '"all_hits._equijoin_column_0"))
-            (return row)
-          )))))
-          (let core (block '(
-            (let Count4_create (lambda '(row) (Uint64 '1)))
-            (let Count4_update (lambda '(row state) (OptionalReduce state (Uint64 '1) (lambda '(a b) (+ a b)))))
-            (let Count4_save (lambda '(state) state))
-            (let Count4_load (lambda '(item) item))
-            (let Count4_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-            (let Count4_finish (lambda '(state) state))
-            (let Count5_create (lambda '(row) (Convert (Exists row) 'Uint64)))
-            (let Count5_update (lambda '(row state) (OptionalReduce state (Convert (Exists row) 'Uint64) (lambda '(a b) (+ a b)))))
-            (let Count5_save (lambda '(state) state))
-            (let Count5_load (lambda '(item) item))
-            (let Count5_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-            (let Count5_finish (lambda '(state) state))
-            (return (Aggregate core '('"hosts.Date" '"hosts.Host") '('('Count4 (AggregationTraits (ListItemType (TypeOf core)) Count4_create Count4_update Count4_save Count4_load Count4_merge Count4_finish (Uint64 '0))) '('Count5 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"all_hits.url") Count5_create Count5_update Count5_save Count5_load Count5_merge Count5_finish (Uint64 '0)) '"all_hits.url"))))
-          )))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"Host" (Member row '"hosts.Host")))
-            (let res (AddMember res '"Date" (Member row '"hosts.Date")))
-            (let res (AddMember res '"url_day_count" (Member row 'Count4)))
-            (let res (AddMember res '"url_count" (Member row 'Count5)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"host") '('Left '"pool" '"host" '('"pool" '"_equijoin_column_0" '"pool" '"Date") '('"host" '"Host" '"host" '"Date") '()) '()) (lambda '(row) (block '(
-        (let row (ForceRemoveMember row '"pool._equijoin_column_0"))
-        (return row)
-      )))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"out2"))) values '('('mode 'renew))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let hahn_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world hahn_sink))
-  (return world)
-)))
-(let world (block '(
-  (let sink (DataSink '"yt" '"plato"))
-  (let world (Write! world sink (Key '('table (String '"out1"))) (Void) '('('mode 'drop))))
-  (return world)
-)))
-(let world (block '(
-  (let hahn_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world hahn_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465_hits.txt b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465_hits.txt
deleted file mode 100644
index d122076744..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465_hits.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"history.date"="20016-01-01";"url"="http://ya.ru"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465_hits.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465_hits.txt.attr
deleted file mode 100644
index 56aac6ba29..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465_hits.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["url";["OptionalType";["DataType";"String"]]];["history.date";["OptionalType";["DataType";"String"]]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.sql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.sql
deleted file mode 100644
index c5ed4796d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-USE plato;
-
-SELECT sum(count) from (
-select count(*) as count from Input WHERE key < "100"
-);
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.yqls
deleted file mode 100644
index bfe1778ed4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.yqls
+++ /dev/null
@@ -1,47 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table1)
-          (let core (Filter core (lambda '(row) (Coalesce ("<" (Member row '"key") (String '"100")) (Bool 'false)))))
-          (let core (Just (AsStruct '('Count0 (Length core)))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"count" (Member row 'Count0))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (Aggregate core '() '('('Sum2 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"count")))))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" (Member row 'Sum2))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenGroup.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenGroup.yqls
deleted file mode 100644
index 5a39b90887..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenGroup.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-
-  (let preMap (lambda '(item) (Just item)))
-  (let keyExtractor (lambda '(item) (Member item 'key)))
-  (let init (lambda '(key item) (Member item 'value)))
-  (let update (lambda '(key item state) (Concat state (Member item 'value))))
-  (let finish (lambda '(key state) (block '(
-    (let s (Struct))
-    (let s (AddMember s 'key key))
-    (let s (AddMember s 'subkey (String '.)))
-    (let s (AddMember s 'value state))
-    (return (Just s))
-  ))))
-  (let combine (CombineByKey table0 preMap keyExtractor init update finish))
-
-  (let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-    (let key (Nth pair '0))
-    (let list (ForwardList (Nth pair '1)))
-    (let s (Struct))
-    (let s (AddMember s 'key key))
-    (let s (AddMember s 'subkey (String '.)))
-    (let value (Fold1 list
-      (lambda '(item) (Member item 'value)) 
-      (lambda '(item state) (Concat state (Member item 'value)))
-    ))
-    (let s (AddMember s 'value (Coalesce value (String '""))))
-    (let ret (AsList s))
-    (return ret)
-  ))))))
-  (let reducedTable (PartitionByKey combine keyExtractor (Void) (Void) listHandler))
-  (let mr_sink (DataSink 'yt (quote plato)))
-  (let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-  (let world (Commit! world mr_sink))
-
-  (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenSort.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenSort.yqls
deleted file mode 100644
index c9f35934d8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenSort.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-
-  (let map (FlatMap table0 (lambda '(row) (block '(
-    (let key (MatchType (Member row '"key") 'Optional (lambda '(item) (Coalesce (Map item (lambda '(val) (IfType val (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Just (Convert item '"Int64")))))) (Nothing (OptionalType (DataType '"Int64"))))) (lambda '(item) (IfType item (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Convert item '"Int64"))))))
-    (let res (Struct))
-    (let res (AddMember res '"Avg1" '(key (Convert (Exists key) 'Uint64))))
-    (let res (AsList res))
-    (return res)
-  )))))
-  (let combine (CombineByKey map (lambda '(row) (Just row)) (lambda '(row) (Uint64 '0)) (lambda '(key row) row) (lambda '(key row state) state) (lambda '(key state) (Just state))))
-  (let result (FlatMap combine (lambda '(row) (block '(
-    (let p0 (Nth (Member row 'Avg1) '0))
-    (let p1 (Nth (Member row 'Avg1) '1))
-    (let res (Struct))
-    (let res (AddMember res '"keyAvg" (
-        FlatMap p0 (lambda '(value) (Just (Coalesce (Div (Convert value 'Double) (Convert p1 'Double)) (Double '0))))
-    )))
-    (let res (AsList res))
-    (return res)
-  )))))
-  (let sortAfterCombine (Sort result (Bool 'false) (lambda '(x) (Member x 'keyAvg) )))
-  (let result_sink (DataSink 'result))
-  (let world (Write! world result_sink (Key) sortAfterCombine '('('type) '('autoref))))
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return (Commit! world result_sink))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapCombineMap.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapCombineMap.yqls
deleted file mode 100644
index fd5d2eb0e7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapCombineMap.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"subkey" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-
-  (let map (FlatMap table0 (lambda '(row) (block '(
-    (let key (MatchType (Member row '"key") 'Optional (lambda '(item) (Coalesce (Map item (lambda '(val) (IfType val (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Just (Convert item '"Int64")))))) (Nothing (OptionalType (DataType '"Int64"))))) (lambda '(item) (IfType item (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Convert item '"Int64"))))))
-    (let res (Struct))
-    (let res (AddMember res '"Avg1" '(key (Convert (Exists key) 'Uint64))))
-    (let res (AsList res))
-    (return res)
-  )))))
-  (let combine (CombineByKey map (lambda '(row) (Just row)) (lambda '(row) (Uint64 '0)) (lambda '(key row) row) (lambda '(key row state) state) (lambda '(key state) (Just state))))
-  (let result (FlatMap combine (lambda '(row) (block '(
-    (let p0 (Nth (Member row 'Avg1) '0))
-    (let p1 (Nth (Member row 'Avg1) '1))
-    (let res (Struct))
-    (let res (AddMember res '"keyAvg" (
-        FlatMap p0 (lambda '(value) (Just (Coalesce (Div (Convert value 'Double) (Convert p1 'Double)) (Double '0))))
-    )))
-    (let res (AsList res))
-    (return res)
-  )))))
-  (let result_sink (DataSink 'result))
-  (let world (Write! world result_sink (Key) result '('('type) '('autoref))))
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return (Commit! world result_sink))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenExtend.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenExtend.yqls
deleted file mode 100644
index d8c639d055..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenExtend.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String  '1)))
-   (let s (AddMember s 'value (String 'v)))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt 'plato))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) (Extend table1map table1map) '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenGroup.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenGroup.yqls
deleted file mode 100644
index 6248b7416e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenGroup.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (let s (ListIf (< item2 tresh) item))
-      (return s)
-   )))))
-   (return ret)
-)))))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (ToString (Length list))))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1low keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenSort.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenSort.yqls
deleted file mode 100644
index fd736cacf2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenSort.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (let s (ListIf (< item2 tresh) item))
-      (return s)
-   )))))
-   (return ret)
-)))))
-(let table1sorted (Sort table1low (Bool 'true) (lambda '(item) (Member item 'key))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1sorted '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapWithReadTable.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapWithReadTable.yqls
deleted file mode 100644
index c276a9e835..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapWithReadTable.yqls
+++ /dev/null
@@ -1,53 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table1)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("Concat" (Member row '"key") ("Coalesce" (Member (MatchType (block '(
-          (let select (block '(
-            (let core table1)
-            (let core (block '(
-              (let Min0_create (lambda '(row) (Member row '"key")))
-              (let Min0_update (lambda '(row state) (OptionalReduce state (Member row '"key") (lambda '(a b) (Min a b)))))
-              (let Min0_save (lambda '(state) state))
-              (let Min0_load (lambda '(item) item))
-              (let Min0_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (Min a b)))))
-              (let Min0_finish (lambda '(state) state))
-              (return (Aggregate core '() '('('Min0 (AggregationTraits (ListItemType (TypeOf core)) Min0_create Min0_update Min0_save Min0_load Min0_merge Min0_finish (Null))))))
-            )))
-            (let core (FlatMap core (lambda '(row) (block '(
-              (let res (Struct))
-              (let res (AddMember res '"key" (Member row 'Min0)))
-              (let res (AsList res))
-              (return res)
-            )))))
-            (return core)
-          )))
-          (return select)
-        )) 'Dict (lambda '(dict) (Lookup dict (Int64 '"0"))) (lambda '(list) (Lookup (ToIndexDict list) (Int64 '"0")))) '"key") (String '"")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenMap.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenMap.yqls
deleted file mode 100644
index df91ac7aab..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenMap.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (ToString (Length list))))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let filterAfterReduce (Filter reducedTable (lambda '(x) (block '(
-   (return (> (Member x 'value) (String '1)))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) filterAfterReduce '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenSort.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenSort.yqls
deleted file mode 100644
index 420d463be3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenSort.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (Concat (ToString (Length list)) key)))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let sortAfterReduce (Sort reducedTable (Bool 'false) (lambda '(x) (Member x 'value) )))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) sortAfterReduce '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/TakeThenMap.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/TakeThenMap.yqls
deleted file mode 100644
index f1dfaf4ca4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/TakeThenMap.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap (Take table1 (Uint64 '3)) (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (let s (ListIf (< item2 tresh) item))
-      (return s)
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_1.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_1.yqls
deleted file mode 100644
index b8d187bc7e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_1.yqls
+++ /dev/null
@@ -1,85 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"subkey" (String '"")))
-            (let res (AddMember res '"value" ("Concat" (String '"value:") (Member row '"value"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Take select (Int32 '"2")))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"subkey" (String '"")))
-            (let res (AddMember res '"value" ("Concat" (String '"value:") (Member row '"value"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'append))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_2.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_2.yqls
deleted file mode 100644
index 5759729397..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_2.yqls
+++ /dev/null
@@ -1,86 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"subkey" (String '"")))
-            (let res (AddMember res '"value" ("Concat" (String '"value:") (Member row '"value"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Take select (Int32 '"2")))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"key")))
-            (let res (AddMember res '"subkey" (String '"")))
-            (let res (AddMember res '"value" ("Concat" (String '"value:") (Member row '"value"))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Take select (Int32 '"3")))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'append))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/default.cfg b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/default.cfg
deleted file mode 100644
index fe2b19a9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/default.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/input.txt b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/input.txt
deleted file mode 100644
index d77d384ae6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/input.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="075";"subkey"="2";"value"="qqqw"};
-{"key"="800";"subkey"="3";"value"="ddd"};
-{"key"="020";"subkey"="4";"value"="q"};
-{"key"="150";"subkey"="5";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/input.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/default.cfg b/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/default.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/default.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/input.txt b/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/input.txt.attr b/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.cfg b/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.cfg
deleted file mode 100644
index 5baea08e78..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-out Output2 output2.txt
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.yqls b/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.yqls
deleted file mode 100644
index 8ebe956e7c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(let x (Read! world mr_source (Key '('table (String 'Output))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) table2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiIn.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiIn.yqls
deleted file mode 100644
index 261a85c931..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiIn.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let data2 (Right! x))
-
-(let data (Mux '(data1 data2)))
-
-(let data (LMap data (lambda '(stream) (block '(
-    (return (FlatMap stream (lambda '(item) (block '(
-        (let res (Visit item
-            '0 (lambda '(item) (block '(
-                (let s (Struct))
-                (let s (AddMember s 'key (Member item 'key)))
-                (let s (AddMember s 'subkey (String '0)))
-                (let s (AddMember s 'value (Member item 'value)))
-                (return s)
-            )))
-            '1 (lambda '(item) (block '(
-                (let s (Struct))
-                (let s (AddMember s 'key (Member item 'key)))
-                (let s (AddMember s 'subkey (String '1)))
-                (let s (AddMember s 'value (Member item 'value)))
-                (return s)
-            )))
-        ))
-        (return (Just res))
-    )))))
-)))))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) data '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiOut.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiOut.yqls
deleted file mode 100644
index aeefafd75f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiOut.yqls
+++ /dev/null
@@ -1,43 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let varTuple (VariantType (TupleType
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-)))
-
-(let data (LMap data (lambda '(stream) (block '(
-    (return (FlatMap stream (lambda '(item) (block '(
-        (let intValue (FromString (Member item 'key) 'Int32))
-        (let res
-            (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-                (Variant item '0 varTuple)
-                (Variant item '1 varTuple)
-            )
-        )
-        (return (Just res))
-    )))))
-)))))
-
-(let dataTuple (Demux data))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) (Nth dataTuple '0) '('('mode 'renew))))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) (Nth dataTuple '1) '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MapOverDemux.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/MapOverDemux.yqls
deleted file mode 100644
index 4697cb40ba..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MapOverDemux.yqls
+++ /dev/null
@@ -1,45 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let varTuple (VariantType (TupleType
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res
-        (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-            (Variant item '0 varTuple)
-            (Variant item '1 varTuple)
-        )
-    )
-   (return res)
-)))))
-
-(let dataTuple (Demux data))
-
-(let data1 (Nth dataTuple '0))
-(let data2 (Nth dataTuple '1))
-
-(let data1 (Filter data1 (lambda '(item) (Less (Member item 'key) (String '200)))))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) data1 '('('mode 'renew))))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) data2 '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMap.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMap.yqls
deleted file mode 100644
index bbceddd5da..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMap.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let data1 (Filter data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false)))
-    (return res)
-)))))
-
-(let data2 (Filter data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '1)) (Bool 'false)))
-    (return res)
-)))))
-
-(let data (Mux '(data1 data2)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let res (Visit item
-        '0 (lambda '(x) x)
-        '1 (lambda '(x) x)
-    ))
-   (return res)
-)))))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) data '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMixed.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMixed.yqls
deleted file mode 100644
index 77f51cfd2b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMixed.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let data1 (Filter data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false)))
-   (return res)
-)))))
-
-(let data2 (AsList
-    (AsStruct '('key (String 'k1)) '('subkey (String 's1)) '('value (String 'v1)))
-    (AsStruct '('key (String 'k2)) '('subkey (String 's2)) '('value (String 'v2)))
-    (AsStruct '('key (String 'k3)) '('subkey (String 's3)) '('value (String 'v3)))
-))
-
-(let data (Mux '(data1 data2)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let res (Visit item
-        '0 (lambda '(x) x)
-        '1 (lambda '(x) x)
-    ))
-   (return res)
-)))))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) data '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverRead.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverRead.yqls
deleted file mode 100644
index 08c7c997bc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverRead.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data1 (Right! x))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let data2 (Right! x))
-
-(let data (Mux '(data1 data2)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let res (Visit item
-        '0 (lambda '(x) x)
-        '1 (lambda '(x) x)
-    ))
-   (return res)
-)))))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) data '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/OrderedPartitionByKeyWithMultiOut.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/OrderedPartitionByKeyWithMultiOut.yqls
deleted file mode 100644
index 56ef61571a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/OrderedPartitionByKeyWithMultiOut.yqls
+++ /dev/null
@@ -1,56 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let varTuple (VariantType (TupleType
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-)))
-
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(groups) (block '(
-    (return (Map groups (lambda '(group) (block '(
-        (let key (Nth group '0))
-        (let stream (Nth group '1))
-
-        (let s (Struct))
-        (let s (AddMember s 'key key))
-        (let s (AddMember s 'subkey (String '.)))
-        (let s (AddMember s 'value (ToString (Length (ForwardList stream)))))
-
-        (let intValue (FromString key 'Int32))
-        (let res
-            (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-                (Variant s '0 varTuple)
-                (Variant s '1 varTuple)
-            )
-        )
-        (return res)
-    )))))
-))))
-(let data (PartitionByKey data keySelector (Void) (Void) listHandler))
-
-(let dataTuple (Demux data))
-
-(let data1 (Nth dataTuple '0))
-(let data2 (Nth dataTuple '1))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) data1 '('('mode 'renew))))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) data2 '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/PartitionByKeyWithMultiOut.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/PartitionByKeyWithMultiOut.yqls
deleted file mode 100644
index bcb27c7be3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/PartitionByKeyWithMultiOut.yqls
+++ /dev/null
@@ -1,56 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input2))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let varTuple (VariantType (TupleType
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-)))
-
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(groups) (block '(
-    (return (Map groups (lambda '(group) (block '(
-        (let key (Nth group '0))
-        (let stream (Nth group '1))
-
-        (let s (Struct))
-        (let s (AddMember s 'key key))
-        (let s (AddMember s 'subkey (String '.)))
-        (let s (AddMember s 'value (ToString (Length (ForwardList stream)))))
-
-        (let intValue (FromString key 'Int32))
-        (let res
-            (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-                (Variant s '0 varTuple)
-                (Variant s '1 varTuple)
-            )
-        )
-        (return res)
-    )))))
-))))
-(let data (PartitionByKey data keySelector (Void) (Void) listHandler))
-
-(let dataTuple (Demux data))
-
-(let data1 (Nth dataTuple '0))
-(let data2 (Nth dataTuple '1))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) data1 '('('mode 'renew))))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) data2 '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts1.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts1.yqls
deleted file mode 100644
index 30fefdd2f4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts1.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let varTuple (VariantType (TupleType
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res
-        (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-            (Variant item '0 varTuple)
-            (Variant item '1 varTuple)
-        )
-    )
-   (return res)
-)))))
-
-(let dataTuple (Demux data))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) (Nth dataTuple '1) '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts2.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts2.yqls
deleted file mode 100644
index 5d0c493a3d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts2.yqls
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let structType (StructType
-    '('key (DataType 'String))
-    '('subkey (DataType 'String))
-    '('value (DataType 'String))
-))
-
-(let varTuple (VariantType (TupleType structType structType structType)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let mod (Coalesce (% intValue (Int32 '3)) (Int32 '0)))
-    (let res
-        (If (Equal mod (Int32 '0))
-            (Variant item '0 varTuple)
-            (If (Equal mod (Int32 '1))
-                (Variant item '1 varTuple)
-                (Variant item '2 varTuple)
-            )
-        )
-    )
-   (return res)
-)))))
-
-(let dataTuple (Demux data))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) (Nth dataTuple '0) '('('mode 'renew))))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) (Nth dataTuple '2) '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts3.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts3.yqls
deleted file mode 100644
index 683fca64b4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts3.yqls
+++ /dev/null
@@ -1,43 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let structType (StructType
-    '('key (DataType 'String))
-    '('subkey (DataType 'String))
-    '('value (DataType 'String))
-))
-
-(let varTuple (VariantType (TupleType structType structType structType)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res
-        (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-            (Variant item '0 varTuple)
-            (Variant item '1 varTuple)
-        )
-    )
-    (let res
-        (If (Coalesce (Equal (% intValue (Int32 '3)) (Int32 '0)) (Bool 'false))
-            (Variant item '2 varTuple)
-            res
-        )
-    )
-    (return res)
-)))))
-
-(let dataTuple (Demux data))
-
-(let res (UnionAll (Nth dataTuple '0) (Nth dataTuple '1)))
-
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) res '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/WriteOverDemux.yqls b/yql/essentials/tests/s-expressions/suites/MultiIO/WriteOverDemux.yqls
deleted file mode 100644
index ddf986949c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/WriteOverDemux.yqls
+++ /dev/null
@@ -1,40 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input1))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let varTuple (VariantType (TupleType
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-)))
-
-(let data (Map data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res
-        (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-            (Variant item '0 varTuple)
-            (Variant item '1 varTuple)
-        )
-    )
-   (return res)
-)))))
-
-(let dataTuple (Demux data))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output1))) (Nth dataTuple '0) '('('mode 'renew))))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) (Nth dataTuple '1) '('('mode 'renew))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/default.cfg b/yql/essentials/tests/s-expressions/suites/MultiIO/default.cfg
deleted file mode 100644
index d01d69e755..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/default.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input1 input1.txt
-in Input2 input2.txt
-out Output1 output1.txt
-out Output2 output2.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/input1.txt b/yql/essentials/tests/s-expressions/suites/MultiIO/input1.txt
deleted file mode 100644
index b214aab0d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/input1.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{"key"="023";"subkey"="3";"value"="aaa"};
-{"key"="037";"subkey"="5";"value"="ddd"};
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="150";"subkey"="1";"value"="aaa"};
-{"key"="150";"subkey"="3";"value"="iii"};
-{"key"="150";"subkey"="8";"value"="zzz"};
-{"key"="200";"subkey"="7";"value"="qqq"};
-{"key"="527";"subkey"="4";"value"="bbb"};
-{"key"="761";"subkey"="6";"value"="ccc"};
-{"key"="911";"subkey"="2";"value"="kkk"};
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/MultiIO/input1.txt.attr
deleted file mode 100644
index ed13e20223..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/input1.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{"_yql_row_spec"={
-    "Type"=["StructType";[
-        ["key";["DataType";"String"]];
-        ["subkey";["DataType";"String"]];
-        ["value";["DataType";"String"]]
-    ]];
-    "SortDirections"=[1;1;];
-    "SortedBy"=["key";"subkey";];
-    "SortedByTypes"=[["DataType";"String";];["DataType";"String";];];
-    "SortMembers"=["key";"subkey";];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/input2.txt b/yql/essentials/tests/s-expressions/suites/MultiIO/input2.txt
deleted file mode 100644
index 07af3b4647..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="2";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="2";"value"="q"};
-{"key"="150";"subkey"="2";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/MultiIO/input2.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.cfg
deleted file mode 100644
index 27b6ab6bec..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 inputUnion1.txt
-in Input2 inputUnion2.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.yqls
deleted file mode 100644
index 8e505aedfc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input1"))) (Void) '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input2"))) (Void) '()))
-  (let world (Left! x))
-  (let table2 (Right! x))
-  (let u (UnionAll table1 table2))
-  (let output (Aggregate u '() '('('Min0 (Apply (bind aggregate_module '"min_traits_factory") (TypeOf u) (lambda '(row) (Member row '"age")))))))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.cfg
deleted file mode 100644
index 6f99339756..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.yqls
deleted file mode 100644
index 0886d5c7a9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.yqls
+++ /dev/null
@@ -1,111 +0,0 @@
-#USE plato;
-#
-#$sample = (SELECT a.key as key, a.value as value FROM Input as a Join Input as b ON a.key = b.key);
-#
-#select key, count(*) from $sample group by key;
-#select value, count(*) from $sample group by value;
-
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (EquiJoin '(table0 '"a") '(table0 '"b") '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key") '()) '()))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"a.key")))
-            (let res (AddMember res '"value" (Member row '"a.value")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (block '(
-        (let Count2_create (lambda '(row) (Uint64 '1)))
-        (let Count2_update (lambda '(row state) (OptionalReduce state (Uint64 '1) (lambda '(a b) (+ a b)))))
-        (let Count2_save (lambda '(state) state))
-        (let Count2_load (lambda '(item) item))
-        (let Count2_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count2_finish (lambda '(state) state))
-        (return (Aggregate core '('"key") '('('Count2 (AggregationTraits (ListItemType (TypeOf core)) Count2_create Count2_update Count2_save Count2_load Count2_merge Count2_finish (Uint64 '0))))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AddMember res '"column1" (Member row 'Count2)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (let core (Sort core (Bool 'true) (lambda '(row) (Member row '"key"))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key" '"column1")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key" '"value") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core (EquiJoin '(table0 '"a") '(table0 '"b") '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key") '()) '()))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"a.key")))
-            (let res (AddMember res '"value" (Member row '"a.value")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (block '(
-        (let Count4_create (lambda '(row) (Uint64 '1)))
-        (let Count4_update (lambda '(row state) (OptionalReduce state (Uint64 '1) (lambda '(a b) (+ a b)))))
-        (let Count4_save (lambda '(state) state))
-        (let Count4_load (lambda '(item) item))
-        (let Count4_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count4_finish (lambda '(state) state))
-        (return (Aggregate core '('"value") '('('Count4 (AggregationTraits (ListItemType (TypeOf core)) Count4_create Count4_update Count4_save Count4_load Count4_merge Count4_finish (Uint64 '0))))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"value" (Member row '"value")))
-        (let res (AddMember res '"column1" (Member row 'Count4)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (let core (Sort core (Bool 'true) (lambda '(row) (Member row '"value"))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"value" '"column1")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.cfg
deleted file mode 100644
index 6f99339756..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.yqls
deleted file mode 100644
index 9918cc7770..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.yqls
+++ /dev/null
@@ -1,87 +0,0 @@
-#USE plato;
-#
-#$sample = (SELECT a.key as key, a.value as value FROM Input as a Join Input as b ON a.key = b.key);
-#
-#select * from $sample as x left join Input as y using (key);
-#select * from $sample as x right join Input as y using (value);
-
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '((block '(
-        (let select (block '(
-          (let core (EquiJoin '(table0 '"a") '(table0 '"b") '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key") '()) '()))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"a.key")))
-            (let res (AddMember res '"value" (Member row '"a.value")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"x") '(table0 '"y") '('Left '"x" '"y" '('"x" '"key") '('"y" '"key") '()) '()))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select '((Bool 'true) (Bool 'true) (Bool 'true)) (lambda '(row) '((Member row '"x.key") (Member row '"x.value") (Member row '"y.key")))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '((block '(
-        (let select (block '(
-          (let core (EquiJoin '(table0 '"a") '(table0 '"b") '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key") '()) '()))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Member row '"a.key")))
-            (let res (AddMember res '"value" (Member row '"a.value")))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"x") '(table0 '"y") '('Right '"x" '"y" '('"x" '"value") '('"y" '"value") '()) '()))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select '((Bool 'true) (Bool 'true) (Bool 'true)) (lambda '(row) '((Member row '"x.key") (Member row '"x.value") (Member row '"y.key")))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yqls
index fe707cfe07..f99b17a7bc 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.cfg
deleted file mode 100644
index de97bde764..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input4.txt
-out Output output.txt
-res result.txt
-
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.yqls
deleted file mode 100644
index 7c3615fa7f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let keySwitch (lambda '(key item) (IsKeySwitch key item (lambda '(k) k) keySelector)))
-(let listHandler (lambda '(key stream) (ToStream (Just (AsStruct '('KEY key))))))
-(let reducedTable (Chopper (ToStream table1) keySelector keySwitch listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CloneStructure.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CloneStructure.yqls
deleted file mode 100644
index e2e95e299b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CloneStructure.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table2 (Map table1 (lambda '(x) (block '(
-   (let s (Struct))
-   (let s (AddMember s 'value (Member x 'value)))
-   (let s (AddMember s 'subkey (Member x 'subkey)))   
-   (let s (AddMember s 'key (Member x 'key)))   
-   (return s)
-)))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table2 '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yqls
index 5d034dfec2..d7f945f177 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Coalesce (Just (Int32 '1)) (Int32 '2)))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yqls
index efbc67ef1b..b905e42f78 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Coalesce (Nothing (OptionalType (DataType 'Int32))) (Int32 '2)))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yqls
index 1d290a7ef7..c21c860853 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let optBool1 (== (Int32 '0) (/ (Int32 '1) (Int32 '2))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yqls
index 1d48368834..b5478b0a31 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let optBool (SafeCast (/ (Int32 '1) (Int32 '0)) (OptionalType (DataType 'Bool))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yqls
index 9e382837fc..cd840e6767 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let optBool1 (== (Int32 '0) (/ (Int32 '3) (Int32 '2))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yqls
index ef949a7afb..802698baa5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Condense1 list
@@ -18,7 +17,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yqls
index 1044367186..8b9bc30234 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Condense1 list
@@ -13,7 +12,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yqls
index 1d24deecd5..c6c1968ba5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Condense list (AddMember (Struct) 'z (String '"")) 
@@ -13,7 +12,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yqls
index d638ca1fef..2693aea423 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let s (String '""))
@@ -12,7 +11,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yqls
index ca92c5573e..ce825028d2 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (String 'a) (String 'b) (String 'c)))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yqls
index 5d213f0f5a..c415b5a48f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (String 'a) (String 'b) (String 'c)))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yqls
index 06d8d1ee2e..d0f2bd9cb4 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (String 'a) (String 'b) (String 'c)))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yqls
index dbb25f37ee..838cc08780 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (String 'a) (String 'b) (String 'c)))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yqls
index 37b6fe207e..ba4349f21c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import id_module '"/lib/yql/id.yql")
 (let id (bind id_module 'id))
@@ -27,4 +26,4 @@
 (let world (Commit! world res_sink))
 (return world)
 
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.cfg
deleted file mode 100644
index 96364ca2c5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input inputDistinctKey.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.yqls
deleted file mode 100644
index 6d0405e562..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table1)
-      (let core (block '(
-        (let Count0_create (lambda '(row) (AggrCountInit row)))
-        (let Count0_update (lambda '(row state) (AggrCountUpdate row state)))
-        (let Count0_save (lambda '(state) state))
-        (let Count0_load (lambda '(item) item))
-        (let Count0_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count0_finish (lambda '(state) state))
-        (return (Aggregate core '() '('('Count0 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"key") Count0_create Count0_update Count0_save Count0_load Count0_merge Count0_finish (Uint64 '0)) '"key"))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" (Member row 'Count0)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.cfg
deleted file mode 100644
index 96364ca2c5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input inputDistinctKey.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.yqls
deleted file mode 100644
index ebd34f15ed..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.yqls
+++ /dev/null
@@ -1,53 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (Struct))
-            (let res (AddMember res '"key" (Cast (Member row '"key") 'Int32)))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (block '(
-        (let Count1_create (lambda '(row) (AggrCountInit row)))
-        (let Count1_update (lambda '(row state) (AggrCountUpdate row state)))
-        (let Count1_save (lambda '(state) state))
-        (let Count1_load (lambda '(item) item))
-        (let Count1_merge (lambda '(a b) (OptionalReduce a b (lambda '(a b) (+ a b)))))
-        (let Count1_finish (lambda '(state) state))
-        (return (Aggregate core '() '('('Count1 (AggregationTraits (StructMemberType (ListItemType (TypeOf core)) '"key") Count1_create Count1_update Count1_save Count1_load Count1_merge Count1_finish (Uint64 '0)) '"key"))))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" (Member row 'Count1)))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.cfg
deleted file mode 100644
index b8c8b850ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.yqls
deleted file mode 100644
index d1a2b6f1e2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Write! world $1 (Key) (Unordered (EnsurePersistable (OrderedFlatMap (OrderedFilter (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())) (lambda '($3) (Coalesce
-    (Or
-        (Or
-            (And (== (Member $3 '"key") (String '"911")) (== (Member $3 '"value") (String '"kkk"))) 
-            (And (And (== (String '"911") (Member $3 '"key")) (== (String '"xyz") (Member $3 '"value"))) (== (Member $3 '"subkey") (String '"3")))
-        )
-        (Or 
-            (And (== (String '"911") (Member $3 '"key")) (== (String '"xyz") (Member $3 '"value")))
-            (And (== (String '"911") (Member $3 '"key")) (== (String '"aaa") (Member $3 '"value")))
-        )
-    )
-(Bool 'false)))) (lambda '($4) (AsList $4))))) '('('type) '('autoref))))
-(return (CommitAll! (Commit! $2 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.cfg
deleted file mode 100644
index b8c8b850ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.yqls
deleted file mode 100644
index 0271673f55..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Write! world $1 (Key) (Unordered (EnsurePersistable (OrderedFlatMap (OrderedFilter (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())) (lambda '($3) (Coalesce
-    (And
-        (And
-            (Or (== (Member $3 '"key") (String '"075")) (== (Member $3 '"subkey") (String '"4")))
-            (Or (== (String '"075") (Member $3 '"key")) (== (String '"xyz") (Member $3 '"value")))
-        )
-        (Or
-            (Or (== (String '"075") (Member $3 '"key")) (== (Member $3 '"value") (String '"xyz")))
-            (== (Member $3 '"key") (String '"200"))
-        )
-    )
-(Bool 'false)))) (lambda '($4) (AsList $4))))) '('('type) '('autoref))))
-(return (CommitAll! (Commit! $2 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DemuxOverExtend.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/DemuxOverExtend.yqls
deleted file mode 100644
index b8eba4c967..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DemuxOverExtend.yqls
+++ /dev/null
@@ -1,57 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-
-(let x (Read! world mr_source (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let data (Right! x))
-
-(let varTuple (VariantType (TupleType
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-    (StructType
-        '('key (DataType 'String))
-        '('subkey (DataType 'String))
-        '('value (DataType 'String))
-    )
-)))
-
-(let varData1 (Map data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let res
-        (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-            (Variant item '0 varTuple)
-            (Variant item '1 varTuple)
-        )
-    )
-   (return res)
-)))))
-
-(let varData2 (Map data (lambda '(item) (block '(
-    (let intValue (FromString (Member item 'key) 'Int32))
-    (let intValue (+ intValue (Int32 '1)))
-    (let res
-        (If (Coalesce (Equal (% intValue (Int32 '2)) (Int32 '0)) (Bool 'false))
-            (Variant item '0 varTuple)
-            (Variant item '1 varTuple)
-        )
-    )
-   (return res)
-)))))
-
-(let dataTuple (Demux (Extend varData1 varData2)))
-
-(let data1 (Nth dataTuple '0))
-(let data2 (Nth dataTuple '1))
-
-(let data1 (Filter data1 (lambda '(item) (Less (Member item 'key) (String '200)))))
-
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data1 '('('mode 'renew))))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data2 '('('mode 'append))))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yqls
index cd9fa2787f..33caec67ca 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yqls
@@ -1,13 +1,12 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'c) (String 'e) (String 'a)))
 (let data (Sort data (Bool 'true) (lambda '(x) x)))
 (let data (Sort data (Bool 'true) (lambda '(x) x)))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yqls
index d78e05c61f..71d41bef81 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 #comment
 (let res_sink (DataSink 'result))
@@ -29,7 +28,7 @@
 (let sep (If predicate (Just (String '_)) (Just (String '+))))
 (let data1 (IfPresent sep outLambda1 (AsList (String 'none))))
 (let data2 (IfPresent sep anotherLambda (AsList (String 'none))))
-(let world (Write! world res_sink (Key) '(data1 data2) '()))
+(let world (Write! world res_sink (Key) '(data1 data2) '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yqls
index 792976bc37..959d418266 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yqls
@@ -1,14 +1,13 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'a) (String 'a)))
 (let data1 (Map data (lambda '(x) (Concat x (Concat (String '_) (String '_))))))
 (let data2 (Map data (lambda '(y) (Concat y (Concat (String '_) (String '_))))))
 (let data (Extend data1 data2))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yqls
index 2c5734f703..2d715c9876 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let outLambda (lambda '(sep) (block '(
@@ -14,7 +13,7 @@
 (let predicate (== (Int32 '1) (Int32 '2)))
 (let sep (If predicate (Just (String '_)) (Just (String '+))))
 (let data (IfPresent sep outLambda (AsList (String 'none))))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yqls
index caa3cca763..4da4a466e6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let outLambda1 (lambda '(sep) (block '(
@@ -28,7 +27,7 @@
 (let sep (If predicate (Just (String '_)) (Just (String '+))))
 (let data1 (IfPresent sep outLambda1 (AsList (String 'none))))
 (let data2 (IfPresent sep anotherLambda (AsList (String 'none))))
-(let world (Write! world res_sink (Key) '(data1 data2) '()))
+(let world (Write! world res_sink (Key) '(data1 data2) '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yqls
index 810324b0dd..ba459408d1 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let outLambda1 (lambda '(sep) (block '(
@@ -22,7 +21,7 @@
 (let sep (If predicate (Just (String '_)) (Just (String '+))))
 (let data1 (IfPresent sep outLambda1 (AsList (String 'none))))
 (let data2 (IfPresent sep outLambda2 (AsList (String 'none))))
-(let world (Write! world res_sink (Key) '(data1 data2) '()))
+(let world (Write! world res_sink (Key) '(data1 data2) '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yqls
index 5da1b36ee1..39a4536754 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let predicate (== (Int32 '1) (Int32 '2)))
@@ -12,7 +11,7 @@
 ))))
 (let sep (If predicate (Just (String '_)) (Just (String '+))))
 (let data (IfPresent sep outLambda (AsList (String 'none))))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yqls
index 3f76dd440f..f30bde4a90 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yqls
@@ -1,14 +1,13 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'a) (String 'a)))
 (let data1 (Map data (lambda '(x) (Concat x (Concat (String 'l1) (String 'l2))))))
 (let data2 (Map data (lambda '(y) (Concat y (Concat (String 'l2) (String 'l1))))))
 (let data (Extend data1 data2))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yqls
index 69ede42271..b879af835b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let func (lambda '() (AsStruct '('a (String '1)) '('b (Int32 '2)))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapExchange.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapExchange.yqls
deleted file mode 100644
index 0ff086d5c7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapExchange.yqls
+++ /dev/null
@@ -1,29 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let table2 (Skip table1 (Uint32 '1)))
-  (let duplicate (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AsList row row))
-        (return res)
-  ))))
-  (let ttable1 (FlatMap table1 duplicate))
-  (let ttable2 (FlatMap table2 duplicate))
-  (let extend (Extend ttable1 ttable2))
-  (let output (Filter extend (lambda '(row) (< (Member row '"key") (String '500)))))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapOptimizeTablePath.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapOptimizeTablePath.yqls
deleted file mode 100644
index ac8743eeca..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapOptimizeTablePath.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_sync (DataSink 'result))
-(let mr_source (DataSource '"yt" '"plato"))
-(let lambda (lambda '(item) (block '(
-  (return (AsList (AsStruct '('"path" (TablePath (DependsOn item))))))
-))))
-(let res (Extend
-  (FlatMap (Right! (Read! world mr_source (Key '('table (String '"Input"))) '() '())) lambda)
-  (FlatMap (Right! (Read! world mr_source (Key '('table (String '"Input"))) '() '())) lambda)
-  (FlatMap (Extend
-    (Right! (Read! world mr_source (Key '('table (String '"Input"))) '() '()))) (lambda '(item) (block '(
-      (return (AsList (AsStruct '('"path" (String '"Special")))))
-))))))
-(let world (ResWrite! world mr_sync (Key) res '('('type) '('autoref) '('columns '('"path")))))
-(return (Commit! (Commit! world mr_sync) (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendTableWithLiteral.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendTableWithLiteral.yqls
deleted file mode 100644
index 296bdafd03..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendTableWithLiteral.yqls
+++ /dev/null
@@ -1,80 +0,0 @@
-#use plato;
-#
-#SELECT * FROM Input
-#UNION ALL
-#SELECT 2 AS y;
-#
-#SELECT 1 AS x
-#UNION ALL
-#SELECT * FROM Input;
-
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (UnionAll (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )) (block '(
-      (let core (AsList (Void)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"y" (Int64 '"2")))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    ))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (UnionAll (block '(
-      (let core (AsList (Void)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"x" (Int64 '"1")))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )) (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    ))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.cfg
deleted file mode 100644
index 80d5638bff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.sql
deleted file mode 100644
index 371846c584..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-USE plato;
-
--- Should not generate single MrFill for all content
-INSERT INTO Output
-SELECT * from(
-    select key, sum(cast(subkey as Uint32)) as value
-    from Input group by key
-
-    union all
-
-    select "" as key, sum(cast(subkey as Uint32)) as value
-    from Input-- group by key
-);
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.yqls
deleted file mode 100644
index 255cd0f32c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.yqls
+++ /dev/null
@@ -1,56 +0,0 @@
-(
-# Should not generate single MrFill for all content
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '()))
-  (let world (Left! x))
-  (let table2 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core (UnionAll (block '(
-        (let select (block '(
-          (let core table2)
-          (let core (Aggregate core '('"key") '('('Sum0 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Cast (Member row '"subkey") 'Uint32)))))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"key" (Member row '"key")) '('"value" (Member row 'Sum0))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) (block '(
-        (let select (block '(
-          (let core table2)
-          (let core (Aggregate core '() '('('Sum1 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Cast (Member row '"subkey") 'Uint32)))))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"key" (String '"")) '('"value" (Member row 'Sum1))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      ))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'append))))
-    (return world)
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.cfg
deleted file mode 100644
index 807ada95e2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 input.txt
-in Input2 input2.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.yqls
deleted file mode 100644
index b9ed62442c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.yqls
+++ /dev/null
@@ -1,48 +0,0 @@
-#USE plato;
-#select table, count(*) from
-#    (select TablePath() as table from CONCAT([Input],[Input])) group by table;
-    
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input1"))) (Key '('table (String '"Input2")))) '() '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"table" (TablePath (DependsOn row)))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (Aggregate core '('"table") '('('Count1 (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (Void)))))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"table" (Member row '"table")) '('"column1" (Member row 'Count1))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"table" '"column1")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.cfg
deleted file mode 100644
index 807ada95e2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 input.txt
-in Input2 input2.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.yqls
deleted file mode 100644
index d775d38829..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x1 (Read! world mr_source (Key '('table (String 'Input1))) '('key 'subkey 'value) '()))
-(let x2 (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x1))
-(let table1 (RemoveSystemMembers (Right! x1)))
-(let table2 (RemoveSystemMembers (Right! x2)))
-
-(let joinType '('LeftOnly '"t" '"d" '('"t" '"key") '('"d" '"key") '()))
-(let $67 '('"rename" '"t.key" '"key"))
-(let $68 '('"rename" '"t.subkey" '"subkey"))
-(let $69 '('"rename" '"t.value" '"value"))
-(let rename '($67 $68 $69))
-
-(let join (EquiJoin '(table1 '"t") '((FlatMap (Extend (ExtractMembers table1 '('"key")) (ExtractMembers table2 '('"key"))) (lambda '($159) (Just (AsStruct '('"key" (Member $159 '"key")))))) '"d") joinType rename))
-(let out (Extend table1 table2 join))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) out '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.cfg
deleted file mode 100644
index 6f99339756..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.yqls
deleted file mode 100644
index 08083fbc54..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let join (EquiJoin '(table 'a) '(table 'b) '('Inner '"a" '"b" '('"a" '"key") '('"b" '"value" ) '()) '()))
-(let join (ExtractMembers join '('a.key 'b.value)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) join '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverRead.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverRead.yqls
deleted file mode 100644
index e5bccc409e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverRead.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (ExtractMembers table1 '('key 'value)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table1 '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yqls
index 0a63ce0c2c..b41685903f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yqls
@@ -1,7 +1,6 @@
 (
 # read data from Input table
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
@@ -15,22 +14,22 @@
 (let cond (>= (RandomNumber) (Uint64 '0)))
 
 (let res (FlatMap (OptionalIf cond str1) (lambda '(r) (OptionalIf (>= (Member r 'b) (String 'a)) r))))
-(let world (Write! world res_sink (Key) res '()))
+(let world (Write! world res_sink (Key) res '('('type))))
 
 (let res (FlatMap (OptionalIf cond str1) (lambda '(r) (AsList r r))))
-(let world (Write! world res_sink (Key) res '()))
+(let world (Write! world res_sink (Key) res '('('type))))
 
 (let res (FlatMap (OptionalIf cond str1) (lambda '(r) (ToStream (Just r) (DependsOn r)))))
-(let world (Write! world res_sink (Key) (ForwardList res) '()))
+(let world (Write! world res_sink (Key) (ForwardList res) '('('type))))
 
 (let res (FlatMap (ListIf cond str1) (lambda '(r) (OptionalIf (>= (Member r 'b) (String 'a)) r))))
-(let world (Write! world res_sink (Key) res '()))
+(let world (Write! world res_sink (Key) res '('('type))))
 
 (let res (FlatMap (ListIf cond str1) (lambda '(r) (AsList r r))))
-(let world (Write! world res_sink (Key) res '()))
+(let world (Write! world res_sink (Key) res '('('type))))
 
 (let res (FlatMap (ListIf cond str1) (lambda '(r) (ToStream (Just r) (DependsOn r)))))
-(let world (Write! world res_sink (Key) res '()))
+(let world (Write! world res_sink (Key) res '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.cfg
deleted file mode 100644
index fa5e600b39..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input typed_table.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.yqls
deleted file mode 100644
index 66cc2c0b67..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.yqls
+++ /dev/null
@@ -1,38 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")) '('view (String '"opt_struct")))) '('"b") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (FlattenByColumns row '('b 'bb)))
-        (return res)
-      )))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"bb" (Member row '"bb")))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"bb")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yqls
index abfdcb837a..df6ff8f33f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'a) (String 'a) (String 'b)))
@@ -13,7 +12,7 @@
 (let combined (CombineByKey data preMap keyExtractor init update finish))
 (let map (Map combined (lambda '(x) (Nth x '1))))
 (let result (Sort map (Bool 'true) (lambda '(x) x)))
-(let world (Write! world res_sink (Key) result '()))
+(let world (Write! world res_sink (Key) result '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yqls
index 62ab06b3ec..3cdd03521f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList 
@@ -12,7 +11,7 @@
 (let filtered (FilterNullMembers data '('data)))
 (let map (Map filtered (lambda '(x) '(x x))))
 (let result (Sort map (Bool 'true) (lambda '(x) (Member (Nth x '0) 'data))))
-(let world (Write! world res_sink (Key) result '()))
+(let world (Write! world res_sink (Key) result '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yqls
index aa7b1d874a..c72e4976e9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'a) (String 'a) (String 'b) (String 'c)))
@@ -13,7 +12,7 @@
 (let map (Filter data (lambda '(x) (< x (String 'c)))))
 (let combined (CombineByKey map preMap keyExtractor init update finish))
 (let result (Sort combined (Bool 'true) (lambda '(x) (Nth x '0))))
-(let world (Write! world res_sink (Key) result '()))
+(let world (Write! world res_sink (Key) result '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapToExtractMembers.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapToExtractMembers.yqls
deleted file mode 100644
index b0dfbcde05..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapToExtractMembers.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
-(let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
-(let list1 (AsList str1 str2))
-
-(let res1 (FlatMap list1 (lambda '(item) (block '(
-   (let ret (Just (AsStruct '('a (Member item 'a)) '('c (Member item 'c)))))
-   (return ret)
-)))))
-
-(let res2 (FlatMap list1 (lambda '(item) (block '(
-   (let ret (Just (AsStruct '('b (Member item 'b)) '('k (Member item 'c)))))
-   (return ret)
-)))))
-
-(let res3 (FlatMap list1 (lambda '(item) (block '(
-   (let ret (Just (AsStruct)))
-   (return ret)
-)))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) res1 '('('type))))
-(let world (Write! world res_sink (Key) res2 '('('type))))
-(let world (Write! world res_sink (Key) res3 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yqls
index 855ec4454f..63b1f39105 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let structType (StructType '('key (DataType 'String)) '('value (DataType 'String))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yqls
index a32571a772..8736c4ba8f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold1 list
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yqls
index f173ae96ab..51ec11d83c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold1 list
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yqls
index a9b8d1e1ee..ca0372d35f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yqls
@@ -1,13 +1,12 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold1 list (lambda '(item) (Struct)) (lambda '(item state) state)))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yqls
index e6be656d48..5110a1b70d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yqls
@@ -1,13 +1,12 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold1 list (lambda '(item) '()) (lambda '(item state) state)))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yqls
index 47cda00536..b63f22175a 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold1 list
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yqls
index 5077ac27e4..52744811b6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold1 list
@@ -17,7 +16,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yqls
index 0f6615de39..52c083f690 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold1 list
@@ -12,7 +11,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yqls
index c4ac775064..33acbaade5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (Just (String 'a)))
 (let data (Fold1 list 
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yqls
index cc2d3f5d62..fe37ca8af6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold list
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yqls
index d7f3bc98b5..00b54a587d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold list
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yqls
index c170ea2fc0..5e0b734d5b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yqls
@@ -1,13 +1,12 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold list (Struct) (lambda '(item state) state)))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yqls
index 73ac847631..a7fb3069b8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yqls
@@ -1,13 +1,12 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold list '() (lambda '(item state) state)))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yqls
index 758cd43bf4..feafef43b7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yqls
@@ -1,13 +1,12 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold list (Uint32 '0) (lambda '(item state) (+ state (Uint32 '1)))))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yqls
index 12014ead02..f175051e6a 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let data (Fold list (AddMember (Struct) 'z (String '"")) 
@@ -12,7 +11,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yqls
index ccada97695..8e504d88e7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let s (String '""))
@@ -11,7 +10,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yqls
index 8d267ce890..95daa6fbd6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yqls
index 57c81db622..84c02978e9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapsWithDependsOn.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapsWithDependsOn.yqls
deleted file mode 100644
index 0553caa8fd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapsWithDependsOn.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let res_sink (DataSink 'result))
-
-(let list (AsList (String 'a) (String 'b) (String 'c)))
-
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-
-(let inner1 (FlatMap table (lambda '(row) (OptionalIf (> (Member row 'key) (String '100)) (AsStruct '('key1 (Member row 'key)))))))
-
-(let inner2 (FlatMap table (lambda '(row) (Just (AsStruct '('key1 (Member row 'key)))))))
-
-(let outer (lambda '(input) (FlatMap input (lambda '(row)
-    (Just
-        (AsStruct
-            '('key (Member row 'key1))
-            '('value (ToOptional (Collect (Condense
-                (Iterator list (DependsOn row))
-                (String '"")
-                (lambda '(item state) (Bool 'False))
-                (lambda '(item state) (Concat state item))
-            ))))
-        )
-    )
-))))
-
-
-(let world (Write! world res_sink (Key) (Apply outer inner1) '('('type))))
-(let world (Write! world res_sink (Key) (Apply outer inner2) '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yqls
index 9a0a42e1f3..3c9c59243c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yqls
@@ -3,8 +3,6 @@
 (let config (DataSource 'config))
 (let res_sink (DataSink 'result))
 
-(let world (Configure! world config 'PureDataSource 'yt))
-
 (let vt (VariantType (TupleType (DataType 'String) (DataType 'String) (DataType 'String))))
 (let v0 (Variant (String 'aaa) '0 vt))
 (let v1 (Variant (String 'bbb) '1 vt))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yqls
index 3a7375371f..c57ceffb80 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yqls
@@ -1,7 +1,6 @@
 (
 # read data from Input table
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.cfg
deleted file mode 100644
index d575d2a0c9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf python3_udf
-providers yt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.sql
deleted file mode 100644
index 71ad92d19d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-USE plato;
-
-$a = (SELECT
-    skey,count(*) as cnt
-FROM Input
-GROUP BY Length(key) as skey);
-
-$udfScript = @@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@;
-
-$udf = Python::f(@@
-(Stream<Struct<skey:Uint32,cnt:Uint64>>,Int32)
-->
-Stream<Struct<skey:Uint32,cnt:Uint64,pass:Int32>>
-@@, $udfScript);
-
-$udf2 = Python::f(@@
-(Stream<Struct<skey:Uint32,cnt:Uint64,pass:Int32>>,Int32)
-->
-Stream<Struct<skey:Uint32,cnt:Uint64,pass:Int32>>
-@@, $udfScript);
-
-
-$b = (PROCESS $a USING $udf($ROWS,1));
-
-PROCESS $b USING $udf2($ROWS,2);
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yqls
deleted file mode 100644
index f13b475acb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yqls
+++ /dev/null
@@ -1,82 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let inputRowsList (block '(
-        (let select (block '(
-          (let inputRowsList (block '(
-            (let select (block '(
-              (let core table1)
-              (let core (FlatMap core (lambda '(row) (AsList (AsStruct '('"key" (Member row '"key")) '('"skey" ("Size" (Member row '"key"))))))))
-              (let core (Aggregate core '('"skey") '('('Count0 (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (Void)))))))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (AsStruct '('"skey" (Member row '"skey")) '('"cnt" (Member row 'Count0))))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )))
-          (let core (LMap inputRowsList (lambda '(x) (block '(
-            (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@))) '0))
-            (let inputRowsList (MatchType inputType 'List (lambda '(y) (ForwardList x)) (lambda '(y) "x")))
-            (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@)) inputRowsList (Int32 '"1")))
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (LMap inputRowsList (lambda '(x) (block '(
-        (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@))) '0))
-        (let inputRowsList (MatchType inputType 'List (lambda '(y) (ForwardList x)) (lambda '(y) "x")))
-        (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@)) inputRowsList (Int32 '"2")))
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.cfg
deleted file mode 100644
index d575d2a0c9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf python3_udf
-providers yt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.sql
deleted file mode 100644
index e15ee6feeb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-USE plato;
-
-$a = (SELECT
-    skey,count(*) as cnt
-FROM Input
-GROUP BY Length(key) as skey);
-
-$udfScript = @@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@;
-
-$udf = Python::f(@@
-(Stream<Struct<skey:Uint32,cnt:Uint64>>,Int32)
-->
-Stream<Struct<skey:Uint32,cnt:Uint64,pass:Int32>>
-@@, $udfScript);
-
-
-PROCESS $a USING $udf($ROWS,1);
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yqls
deleted file mode 100644
index ececae209f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yqls
+++ /dev/null
@@ -1,59 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let inputRowsList (block '(
-        (let select (block '(
-          (let core table1)
-          (let core (FlatMap core (lambda '(row) (AsList (AsStruct '('"key" (Member row '"key")) '('"skey" ("Size" (Member row '"key"))))))))
-          (let core (Aggregate core '('"skey") '('('Count0 (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (Void)))))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"skey" (Member row '"skey")) '('"cnt" (Member row 'Count0))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (LMap inputRowsList (lambda '(x) (block '(
-        (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@))) '0))
-        (let inputRowsList (MatchType inputType 'List (lambda '(y) (ForwardList x)) (lambda '(y) "x")))
-        (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-@@)) inputRowsList (Int32 '"1")))
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.cfg
deleted file mode 100644
index d575d2a0c9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf python3_udf
-providers yt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.sql
deleted file mode 100644
index d3690a17e4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-USE plato;
-
-$a = (SELECT
-    skey,count(*) as cnt
-FROM Input
-GROUP BY Length(key) as skey);
-
-$udfScript = @@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-      
-def f2(a,b,c):
-   return {"a":a,"b":b,"c":c}
-@@;
-
-$udf = Python::f(@@
-(Stream<Struct<skey:Uint32,cnt:Uint64>>,Int32)
-->
-Stream<Struct<skey:Uint32,cnt:Uint64,pass:Int32>>
-@@, $udfScript);
-
-$udf2 = Python::f2(@@
-(skey:Uint32,cnt:Uint64,pass:Int32)->Struct<a:Uint32,b:Uint64,c:Int32>
-@@, $udfScript);
-
-
-$b = (PROCESS $a USING $udf($ROWS,1));
-
-PROCESS $b USING $udf2(skey,cnt,pass);
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yqls
deleted file mode 100644
index 5c8d854eca..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yqls
+++ /dev/null
@@ -1,85 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key") '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let inputRowsList (block '(
-            (let select (block '(
-              (let core table1)
-              (let core (FlatMap core (lambda '(row) (AsList (AsStruct '('"key" (Member row '"key")) '('"skey" ("Size" (Member row '"key"))))))))
-              (let core (Aggregate core '('"skey") '('('Count0 (Apply (bind aggregate_module '"count_traits_factory") (TypeOf core) (lambda '(row) (Void)))))))
-              (let core (FlatMap core (lambda '(row) (block '(
-                (let res (AsStruct '('"skey" (Member row '"skey")) '('"cnt" (Member row 'Count0))))
-                (let res (AsList res))
-                (return res)
-              )))))
-              (return core)
-            )))
-            (return select)
-          )))
-          (let core (LMap inputRowsList (lambda '(x) (block '(
-            (let inputType (CallableArgumentType (TypeOf (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-
-def f2(a,b,c):
-   return {"a":a,"b":b,"c":c}
-@@))) '0))
-            (let inputRowsList (MatchType inputType 'List (lambda '(y) (ForwardList x)) (lambda '(y) "x")))
-            (return (Apply (ScriptUdf 'Python3 '"f" (CallableType '() '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"pass" (DataType 'Int32)) '('"skey" (DataType 'Uint32))))) '((StreamType (StructType '('"cnt" (DataType 'Uint64)) '('"skey" (DataType 'Uint32))))) '((DataType 'Int32))) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-
-def f2(a,b,c):
-   return {"a":a,"b":b,"c":c}
-@@)) inputRowsList (Int32 '"1")))
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Apply (ScriptUdf 'Python3 '"f2" (CallableType '() '((StructType '('"a" (DataType 'Uint32)) '('"b" (DataType 'Uint64)) '('"c" (DataType 'Int32)))) '((DataType 'Uint32) 'skey) '((DataType 'Uint64) 'cnt) '((DataType 'Int32) 'pass)) (String '@@
-def f(input,x):
-   for i in list(input):
-      d = {name: getattr(i, name) for name in i.__class__.__match_args__}
-      d["pass"] = x
-      yield d
-
-def f2(a,b,c):
-   return {"a":a,"b":b,"c":c}
-@@)) (Member row '"skey") (Member row '"cnt") (Member row '"pass")))
-        (let res (MatchType res 'Optional (lambda '(opt) (ToList opt)) (lambda '(val) (MatchType val 'List (lambda '(list) list) (lambda '(item) (AsList item))))))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yqls
index 6241a465a7..4d44e4981f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList
@@ -13,7 +12,7 @@
 (let one (OrderedFlatMap data (lambda '(x) (AsList x (AsStruct '('data (String 'z)))))))
 (let two (OrderedFlatMap one (lambda '(x) (AsList (AsStruct '('data (String 'y))) x x))))
 (let three (OrderedFlatMap two (lambda '(x) (AsList x (AsStruct '('data (String 'x))) x))))
-(let world (Write! world res_sink (Key) three '()))
+(let world (Write! world res_sink (Key) three '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yqls
index 877db04e8b..ea4cbf671b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let keyExtractor (lambda '(x) (String '"@")))
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yqls
index 40045830d0..4252f75640 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list (AsList (String 'a) (String 'b) (String 'c)))
 (let keyExtractor (lambda '(x) (String '"@")))
@@ -9,7 +8,7 @@
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yqls
index eb78e634af..52e77fb946 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yqls
@@ -1,10 +1,9 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let data (HasItems (Enumerate (AsList (String 'a) (String 'b) (String 'c)))))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yqls
index 798f4b5825..9ac3f0e347 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yqls
@@ -1,11 +1,10 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (If (Not (ListHas (AsList (Uint32 '1)) (Uint32 '1))) (String 'a) (String 'b)))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yqls
index 2346c6fbe8..070e6929c0 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
 (let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
@@ -8,7 +7,7 @@
 (let list1 (Sort list1 (Bool 'true) (lambda '(row) (Member row 'a))))
 (let list1 (ExtractMembers list1 '('b)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yqls
index cefbe8d819..2bfd735c73 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (String 'a) (String 'b)))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/InputUniq.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/InputUniq.txt
deleted file mode 100644
index 95a39214c5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/InputUniq.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="023";"subkey"="3";"value"="aaa"};
-{"key"="037";"subkey"="5";"value"="ddd"};
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="150";"subkey"="8";"value"="zzz"};
-{"key"="200";"subkey"="7";"value"="qqq"};
-{"key"="527";"subkey"="4";"value"="bbb"};
-{"key"="761";"subkey"="6";"value"="ccc"};
-{"key"="911";"subkey"="2";"value"="kkk"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/InputUniq.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/InputUniq.txt.attr
deleted file mode 100644
index b10bf7c075..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/InputUniq.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-     "_yql_row_spec"={
-         "UniqueKeys"=%true;
-         "SortMembers"=["key"];
-         "SortedBy"=["key"];
-         "SortDirections"=[1];
-         "SortedByTypes"=[["DataType";"String"]];
-         "Type"=["StructType";[["key";["DataType";"String"]];["subkey";["DataType";"String"]];["value";["DataType";"String"]]]]
-     }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.cfg
deleted file mode 100644
index 9d65859cb9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-out Output output.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.yqls
deleted file mode 100644
index 5395d3e9f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let structType (StructType '('"key" (DataType 'String)) '('"subkey" (DataType 'String)) '('"value" (DataType 'String))))
-#comment
-(let udfType (CallableType '() '((StreamType structType)) '((StreamType structType))))
-(let script '@@
-def f(input):
-   for i in input:
-      yield {
-        'key': i.key,
-        'subkey': i.subkey,
-        'value': i.value
-      }
-@@)
-(let udf (ScriptUdf 'Python3 '"f" udfType (String script)))
-
-(let res (LMap (List (ListType structType)) (lambda '(stream) (block '(
-   (return (Apply udf stream))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) res '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yqls
index 1e36b20260..a72de074b2 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yqls
@@ -1,12 +1,11 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let data (Length (AsList (String 'a) (String 'b))))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yqls
index 3926c6303f..e0451e84d7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yqls
@@ -1,10 +1,9 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let data (Length (Enumerate (AsList (String 'a) (String 'b) (String 'c)))))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yqls
index 89e18df910..0ec614afc8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yqls
@@ -1,12 +1,11 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let data (Length (List (ListType (DataType 'String)) (String 'a) (String 'b))))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    data '()))
+    data '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterMap.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterMap.yqls
deleted file mode 100644
index 90563d41a3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterMap.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (Map table1 (lambda '(x) '(x (String 'qwe)))))
-(let table1len (Length table1))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table1len '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.cfg
deleted file mode 100644
index bf54cfd5be..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_tbl_content.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.yqls
deleted file mode 100644
index 1a1056aa00..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let r (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline))))
-    (let input (Right! r))
-    (let out (FlatMap input (lambda '(item) (block '(
-       (let len (Length input))
-       (let key (Member item 'key))
-       (let key (Coalesce (Cast key 'Uint64) (Uint64 '0)))
-       (return (ListIf (> key len) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.cfg
deleted file mode 100644
index bf54cfd5be..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_tbl_content.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.yqls
deleted file mode 100644
index ce4c782796..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let r (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline))))
-
-    (let out (FlatMap table1 (lambda '(item) (block '(
-       (let len (Length (Right! r)))
-       (let key (Member item 'key))
-       (let key (Coalesce (Cast key 'Uint64) (Uint64 '0)))
-       (return (ListIf (> key len) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yqls
index 06f26563b3..a9dd165da8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let lst (AsList (Int32 '0) (Int32 '1) (Int32 '2) (Int32 '3)))
 (let lst (Iterator lst))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.cfg
deleted file mode 100644
index a3547c5df6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input2.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.yqls
deleted file mode 100644
index 800f3c5a9e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.yqls
+++ /dev/null
@@ -1,37 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"value" '"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (Filter core (lambda '(row) (Coalesce ("<" (Member row '"value") (String '"f")) (Bool 'false)))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"key" (Member row '"key")))
-        (let res (AsList res))
-        (return res)
-)
-))))
-      (return core)
-)
-))
-    (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"key"))))
-    (let select (Take select (Uint64 '"2")))
-    (return select)
-)
-))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"key")))))
-    (let plato_sink (DataSink '"yt" '"plato"))
-    (let world (Commit! world plato_sink))
-    (return (Commit! world result_sink))
-)
-))
-  (return world)
-)
-))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yqls
index 6d4866a169..3b31e1b9ef 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let myStruct1 (AsStruct '('a (String 'z))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yqls
index af913733b0..c6b8050a51 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let myStruct (AsStruct '('a (String 'z)) '('b (Null))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yqls
index 94385fb383..7bcf43ea7e 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
 (let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
@@ -8,7 +7,7 @@
 (let list1 (Sort list1 (Bool 'true) (lambda '(row) (String 'const_key))))
 (let list1 (ExtractMembers list1 '('c)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yqls
index 48bd5bd276..f705ce5ae4 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (import id_module '"/lib/yql/id.yql")
 (let id (bind id_module 'id))
@@ -11,7 +10,7 @@
 (let list1 (Extend list1 list1))
 (let list1 (ExtractMembers list1 '('a)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverMapNext.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverMapNext.yqls
deleted file mode 100644
index 72a41ec35c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverMapNext.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (Iterator table1))
-(let table1 (MapNext table1 (lambda '(current next) (AsStruct
-  '('ks '((Member current 'key) (Member next 'subkey)))
-  '('sv '((Member current 'subkey) (Member next 'value)))
-  ))))
-
-(let table1 (ForwardList table1))
-
-(let table1 (OrderedMap table1 (lambda '(row) (AsStruct
-  '('sv (Member row 'sv))
-  ))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yqls
index 5345f0b143..d8dbd81c49 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
 (let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
@@ -8,7 +7,7 @@
 (let list1 (Skip list1 (Uint64 '1)))
 (let list1 (ExtractMembers list1 '('a)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yqls
index 46aec084d2..1995fe5ebe 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
 (let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
@@ -8,7 +7,7 @@
 (let list1 (Sort list1 (Bool 'true) (lambda '(row) (Member row 'a))))
 (let list1 (ExtractMembers list1 '('a)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yqls
index a7c9bb7e78..f8506d6b02 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
 (let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
@@ -8,7 +7,7 @@
 (let list1 (Sort list1 (Bool 'true) (lambda '(row) (Member row 'b))))
 (let list1 (ExtractMembers list1 '('b)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yqls
index d3988b8ebb..362e3e3043 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
 (let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
@@ -8,7 +7,7 @@
 (let list1 (Sort list1 (Bool 'true) (lambda '(row) (Member row 'b))))
 (let list1 (ExtractMembers list1 '('b 'c)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yqls
index 713a57a0fd..e9effd74bd 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let str1 (AsStruct '('a (Uint32 '1)) '('b (String 'a)) '('c (Bool 'true))))
 (let str2 (AsStruct '('a (Uint32 '2)) '('b (String 'b)) '('c (Bool 'false))))
@@ -8,7 +7,7 @@
 (let list1 (Take list1 (Uint64 '1)))
 (let list1 (ExtractMembers list1 '('a)))
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) list1 '()))
+(let world (Write! world res_sink (Key) list1 '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.cfg
deleted file mode 100644
index 64df516e6f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 input1.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.sql
deleted file mode 100644
index 3e7b24508a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-$aggregated = (
-    SELECT Group, Name, SUM(Amount) AS TotalAmount
-    FROM plato.Input1
-    GROUP BY Group, Name
-);
-
-SELECT t.Comment, a.TotalAmount
-FROM plato.Input1 AS t
-INNER JOIN $aggregated AS a
-ON t.Group == a.Group AND t.Name == a.Name
-ORDER BY t.Comment, a.TotalAmount;
-
-SELECT TotalAmount FROM $aggregated ORDER BY TotalAmount;
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.yqls
deleted file mode 100644
index 008e794f48..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.yqls
+++ /dev/null
@@ -1,83 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input1")))) (Void) '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '(table1 '"t") '((block '(
-        (let select (block '(
-          (let core table1)
-          (let core (Aggregate core '('"Group" '"Name") '('('Sum0 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"Amount")))))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"Group" (Member row '"Group")) '('"Name" (Member row '"Name")) '('"TotalAmount" (Member row 'Sum0))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"a") '('Inner '"t" '"a" '('"t" '"Group" '"t" '"Name") '('"a" '"Group" '"a" '"Name") '()) '()))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"t.Comment" (SqlColumn row '"Comment" '"t")) '('"a.TotalAmount" (SqlColumn row '"TotalAmount" '"a"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select '((Bool 'true) (Bool 'true)) (lambda '(row) '((Member row '"t.Comment") (Member row '"a.TotalAmount")))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"t.Comment" '"a.TotalAmount")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input1")))) (Void) '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (block '(
-        (let select (block '(
-          (let core table1)
-          (let core (Aggregate core '('"Group" '"Name") '('('Sum0 (Apply (bind aggregate_module '"sum_traits_factory") (TypeOf core) (lambda '(row) (Member row '"Amount")))))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"Group" (Member row '"Group")) '('"Name" (Member row '"Name")) '('"TotalAmount" (Member row 'Sum0))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"TotalAmount" (Member row '"TotalAmount"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (let select (Sort select (Bool 'true) (lambda '(row) (Member row '"TotalAmount"))))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"TotalAmount")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yqls
index 61f9307f1a..b73f0a40b9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let outLambda1 (lambda '(sep) (block '(
@@ -22,7 +21,7 @@
 (let sep (If predicate (Just (String '_)) (Just (String '+))))
 (let data1 (IfPresent sep outLambda1 (AsList (String 'none))))
 (let data2 (IfPresent sep outLambda2 (AsList (String 'none))))
-(let world (Write! world res_sink (Key) '(data1 data2) '()))
+(let world (Write! world res_sink (Key) '(data1 data2) '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.cfg
deleted file mode 100644
index f3abc496dd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.yqls
deleted file mode 100644
index 7b776d078b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.yqls
+++ /dev/null
@@ -1,72 +0,0 @@
-(
-    # prepare python udf
-    (let str (DataType 'String))
-    (let tupleType (TupleType str str))
-    (let udfType (CallableType '() '(tupleType) '(str) '(str)))
-    (let udfScript (String '@@
-def MyTuple(one, two):
-    return (one, two)
-
-@@))
-    (let udf (ScriptUdf 'Python3 'MyTuple udfType udfScript))
-
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) (Void) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let singleKeySelector (lambda '(x) (Member x 'key)))
-    (let multiKeySelector (lambda '(x) '((Member x 'key) (Member x 'subkey))))
-    (let tupleKeySelector (lambda '(x) (Apply udf (Member x 'key) (Member x 'subkey))))
-    (let calcKeySelector (lambda '(x) (Concat (Member x 'key) (Member x 'subkey))))
-
-    (let singleDirAsc (Bool 'true))
-    (let singleDirDesc (Bool 'false))
-    (let multiDirAsc '((Bool 'true) (Bool 'true)))
-    (let multiDirDesc '((Bool 'false) (Bool 'false)))
-
-    (let singleSortKeySelector (lambda '(item) (Member item 'subkey)))
-    (let multiSortKeySelector (lambda '(item) '((Member item 'subkey) (Member item 'value))))
-    (let tupleSortKeySelector (lambda '(item) (Apply udf (Member item 'subkey) (Member item 'value))))
-    (let calcSortKeySelector (lambda '(item) (Concat (Member item 'subkey) (Member item 'value))))
-
-    (let res_sink (DataSink 'result))
-
-    (let macro (lambda '(world keySelector sortDir sortKeySelector) (block '(
-        (let res (PartitionByKey table1 keySelector sortDir sortKeySelector (lambda '(stream) (FlatMap stream (lambda '(pair) (Nth pair '1))))))
-        (let res (Sort res '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-        (let world (Write! world res_sink (Key) res '()))
-        (return world)
-    ))))
-
-    (let world (Apply macro world singleKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world singleKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world singleKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world singleKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world singleKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world singleKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Apply macro world multiKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world multiKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world multiKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world multiKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world multiKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world multiKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Apply macro world tupleKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world tupleKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world tupleKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world tupleKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world tupleKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world tupleKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Apply macro world calcKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world calcKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world calcKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world calcKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world calcKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world calcKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Commit! world res_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.cfg
deleted file mode 100644
index f3abc496dd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.yqls
deleted file mode 100644
index dda6bd8d62..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.yqls
+++ /dev/null
@@ -1,72 +0,0 @@
-(
-    # prepare python udf
-    (let str (DataType 'String))
-    (let tupleType (TupleType str str))
-    (let udfType (CallableType '() '(tupleType) '(str) '(str)))
-    (let udfScript (String '@@
-def MyTuple(one, two):
-    return (one, two)
-
-@@))
-    (let udf (ScriptUdf 'Python3 'MyTuple udfType udfScript))
-
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) (Void) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let singleKeySelector (lambda '(x) (Member x 'key)))
-    (let multiKeySelector (lambda '(x) '((Member x 'key) (Member x 'subkey))))
-    (let tupleKeySelector (lambda '(x) (Apply udf (Member x 'key) (Member x 'subkey))))
-    (let calcKeySelector (lambda '(x) (Concat (Member x 'key) (Member x 'subkey))))
-
-    (let singleDirAsc (Bool 'true))
-    (let singleDirDesc (Bool 'false))
-    (let multiDirAsc '((Bool 'true) (Bool 'true)))
-    (let multiDirDesc '((Bool 'false) (Bool 'false)))
-
-    (let singleSortKeySelector (lambda '(item) (Member item 'subkey)))
-    (let multiSortKeySelector (lambda '(item) '((Member item 'subkey) (Member item 'value))))
-    (let tupleSortKeySelector (lambda '(item) (Apply udf (Member item 'subkey) (Member item 'value))))
-    (let calcSortKeySelector (lambda '(item) (Concat (Member item 'subkey) (Member item 'value))))
-
-    (let res_sink (DataSink 'result))
-
-    (let macro (lambda '(world keySelector sortDir sortKeySelector) (block '(
-        (let res (PartitionsByKeys table1 keySelector sortDir sortKeySelector (lambda '(stream) stream)))
-        (let res (Sort res '((Bool 'true) (Bool 'true)) (lambda '(item) '((Member item 'key) (Member item 'subkey)))))
-        (let world (Write! world res_sink (Key) res '()))
-        (return world)
-    ))))
-
-    (let world (Apply macro world singleKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world singleKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world singleKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world singleKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world singleKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world singleKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Apply macro world multiKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world multiKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world multiKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world multiKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world multiKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world multiKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Apply macro world tupleKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world tupleKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world tupleKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world tupleKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world tupleKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world tupleKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Apply macro world calcKeySelector singleDirAsc singleSortKeySelector))
-    (let world (Apply macro world calcKeySelector singleDirDesc singleSortKeySelector))
-    (let world (Apply macro world calcKeySelector multiDirAsc multiSortKeySelector))
-    (let world (Apply macro world calcKeySelector multiDirDesc multiSortKeySelector))
-    (let world (Apply macro world calcKeySelector multiDirAsc tupleSortKeySelector))
-    (let world (Apply macro world calcKeySelector singleDirAsc calcSortKeySelector))
-
-    (let world (Commit! world res_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilter.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilter.yqls
deleted file mode 100644
index 262c788d71..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilter.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-#(let table1 (AsList (AsStruct '('key (String '100)))))
-(let table2 (Filter table1 (lambda '(x) (< (Member x 'key) (String '800)))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table2 '('('take '2))))
-    
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilterRef.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilterRef.yqls
deleted file mode 100644
index a96ce7edcf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilterRef.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-#(let table1 (AsList (AsStruct '('key (String '100)))))
-(let table2 (Filter table1 (lambda '(x) (< (Member x 'key) (String '800)))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table2 '('('take '2) '('autoref))))
-    
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yqls
index cf614d25ca..d4febccf39 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'x) (String 'c) (String 'e) (String 'a) (String 'z) (String 'y) (String 'f)))
@@ -11,7 +10,7 @@
 (let data (OrderedMap data (lambda '(x) '(x x))))
 (let data (ToFlow data))
 (let data (Collect data))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yqls
index f4ca885270..0bd5830188 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'c) (String 'e) (String 'a)))
@@ -11,7 +10,7 @@
 (let data (AsList '((Uint32 '1) (String 'c)) '((Uint32 '1) (String 's)) '((Uint32 '2) (String 'a))))
 (let data (Sort data '((Bool 'true) (Bool 'false)) (lambda '(x) x)))
 (let data (Reverse data))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelectMembersOverOptStruct.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SelectMembersOverOptStruct.yqls
deleted file mode 100644
index b9e3b2373c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelectMembersOverOptStruct.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (Map ("/" (Int32 '42) (Int32 '1)) (lambda '(item) (AsStruct
-  '('magic (Just item))
-  '('black_magic ("/" (Int32 '100) item))
-  ))))
-
-(let table1 (SelectMembers table1 '('m)))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.cfg
deleted file mode 100644
index e6d9edcc5d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input InputUniq.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.sql
deleted file mode 100644
index 127c25a4d5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-USE plato;
-
-$a = (SELECT key,subkey || "a" as subkey from Input where value < "r");
-$b = (SELECT key,subkey || "b" as subkey from Input where value > "c");
-select a.key as k1,a.subkey,b.subkey from $a as a join $b as b using (key);
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.yqls
deleted file mode 100644
index ffad760228..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.yqls
+++ /dev/null
@@ -1,57 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"value" '"key" '"subkey") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '((block '(
-        (let select (block '(
-          (let core table0)
-          (let core (Filter core (lambda '(row) (Coalesce ("<" (Member row '"value") (String '"r")) (Bool 'false)))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"key" (Member row '"key")) '('"subkey" ("Concat" (Member row '"subkey") (String '"a")))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"a") '((block '(
-        (let select (block '(
-          (let core table0)
-          (let core (Filter core (lambda '(row) (Coalesce (">" (Member row '"value") (String '"c")) (Bool 'false)))))
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"key" (Member row '"key")) '('"subkey" ("Concat" (Member row '"subkey") (String '"b")))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"b") '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key") '()) '()))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"k1" (SqlColumn row '"key" '"a")) '('"a.subkey" (SqlColumn row '"subkey" '"a")) '('"b.subkey" (SqlColumn row '"subkey" '"b"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"k1" '"a.subkey" '"b.subkey")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.cfg
deleted file mode 100644
index e6d9edcc5d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input InputUniq.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.sql b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.sql
deleted file mode 100644
index 944f3c386f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-USE plato;
-
-$a = (SELECT key,subkey || "a" as subkey from Input where value < "r");
-$b = (SELECT key,subkey || "b" as subkey from Input);
-select a.key as k1,a.subkey,b.subkey from Input as a join $b as b using (key);
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.yqls
deleted file mode 100644
index ea301688b3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.yqls
+++ /dev/null
@@ -1,44 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) '('"key" '"subkey") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core (EquiJoin '(table0 '"a") '((block '(
-        (let select (block '(
-          (let core table0)
-          (let core (FlatMap core (lambda '(row) (block '(
-            (let res (AsStruct '('"key" (Member row '"key")) '('"subkey" ("Concat" (Member row '"subkey") (String '"b")))))
-            (let res (AsList res))
-            (return res)
-          )))))
-          (return core)
-        )))
-        (return select)
-      )) '"b") '('Inner '"a" '"b" '('"a" '"key") '('"b" '"key") '()) '()))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"k1" (SqlColumn row '"key" '"a")) '('"a.subkey" (SqlColumn row '"subkey" '"a")) '('"b.subkey" (SqlColumn row '"subkey" '"b"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"k1" '"a.subkey" '"b.subkey")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipAfterMap.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipAfterMap.yqls
deleted file mode 100644
index fbc9dc1ba4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipAfterMap.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (Map table1 (lambda '(x) (AddMember x 'foo (String 'qwe)))))
-(let table1 (Skip table1 (Uint64 '2)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table1 '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yqls
index 3ec439ddde..2007948234 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yqls
@@ -1,17 +1,16 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let list1 (AsList (String 'a) (String 'b) (String 'c)))
 (let list2 (AsList (String 'd) (String 'e) (String 'f)))
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink
     (Key)
-    (Skip (Extend list1 list2) (Uint64 '1)) '()))
+    (Skip (Extend list1 list2) (Uint64 '1)) '('('type))))
 
 (let world (Write! world res_sink
     (Key)
-    (Skip (Extend list1 list2) (Uint64 '5)) '()))
+    (Skip (Extend list1 list2) (Uint64 '5)) '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.cfg
deleted file mode 100644
index bf54cfd5be..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_tbl_content.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.yqls
deleted file mode 100644
index d51db8e508..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let r (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline))))
-    (let table1 (Right! r))
-    (let table1 (Skip table1 (Uint64 '5)))
-    (let table1 (Take table1 (Uint64 '3)))
-    (let tresh (String '300))
-    (let table1low (FlatMap table1 (lambda '(item) (block '(
-           (let intValueOpt (Member item 'key))
-           (return (ListIf (< intValueOpt tresh) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.cfg
deleted file mode 100644
index bf54cfd5be..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_tbl_content.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.yqls
deleted file mode 100644
index 5bfc63445e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let r (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline))))
-    (let mrtc (Right! r))
-    (let mrtc (Skip mrtc (Uint64 '5)))
-    (let mrtc (Take mrtc (Uint64 '3)))
-    (let mrtc (FlatMap mrtc (lambda '(item) (block '(
-           (let key (Member item 'key))
-           (return (ListIf (> key (String '100)) item))
-    )))))
-    (let filter (ToDict mrtc (lambda '(x) (Member x 'key)) (lambda '(x) (Member x 'value)) '('Hashed 'One)))
-
-    (let tresh (String '500))
-    (let out (FlatMap table1 (lambda '(item) (block '(
-           (let key (Member item 'key))
-           (return (ListIf (And (< key tresh) (Contains filter key)) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yqls
index e661d70dde..bee3fe27eb 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SomeKeys.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/SomeKeys.txt
deleted file mode 100644
index 6d0b5b4d40..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SomeKeys.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="075";"subkey"="2";"value"="abc2"};
-{"key"="075";"subkey"="3";"value"="abc3"};
-{"key"="800";"subkey"="4";"value"="ddd"};
-{"key"="020";"subkey"="5";"value"="q"};
-{"key"="150";"subkey"="6";"value"="qzz"};
-{"key"="150";"subkey"="7";"value"="zz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SomeKeys.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/SomeKeys.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SomeKeys.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yqls
index 21570ead7b..077dcfb7e5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yqls
@@ -1,13 +1,12 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'c) (String 'e) (String 'a)))
 (let data (Reverse data))
 (let data (Sort data (Bool 'true) (lambda '(x) x)))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SortOfSortedDesc.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SortOfSortedDesc.yqls
deleted file mode 100644
index 3fbb12f446..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SortOfSortedDesc.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-(let source (DataSource 'yt 'plato))
-(let sink (DataSink 'yt 'plato))
-(let result (DataSink 'result))
-
-(let r (Read! world source (MrTableConcat (Key '('table (String '"Input")))) (Void) '()))
-(let input (Right! r))
-(let world (Left! r))
-
-(let out (Sort (FlatMap input (lambda '(item) (AsList item))) (Bool 'false) (lambda '(item) (Member item '"key"))))
-(let world (Write! world sink (Key '('table (String '"Output"))) out '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(let r (Read! world source (MrTableConcat (Key '('table (String '"Output")))) (Void) '()))
-(let input (Right! r))
-(let world (Left! r))
-
-(let out (Sort (FlatMap input (lambda '(item) (AsList item))) (Bool 'true) (lambda '(item) (Member item '"key"))))
-(let world (Write! world result (Key) out '('('type) '('autoref))))
-(let world (Commit! world result))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SubsetOfFields.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SubsetOfFields.yqls
deleted file mode 100644
index f4d4e775d8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SubsetOfFields.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let item (RemoveMember item 'value))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String '"s1")))
-   (let s (AddMember s 'value (String '"v1")))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '('('inline))))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let item (RemoveMember item 'value))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String '"s2")))
-   (let s (AddMember s 'value (String '"v2")))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yqls
index b703492435..f635a00e46 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let list (AsList
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeAfterMap.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeAfterMap.yqls
deleted file mode 100644
index 41df996fee..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeAfterMap.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (Map table1 (lambda '(x) (AddMember x 'foo (String 'qwe)))))
-(let table1 (Take table1 (Uint64 '2)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table1 '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.cfg
deleted file mode 100644
index 80d5638bff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.yqls
deleted file mode 100644
index b263c72063..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let preMap (lambda '(item) (Just item)))
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let init (lambda '(key item) (FromString (Member item 'subkey) 'Uint32)))
-(let update (lambda '(key item state) (+ state (FromString (Member item 'subkey) 'Uint32))))
-(let finish (lambda '(key state) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (Coalesce (Map state (lambda '(x) (ToString x))) (String '""))))
-  (return (Just s))
-))))
-
-(let table2 (CombineByKey table1 preMap keyExtractor init update finish))
-(let table2 (Take table2 (Uint64 '2)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table2 '()))
-    
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterFilter.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterFilter.yqls
deleted file mode 100644
index e161a11ee5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterFilter.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (Filter table1 (lambda '(x) (< (Member x 'key) (String '800)))))
-(let table2x (Skip (Take table1 (Uint64 '2)) (Uint64 '1)))
-(let table2y (Take table1 (Uint64 '3)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table2x '()))
-    
-(let world (Write! world res_sink
-    (Key)
-    table2y '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.cfg
deleted file mode 100644
index 80d5638bff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.yqls
deleted file mode 100644
index d0fa6fb1dd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.yqls
+++ /dev/null
@@ -1,34 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let handler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let f (Fold list (Uint64 '0) (lambda '(item state) (block '(
-      (let value (Coalesce (FromString (Member item 'subkey) 'Uint64) (Uint64 '0)))
-      (return (+ value state))
-  )))))
-  (let s (AddMember s 'value (ToString f)))
-  (return (Just s))
-))))))
-
-(let table2 (PartitionByKey table1 keyExtractor (Void) (Void) handler))
-(let table2 (Take table2 (Uint64 '4)))
-(let table2 (Sort table2 (Bool 'true) (lambda '(item) (Member item 'value))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table2 '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterSort.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterSort.yqls
deleted file mode 100644
index 107a53b598..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterSort.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let table2 (Sort table1 (Bool 'true) keyExtractor))
-(let table2 (Take table2 (Uint64 '2)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table2 '()))
-    
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverExtend.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverExtend.yqls
deleted file mode 100644
index e7b12fc1c1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverExtend.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let list1 (AsList (String 'a) (String 'b) (String 'c)))
-(let list2 (AsList (String 'd) (String 'e) (String 'f)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    (Take (Extend list1 list2) (Uint64 '1)) '()))
-
-(let world (Write! world res_sink
-    (Key)
-    (Take (Extend list1 list2) (Uint64 '5)) '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yqls
index ad245012d0..ffd41a63a4 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yqls
@@ -1,13 +1,12 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (String 'x) (String 'c) (String 'e) (String 'a) (String 'z) (String 'y) (String 'f)))
 (let data (Top data (Uint64 '4) (Bool 'true) (lambda '(x) x)))
 (let data (Take data (Uint64 '2)))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yqls
index bc2bdb9037..9fdfc7d6cf 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Top.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Top.yqls
deleted file mode 100644
index e0a2bab036..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Top.yqls
+++ /dev/null
@@ -1,42 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let res_sink (DataSink 'result))
-
-(let x (Read! world mr_source (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let table (Right! x))
-
-(let list (AsList
-    (AsStruct '('a (Uint32 '4)) '('b (String 'c)))
-    (AsStruct '('a (Uint32 '1)) '('b (String 'd)))
-    (AsStruct '('a (Uint32 '3)) '('b (String 'b)))
-))
-
-# Top->Take
-(let world (Write! world res_sink (Key) (Top table (Uint64 '3) '() (lambda '(item) '())) '('('type))))
-(let world (Write! world res_sink (Key) (TopSort table (Uint64 '3) '() (lambda '(item) '())) '('('type))))
-
-# tuple with single item
-(let world (Write! world res_sink (Key) (Top table (Uint64 '3) '((Bool 'True)) (lambda '(item) '((Member item 'key)))) '('('type))))
-(let world (Write! world res_sink (Key) (TopSort table (Uint64 '3) '((Bool 'True)) (lambda '(item) '((Member item 'key)))) '('('type))))
-
-# zero count
-(let world (Write! world res_sink (Key) (Top table (Uint64 '0) (Bool 'True) (lambda '(item) (Member item 'key))) '('('type))))
-(let world (Write! world res_sink (Key) (TopSort table (Uint64 '0) (Bool 'True) (lambda '(item) (Member item 'key))) '('('type))))
-(let world (Write! world res_sink (Key) (Collect (Top (Iterator table (DependsOn (String 'a))) (Uint64 '0) (Bool 'True) (lambda '(item) (Member item 'key)))) '('('type))))
-(let world (Write! world res_sink (Key) (Collect (TopSort (Iterator table (DependsOn (String 'b))) (Uint64 '0) (Bool 'True) (lambda '(item) (Member item 'key)))) '('('type))))
-
-# list <= N
-(let world (Write! world res_sink (Key) (Top list (Uint64 '3) (Bool 'True) (lambda '(item) (Member item 'a))) '('('type))))
-(let world (Write! world res_sink (Key) (TopSort list (Uint64 '3) (Bool 'True) (lambda '(item) (Member item 'a))) '('('type))))
-
-# ExtractMembers
-(let world (Write! world res_sink (Key) (ExtractMembers (Top table (Uint64 '3) (Bool 'True) (lambda '(item) (Member item 'key))) '('key 'value)) '('('type))))
-(let world (Write! world res_sink (Key) (ExtractMembers (TopSort table (Uint64 '3) (Bool 'True) (lambda '(item) (Member item 'key))) '('key 'value)) '('('type))))
-(let world (Write! world res_sink (Key) (ExtractMembers (Top table (Uint64 '3) (Bool 'True) (lambda '(item) (Member item 'key))) '('value)) '('('type))))
-(let world (Write! world res_sink (Key) (ExtractMembers (TopSort table (Uint64 '3) (Bool 'True) (lambda '(item) (Member item 'key))) '('value)) '('('type))))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedDesc.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedDesc.yqls
deleted file mode 100644
index b1de8fceb1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedDesc.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let source (DataSource 'yt 'plato))
-(let sink (DataSink 'yt 'plato))
-
-(let r (Read! world source (MrTableConcat (Key '('table (String '"Input")))) (Void) '()))
-(let input (Right! r))
-(let world (Left! r))
-
-(let mapLambda (lambda '(item) (AsList (AsStruct '('"key" (Member item '"key"))))))
-(let keyExtractLambda  (lambda '(item) (Member item '"key")))
-
-(let out1 (Sort (FlatMap input mapLambda) (Bool 'false) keyExtractLambda))
-(let out2 (Sort (FlatMap input mapLambda) (Bool 'false) keyExtractLambda))
-(let union (UnionAll (Take out1 (Int32 '"3")) (Take out2 (Int32 '"2"))))
-
-(let world (Write! world sink (Key '('table (String '"Output"))) union '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedMix.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedMix.yqls
deleted file mode 100644
index cbe8c2bb5e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedMix.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let source (DataSource 'yt 'plato))
-(let sink (DataSink 'yt 'plato))
-
-(let r (Read! world source (MrTableConcat (Key '('table (String '"Input")))) (Void) '()))
-(let input (Right! r))
-(let world (Left! r))
-
-(let mapLambda (lambda '(item) (AsList (AsStruct '('"key" (Member item '"key"))))))
-(let keyExtractLambda  (lambda '(item) (Member item '"key")))
-
-(let out1 (Sort (FlatMap input mapLambda) (Bool 'false) keyExtractLambda))
-(let out2 (Sort (FlatMap input mapLambda) (Bool 'true) keyExtractLambda))
-(let union (UnionAll (Take out1 (Int32 '"3")) (Take out2 (Int32 '"2"))))
-
-(let world (Write! world sink (Key '('table (String '"Output"))) union '('('mode 'renew))))
-(let world (Commit! world sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UnusedColumnsAfterTake.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/UnusedColumnsAfterTake.yqls
deleted file mode 100644
index 65f43e76db..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UnusedColumnsAfterTake.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let table1 (Take table1 (Uint64 '2)))
-(let table1 (Map table1 (lambda '(x) (AsStruct '('key (Member x 'key))))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table1 '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yqls
index 6f5b78d34e..c658fd89b7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let ed (Dict (DictType (DataType 'Int32) (DataType 'String))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yqls
index 76b605c271..7a79ddae47 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 
 (let vt (VariantType (TupleType (DataType 'String) (DataType 'String) (DataType 'String))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yqls
index 8c8c4f7726..c71b674e20 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let vt (VariantType (TupleType (DataType 'Int32))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yqls
index 5f7b186e37..762af5957c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let vt (VariantType (TupleType (DataType 'String) (DataType 'String) (DataType 'String))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yqls
index 271b065f4a..76da618032 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let vt (VariantType (TupleType (DataType 'Int32) (DataType 'String))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yqls b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yqls
index 8a0197dd5e..1cdc632a53 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let vt3 (VariantType (TupleType (DataType 'String) (DataType 'String) (DataType 'String))))
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/default.cfg b/yql/essentials/tests/s-expressions/suites/Optimizers/default.cfg
index fe2b19a9ff..00dec6c3f8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/default.cfg
@@ -1,3 +1 @@
-in Input input.txt
-out Output output.txt
 res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input1.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/input1.txt
deleted file mode 100644
index bd567557a0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-{"Amount"=100;"Comment"="Test1";"Group"=1u;"Name"="Name1"};
-{"Amount"=101;"Comment"="Test1";"Group"=1u;"Name"="Name2"};
-{"Amount"=102;"Comment"="Test1";"Group"=1u;"Name"="Name3"};
-{"Amount"=103;"Comment"="Test1";"Group"=2u;"Name"="Name1"};
-{"Amount"=104;"Comment"="Test1";"Group"=3u;"Name"="Name3"};
-{"Amount"=105;"Comment"="Test1";"Group"=4u;"Name"="Name1"};
-{"Amount"=106;"Comment"="Test1";"Group"=4u;"Name"="Name4"};
-{"Amount"=107;"Comment"="Test1";"Group"=5u;"Name"="Name5"};
-{"Amount"=108;"Comment"="Test1";"Group"=6u;"Name"="Name1"};
-{"Amount"=109;"Comment"="Test1";"Group"=6u;"Name"="Name2"};
-{"Amount"=100;"Comment"="Test3";"Group"=10u;"Name"="Name1"};
-{"Amount"=101;"Comment"="Test3";"Group"=10u;"Name"="Name2"};
-{"Amount"=102;"Comment"="Test3";"Group"=10u;"Name"="Name3"};
-{"Amount"=103;"Comment"="Test3";"Group"=10u;"Name"="Name4"};
-{"Amount"=104;"Comment"="Test3";"Group"=10u;"Name"="Name5"};
-{"Amount"=105;"Comment"="Test3";"Group"=10u;"Name"="Name6"};
-{"Amount"=100;"Comment"="Test2";"Group"=100001u;"Name"="Name1"};
-{"Amount"=102;"Comment"="Test2";"Group"=100002u;"Name"="Name2"};
-{"Amount"=103;"Comment"="Test2";"Group"=100003u;"Name"="Name1"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input1.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/input1.txt.attr
deleted file mode 100644
index ffb9a19cab..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input1.txt.attr
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "UniqueKeys"=%true;
-        "SortMembers"=["Group"; "Name"];
-        "SortedBy"=["Group"; "Name"];
-        "SortDirections"=[1; 1];
-        "SortedByTypes"=[["DataType";"Uint64"]; ["DataType";"String"]];
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "Group";
-                    [
-                        "DataType";
-                        "Uint64"
-                    ]
-                ];
-                [
-                    "Name";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "Amount";
-                    [
-                        "DataType";
-                        "Int64"
-                    ]
-                ];
-                [
-                    "Comment";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input2.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/input2.txt
deleted file mode 100644
index d1fa0973d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="075";"subkey"=".";"value"="abc"};
-{"key"="911";"subkey"=".";"value"="kkk"};
-{"key"="023";"subkey"=".";"value"="aaa"};
-{"key"="527";"subkey"=".";"value"="bbb"};
-{"key"="037";"subkey"=".";"value"="ddd"};
-{"key"="761";"subkey"=".";"value"="ccc"};
-{"key"="200";"subkey"=".";"value"="qqq"};
-{"key"="150";"subkey"=".";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/input2.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input3.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/input3.txt
deleted file mode 100644
index 045bc6bd14..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input3.txt
+++ /dev/null
@@ -1,200 +0,0 @@
-{"key"="180";"subkey"="7";"value"="Value #44"};
-{"key"="178";"subkey"="17";"value"="Value #7"};
-{"key"="6";"subkey"="4";"value"="Value #1"};
-{"key"="53";"subkey"="19";"value"="Value #41"};
-{"key"="112";"subkey"="15";"value"="Value #14"};
-{"key"="121";"subkey"="11";"value"="Value #58"};
-{"key"="69";"subkey"="5";"value"="Value #49"};
-{"key"="142";"subkey"="3";"value"="Value #5"};
-{"key"="73";"subkey"="8";"value"="Value #33"};
-{"key"="52";"subkey"="14";"value"="Value #45"};
-{"key"="18";"subkey"="6";"value"="Value #40"};
-{"key"="141";"subkey"="16";"value"="Value #35"};
-{"key"="63";"subkey"="18";"value"="Value #12"};
-{"key"="5";"subkey"="13";"value"="Value #28"};
-{"key"="128";"subkey"="2";"value"="Value #56"};
-{"key"="48";"subkey"="12";"value"="Value #13"};
-{"key"="93";"subkey"="9";"value"="Value #20"};
-{"key"="49";"subkey"="0";"value"="Value #30"};
-{"key"="95";"subkey"="1";"value"="Value #34"};
-{"key"="159";"subkey"="10";"value"="Value #52"};
-{"key"="55";"subkey"="7";"value"="Value #15"};
-{"key"="7";"subkey"="17";"value"="Value #24"};
-{"key"="35";"subkey"="4";"value"="Value #51"};
-{"key"="82";"subkey"="19";"value"="Value #0"};
-{"key"="170";"subkey"="15";"value"="Value #26"};
-{"key"="150";"subkey"="11";"value"="Value #27"};
-{"key"="26";"subkey"="5";"value"="Value #54"};
-{"key"="58";"subkey"="3";"value"="Value #37"};
-{"key"="16";"subkey"="8";"value"="Value #46"};
-{"key"="166";"subkey"="14";"value"="Value #4"};
-{"key"="86";"subkey"="6";"value"="Value #16"};
-{"key"="101";"subkey"="16";"value"="Value #32"};
-{"key"="160";"subkey"="18";"value"="Value #39"};
-{"key"="199";"subkey"="13";"value"="Value #25"};
-{"key"="138";"subkey"="2";"value"="Value #6"};
-{"key"="96";"subkey"="12";"value"="Value #57"};
-{"key"="33";"subkey"="9";"value"="Value #21"};
-{"key"="9";"subkey"="0";"value"="Value #42"};
-{"key"="21";"subkey"="1";"value"="Value #55"};
-{"key"="176";"subkey"="10";"value"="Value #23"};
-{"key"="0";"subkey"="7";"value"="Value #18"};
-{"key"="66";"subkey"="17";"value"="Value #3"};
-{"key"="198";"subkey"="4";"value"="Value #22"};
-{"key"="186";"subkey"="19";"value"="Value #17"};
-{"key"="83";"subkey"="15";"value"="Value #2"};
-{"key"="179";"subkey"="11";"value"="Value #19"};
-{"key"="64";"subkey"="5";"value"="Value #38"};
-{"key"="56";"subkey"="3";"value"="Value #50"};
-{"key"="155";"subkey"="8";"value"="Value #43"};
-{"key"="143";"subkey"="14";"value"="Value #9"};
-{"key"="188";"subkey"="6";"value"="Value #8"};
-{"key"="172";"subkey"="16";"value"="Value #53"};
-{"key"="103";"subkey"="18";"value"="Value #11"};
-{"key"="44";"subkey"="13";"value"="Value #36"};
-{"key"="173";"subkey"="2";"value"="Value #10"};
-{"key"="133";"subkey"="12";"value"="Value #48"};
-{"key"="168";"subkey"="9";"value"="Value #29"};
-{"key"="157";"subkey"="0";"value"="Value #31"};
-{"key"="152";"subkey"="1";"value"="Value #47"};
-{"key"="74";"subkey"="10";"value"="Value #59"};
-{"key"="154";"subkey"="7";"value"="Value #44"};
-{"key"="40";"subkey"="17";"value"="Value #7"};
-{"key"="89";"subkey"="4";"value"="Value #1"};
-{"key"="41";"subkey"="19";"value"="Value #41"};
-{"key"="24";"subkey"="15";"value"="Value #14"};
-{"key"="182";"subkey"="11";"value"="Value #58"};
-{"key"="80";"subkey"="5";"value"="Value #49"};
-{"key"="196";"subkey"="3";"value"="Value #5"};
-{"key"="43";"subkey"="8";"value"="Value #33"};
-{"key"="156";"subkey"="14";"value"="Value #45"};
-{"key"="34";"subkey"="6";"value"="Value #40"};
-{"key"="88";"subkey"="16";"value"="Value #35"};
-{"key"="22";"subkey"="18";"value"="Value #12"};
-{"key"="27";"subkey"="13";"value"="Value #28"};
-{"key"="84";"subkey"="2";"value"="Value #56"};
-{"key"="12";"subkey"="12";"value"="Value #13"};
-{"key"="98";"subkey"="9";"value"="Value #20"};
-{"key"="140";"subkey"="0";"value"="Value #30"};
-{"key"="31";"subkey"="1";"value"="Value #34"};
-{"key"="105";"subkey"="10";"value"="Value #52"};
-{"key"="149";"subkey"="7";"value"="Value #15"};
-{"key"="153";"subkey"="17";"value"="Value #24"};
-{"key"="177";"subkey"="4";"value"="Value #51"};
-{"key"="14";"subkey"="19";"value"="Value #0"};
-{"key"="190";"subkey"="15";"value"="Value #26"};
-{"key"="118";"subkey"="11";"value"="Value #27"};
-{"key"="174";"subkey"="5";"value"="Value #54"};
-{"key"="104";"subkey"="3";"value"="Value #37"};
-{"key"="47";"subkey"="8";"value"="Value #46"};
-{"key"="46";"subkey"="14";"value"="Value #4"};
-{"key"="124";"subkey"="6";"value"="Value #16"};
-{"key"="70";"subkey"="16";"value"="Value #32"};
-{"key"="110";"subkey"="18";"value"="Value #39"};
-{"key"="91";"subkey"="13";"value"="Value #25"};
-{"key"="192";"subkey"="2";"value"="Value #6"};
-{"key"="183";"subkey"="12";"value"="Value #57"};
-{"key"="100";"subkey"="9";"value"="Value #21"};
-{"key"="38";"subkey"="0";"value"="Value #42"};
-{"key"="71";"subkey"="1";"value"="Value #55"};
-{"key"="29";"subkey"="10";"value"="Value #23"};
-{"key"="51";"subkey"="7";"value"="Value #18"};
-{"key"="32";"subkey"="17";"value"="Value #3"};
-{"key"="130";"subkey"="4";"value"="Value #22"};
-{"key"="77";"subkey"="19";"value"="Value #17"};
-{"key"="4";"subkey"="15";"value"="Value #2"};
-{"key"="97";"subkey"="11";"value"="Value #19"};
-{"key"="67";"subkey"="5";"value"="Value #38"};
-{"key"="158";"subkey"="3";"value"="Value #50"};
-{"key"="25";"subkey"="8";"value"="Value #43"};
-{"key"="119";"subkey"="14";"value"="Value #9"};
-{"key"="2";"subkey"="6";"value"="Value #8"};
-{"key"="167";"subkey"="16";"value"="Value #53"};
-{"key"="193";"subkey"="18";"value"="Value #11"};
-{"key"="11";"subkey"="13";"value"="Value #36"};
-{"key"="129";"subkey"="2";"value"="Value #10"};
-{"key"="187";"subkey"="12";"value"="Value #48"};
-{"key"="20";"subkey"="9";"value"="Value #29"};
-{"key"="134";"subkey"="0";"value"="Value #31"};
-{"key"="115";"subkey"="1";"value"="Value #47"};
-{"key"="94";"subkey"="10";"value"="Value #59"};
-{"key"="30";"subkey"="7";"value"="Value #44"};
-{"key"="175";"subkey"="17";"value"="Value #7"};
-{"key"="62";"subkey"="4";"value"="Value #1"};
-{"key"="147";"subkey"="19";"value"="Value #41"};
-{"key"="87";"subkey"="15";"value"="Value #14"};
-{"key"="99";"subkey"="11";"value"="Value #58"};
-{"key"="114";"subkey"="5";"value"="Value #49"};
-{"key"="117";"subkey"="3";"value"="Value #5"};
-{"key"="10";"subkey"="8";"value"="Value #33"};
-{"key"="162";"subkey"="14";"value"="Value #45"};
-{"key"="171";"subkey"="6";"value"="Value #40"};
-{"key"="108";"subkey"="16";"value"="Value #35"};
-{"key"="60";"subkey"="18";"value"="Value #12"};
-{"key"="144";"subkey"="13";"value"="Value #28"};
-{"key"="113";"subkey"="2";"value"="Value #56"};
-{"key"="102";"subkey"="12";"value"="Value #13"};
-{"key"="194";"subkey"="9";"value"="Value #20"};
-{"key"="76";"subkey"="0";"value"="Value #30"};
-{"key"="189";"subkey"="1";"value"="Value #34"};
-{"key"="164";"subkey"="10";"value"="Value #52"};
-{"key"="23";"subkey"="7";"value"="Value #15"};
-{"key"="65";"subkey"="17";"value"="Value #24"};
-{"key"="54";"subkey"="4";"value"="Value #51"};
-{"key"="148";"subkey"="19";"value"="Value #0"};
-{"key"="123";"subkey"="15";"value"="Value #26"};
-{"key"="185";"subkey"="11";"value"="Value #27"};
-{"key"="28";"subkey"="5";"value"="Value #54"};
-{"key"="13";"subkey"="3";"value"="Value #37"};
-{"key"="136";"subkey"="8";"value"="Value #46"};
-{"key"="57";"subkey"="14";"value"="Value #4"};
-{"key"="184";"subkey"="6";"value"="Value #16"};
-{"key"="36";"subkey"="16";"value"="Value #32"};
-{"key"="132";"subkey"="18";"value"="Value #39"};
-{"key"="120";"subkey"="13";"value"="Value #25"};
-{"key"="50";"subkey"="2";"value"="Value #6"};
-{"key"="195";"subkey"="12";"value"="Value #57"};
-{"key"="135";"subkey"="9";"value"="Value #21"};
-{"key"="92";"subkey"="0";"value"="Value #42"};
-{"key"="151";"subkey"="1";"value"="Value #55"};
-{"key"="125";"subkey"="10";"value"="Value #23"};
-{"key"="146";"subkey"="7";"value"="Value #18"};
-{"key"="45";"subkey"="17";"value"="Value #3"};
-{"key"="90";"subkey"="4";"value"="Value #22"};
-{"key"="126";"subkey"="19";"value"="Value #17"};
-{"key"="145";"subkey"="15";"value"="Value #2"};
-{"key"="19";"subkey"="11";"value"="Value #19"};
-{"key"="127";"subkey"="5";"value"="Value #38"};
-{"key"="79";"subkey"="3";"value"="Value #50"};
-{"key"="131";"subkey"="8";"value"="Value #43"};
-{"key"="111";"subkey"="14";"value"="Value #9"};
-{"key"="75";"subkey"="6";"value"="Value #8"};
-{"key"="191";"subkey"="16";"value"="Value #53"};
-{"key"="3";"subkey"="18";"value"="Value #11"};
-{"key"="165";"subkey"="13";"value"="Value #36"};
-{"key"="85";"subkey"="2";"value"="Value #10"};
-{"key"="1";"subkey"="12";"value"="Value #48"};
-{"key"="161";"subkey"="9";"value"="Value #29"};
-{"key"="37";"subkey"="0";"value"="Value #31"};
-{"key"="107";"subkey"="1";"value"="Value #47"};
-{"key"="122";"subkey"="10";"value"="Value #59"};
-{"key"="139";"subkey"="7";"value"="Value #44"};
-{"key"="15";"subkey"="17";"value"="Value #7"};
-{"key"="106";"subkey"="4";"value"="Value #1"};
-{"key"="59";"subkey"="19";"value"="Value #41"};
-{"key"="61";"subkey"="15";"value"="Value #14"};
-{"key"="17";"subkey"="11";"value"="Value #58"};
-{"key"="68";"subkey"="5";"value"="Value #49"};
-{"key"="163";"subkey"="3";"value"="Value #5"};
-{"key"="197";"subkey"="8";"value"="Value #33"};
-{"key"="81";"subkey"="14";"value"="Value #45"};
-{"key"="169";"subkey"="6";"value"="Value #40"};
-{"key"="8";"subkey"="16";"value"="Value #35"};
-{"key"="109";"subkey"="18";"value"="Value #12"};
-{"key"="78";"subkey"="13";"value"="Value #28"};
-{"key"="181";"subkey"="2";"value"="Value #56"};
-{"key"="116";"subkey"="12";"value"="Value #13"};
-{"key"="137";"subkey"="9";"value"="Value #20"};
-{"key"="39";"subkey"="0";"value"="Value #30"};
-{"key"="72";"subkey"="1";"value"="Value #34"};
-{"key"="42";"subkey"="10";"value"="Value #52"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/input3.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input3.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input4.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/input4.txt
deleted file mode 100644
index 0827c839a2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input4.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-{"key"="023";"subkey"="3";"value"="aaa"};
-{"key"="037";"subkey"="5";"value"="ddd"};
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="150";"subkey"="1";"value"="aaa"};
-{"key"="150";"subkey"="3";"value"="iii"};
-{"key"="150";"subkey"="8";"value"="zzz"};
-{"key"="200";"subkey"="7";"value"="qqq"};
-{"key"="527";"subkey"="4";"value"="bbb"};
-{"key"="761";"subkey"="6";"value"="ccc"};
-{"key"="911";"subkey"="1";"value"="kkk"};
-{"key"="911";"subkey"="2";"value"="hjk"};
-{"key"="911";"subkey"="3";"value"="def"};
-{"key"="911";"subkey"="4";"value"="xyz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input4.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/input4.txt.attr
deleted file mode 100644
index 6ee50d08cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input4.txt.attr
+++ /dev/null
@@ -1,11 +0,0 @@
-{"_yql_row_spec"={
-	"Type"=["StructType";[
-		["key";["DataType";"String"]];
-		["subkey";["DataType";"String"]];
-		["value";["DataType";"String"]]
-	]];
-	"SortDirections"=[1;1;];
-	"SortedBy"=["key";"subkey";];
-	"SortedByTypes"=[["DataType";"String";];["DataType";"String";];];
-	"SortMembers"=["key";"subkey";];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/inputDistinctKey.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/inputDistinctKey.txt
deleted file mode 100644
index 6b1dac36b1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/inputDistinctKey.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="1";"subkey"=".";"value"="abc"};
-{"key"="1";"subkey"=".";"value"="kkk"};
-{"key"="2";"subkey"=".";"value"="aaa"};
-{"key"="2";"subkey"=".";"value"="bbb"};
-{"key"="2";"subkey"=".";"value"="ddd"};
-{"key"="bad";"subkey"=".";"value"="ccc"};
-{"key"="1";"subkey"=".";"value"="qqq"};
-{"key"="1";"subkey"=".";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/inputDistinctKey.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/inputDistinctKey.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/inputDistinctKey.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion1.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion1.txt
deleted file mode 100644
index 93251b80a0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"="30";"name1"="bob"};
-{"age"="16";"name1"="alice"};
-{"age"="55";"name1"="jone"};
-{"age"="45";"name1"="silver"};
-{"age"="45";"name1"="smith"};
-{"age"="90";"name1"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion1.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion1.txt.attr
deleted file mode 100644
index bdbbea169d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion1.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["age";["DataType";"String"]];["name1";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion2.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion2.txt
deleted file mode 100644
index 1d9b6e8b42..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"="30";"name2"="bob"};
-{"age"="16";"name2"="alice"};
-{"age"="55";"name2"="jone"};
-{"age"="45";"name2"="silver"};
-{"age"="45";"name2"="smith"};
-{"age"="90";"name2"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion2.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion2.txt.attr
deleted file mode 100644
index 6d032642cf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/inputUnion2.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["age";["DataType";"String"]];["name2";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input_tbl_content.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/input_tbl_content.txt
deleted file mode 100644
index d1fa0973d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input_tbl_content.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="075";"subkey"=".";"value"="abc"};
-{"key"="911";"subkey"=".";"value"="kkk"};
-{"key"="023";"subkey"=".";"value"="aaa"};
-{"key"="527";"subkey"=".";"value"="bbb"};
-{"key"="037";"subkey"=".";"value"="ddd"};
-{"key"="761";"subkey"=".";"value"="ccc"};
-{"key"="200";"subkey"=".";"value"="qqq"};
-{"key"="150";"subkey"=".";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/input_tbl_content.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/input_tbl_content.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/input_tbl_content.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/typed_table.txt b/yql/essentials/tests/s-expressions/suites/Optimizers/typed_table.txt
deleted file mode 100644
index cc1df00106..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/typed_table.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="";"value"="a7c"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="";"value"="q"};
-{"key"="150";"subkey"="4";"value"="q8z"};
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/typed_table.txt.attr b/yql/essentials/tests/s-expressions/suites/Optimizers/typed_table.txt.attr
deleted file mode 100644
index 9061763bd6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/typed_table.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_view_opt_struct"="SELECT AsList(1,2,3) as b FROM self;";
-    "_yql_syntax_version_opt_struct"=1;
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureList.yqls b/yql/essentials/tests/s-expressions/suites/Pure/PureList.yqls
index 224d23514f..5e8ff0991f 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Pure/PureList.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 (let data (AsList (Uint32 '1)))
 (let world (Write! world res_sink (Key) data '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureLongList.yqls b/yql/essentials/tests/s-expressions/suites/Pure/PureLongList.yqls
index 94a8922948..93a1cf8ceb 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureLongList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Pure/PureLongList.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 (let data (AsList (Uint32 '1)))
 (let data (Extend data data data data data))
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureNonList.yqls b/yql/essentials/tests/s-expressions/suites/Pure/PureNonList.yqls
index eb00aa902e..92dbc6e6cc 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureNonList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Pure/PureNonList.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 (let data (Uint32 '1))
 (let world (Write! world res_sink (Key) data '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructList.yqls b/yql/essentials/tests/s-expressions/suites/Pure/PureStructList.yqls
index 0c6513f8c7..2e981de1ac 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructList.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Pure/PureStructList.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 (let data (AsList 
   (AsStruct '('b (Uint32 '1)) '('a (String 'a)) '('c (String 'DDD)))
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructListWithFields.yqls b/yql/essentials/tests/s-expressions/suites/Pure/PureStructListWithFields.yqls
index 623ed4b8b0..ee683c05d5 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructListWithFields.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Pure/PureStructListWithFields.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 (let data (AsList 
   (AsStruct '('b (Uint32 '1)) '('a (String 'a)) '('c (String 'DDD)))
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.cfg b/yql/essentials/tests/s-expressions/suites/Pure/PureUdf.cfg
index 8da645df35..8da645df35 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Pure/PureUdf.cfg
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yqls b/yql/essentials/tests/s-expressions/suites/Pure/PureUdf.yqls
index 0f09553c83..221b00166c 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Pure/PureUdf.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 (let res_sink (DataSink 'result))
 (let data (Apply (Udf 'SimpleUdf.Echo) (String 'abc)))
 (let world (Write! world res_sink (Key) data '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/default.cfg b/yql/essentials/tests/s-expressions/suites/Pure/default.cfg
index 00dec6c3f8..00dec6c3f8 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Pure/default.cfg
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AfterTransform.yqls b/yql/essentials/tests/s-expressions/suites/Result/AfterTransform.yqls
deleted file mode 100644
index f0514c97b1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/AfterTransform.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1low '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Apply.yqls b/yql/essentials/tests/s-expressions/suites/Result/Apply.yqls
index ee940f6d93..9e1bc47c7b 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Apply.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/Apply.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let f1 (lambda '(x y) (block '(
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AutoRefBig.yqls b/yql/essentials/tests/s-expressions/suites/Result/AutoRefBig.yqls
deleted file mode 100644
index d54b9c6ce3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/AutoRefBig.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1low '('('take '1) '('autoref))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AutoRefSmall.yqls b/yql/essentials/tests/s-expressions/suites/Result/AutoRefSmall.yqls
deleted file mode 100644
index 6c7ca6eabd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/AutoRefSmall.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1low '('('autoref))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AutoRefTwoTables.yqls b/yql/essentials/tests/s-expressions/suites/Result/AutoRefTwoTables.yqls
deleted file mode 100644
index f4c7304639..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/AutoRefTwoTables.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source '((Key '('table (String 'Input))) (Key '('table (String 'Input)))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('take '1) '('autoref))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Empty.yqls b/yql/essentials/tests/s-expressions/suites/Result/Empty.yqls
deleted file mode 100644
index 3a0cc2e5e5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/Empty.yqls
+++ /dev/null
@@ -1,3 +0,0 @@
-(
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/LastInTempTable.yqls b/yql/essentials/tests/s-expressions/suites/Result/LastInTempTable.yqls
deleted file mode 100644
index 29dc7a9481..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/LastInTempTable.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let res_sink (DataSink 'result))
-(let data (Skip table1low (- (Max (Uint64 '1) (Length table1low)) (Uint64 '1))))
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTable.yqls b/yql/essentials/tests/s-expressions/suites/Result/LengthOfTable.yqls
deleted file mode 100644
index c6c4df1772..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTable.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Length table1) '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTempTable.yqls b/yql/essentials/tests/s-expressions/suites/Result/LengthOfTempTable.yqls
deleted file mode 100644
index 34a926b1dc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTempTable.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (Length table1low) '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yqls b/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yqls
index 215ec6bf79..e8ec58fbea 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (AsList (Uint32 '3) (Uint32 '5) (Uint32 '7) (Uint32 '10)))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PagedTable.yqls b/yql/essentials/tests/s-expressions/suites/Result/PagedTable.yqls
deleted file mode 100644
index 1a7772c21f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PagedTable.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Skip table1 (Uint64 '1)))
-(let table1 (Take table1 (Uint64 '2)))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ParseType.yqls b/yql/essentials/tests/s-expressions/suites/Result/ParseType.yqls
index 13c3e97d5b..4c61eb8570 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ParseType.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/ParseType.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t (ParseType '"(List<Int32?>,Struct<'b':Dict<Int32,Double>,'a':Int32>)->Tuple<String,Uint64>"))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Pickle.yqls b/yql/essentials/tests/s-expressions/suites/Result/Pickle.yqls
index ff6b2d9159..b4dc45bae8 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Pickle.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/Pickle.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let vt1 (VariantType (TupleType (DataType 'Int32) (DataType 'String))))
 (let vt2 (VariantType (StructType '('x (DataType 'Int32)) '('y (DataType 'String)))))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullColumns.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullColumns.yqls
deleted file mode 100644
index 110fdcc060..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullColumns.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('columns '('value 'subkey)) '('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullColumnsFiltered.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullColumnsFiltered.yqls
deleted file mode 100644
index 01484b19ae..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullColumnsFiltered.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let res_sink (DataSink 'result))
-(let mr_sink (DataSink 'yt 'plato))
-(let world (Write! world res_sink (Key) table '('('type) '('ref) '('columns '('value 'key)))))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullDict.cfg b/yql/essentials/tests/s-expressions/suites/Result/PullDict.cfg
deleted file mode 100644
index 8a0f058a3b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullDict.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input dict.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullDict.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullDict.yqls
deleted file mode 100644
index c3b00f1716..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullDict.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.cfg b/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.cfg
deleted file mode 100644
index d1391bb33f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input struct.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.yqls
deleted file mode 100644
index b4e64a1d6d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (FlatMap table1 (lambda '(x) (AsList x x))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullKeyOnly.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullKeyOnly.yqls
deleted file mode 100644
index a71800ecf9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullKeyOnly.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) '('key) '()))
-(let world (Left! x))
-(let data (Right! x))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) data '('('type) '('autoref))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullNumbers.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullNumbers.yqls
deleted file mode 100644
index 8684754149..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullNumbers.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-# do not check tmp here (YQL-130, YQL-131)
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let yt.plato.Input (Right! x))
-(let select1_input3 yt.plato.Input)
-(let output5 (block '(
-  (let select1_output select1_input3)
-  (let select1_output (Map select1_output (lambda '(row) (block '(
-    (let res (Struct))
-    (let res (AddMember res 'x (Int64 '1)))
-    (return res)
-)
-))))
-  (let select1_output (Sort select1_output (Bool 'false) (lambda '(row) (block '(
-    (let res (Member row 'x))
-    (return res)
-)
-))))
-  (let select1_output (Take select1_output (Uint64 '2)))
-  (return select1_output)
-)
-))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) output5 '('('type) '('autoref))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullOverExactLimit.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullOverExactLimit.yqls
deleted file mode 100644
index 353d36313c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullOverExactLimit.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-(let result_sink (DataSink 'result))
-(let plato_sink (DataSink 'yt 'plato))
-
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let data (Take (Right! x) (Uint64 '3)))
-(let world (Write! world result_sink (Key) data '('('type) '('autoref) '('take '3))))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullOverLimit.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullOverLimit.yqls
deleted file mode 100644
index 4b7f4fc30c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullOverLimit.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let data (Take (Right! x) (Uint64 '3)))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) data '('('type) '('autoref) '('take '2))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.cfg b/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.cfg
deleted file mode 100644
index 068d78205f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input def_values.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.yqls
deleted file mode 100644
index 69f204a707..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) (Void) '('('infer_scheme))))
-(let world (Left! x))
-(let data (Take (Right! x) (Uint64 '3)))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) data '('('type) '('autoref) '('take '2))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithDirectRead.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullWithDirectRead.yqls
deleted file mode 100644
index 6c4b1851e0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithDirectRead.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) (Void) '('('direct_read))))
-(let world (Left! x))
-(let data (Take (Right! x) (Uint64 '3)))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) data '('('type) '('autoref) '('take '2))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.cfg b/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.cfg
deleted file mode 100644
index 94fcaf1f6f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input infer_scheme.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.yqls
deleted file mode 100644
index 69f204a707..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) (Void) '('('infer_scheme))))
-(let world (Left! x))
-(let data (Take (Right! x) (Uint64 '3)))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) data '('('type) '('autoref) '('take '2))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullYson.cfg b/yql/essentials/tests/s-expressions/suites/Result/PullYson.cfg
deleted file mode 100644
index e25ff9f9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullYson.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input yson.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullYson.yqls b/yql/essentials/tests/s-expressions/suites/Result/PullYson.yqls
deleted file mode 100644
index c3b00f1716..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/PullYson.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Pure.yqls b/yql/essentials/tests/s-expressions/suites/Result/Pure.yqls
index 9ad249ecf2..3ed0402c9f 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Pure.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/Pure.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let vt1 (VariantType (TupleType (DataType 'Int32) (DataType 'String))))
 (let vt2 (VariantType (StructType '('x (DataType 'Int32)) '('y (DataType 'String)))))
@@ -46,7 +45,7 @@
 (Variant (Int32 '7) '0 vt1)
 (Variant (String 'qwe) 'y vt2)
 ))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yqls b/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yqls
index 9fdf74cfdf..56bc82e5eb 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data '(
@@ -18,4 +17,4 @@
 (let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ReadAllFields.yqls b/yql/essentials/tests/s-expressions/suites/Result/ReadAllFields.yqls
deleted file mode 100644
index 77573dbc12..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/ReadAllFields.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Resource.yqls b/yql/essentials/tests/s-expressions/suites/Result/Resource.yqls
index 97aa87cca3..3494b73adc 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Resource.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/Resource.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let gen (NewMTRand (Uint64 '42)))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yqls b/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yqls
index cf2253c9bc..40c7ee38ba 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let row1 (AsStruct '('key (String 'key1)) '('subkey (String '.)) '('value (String 'value1))))
 (let row2 (AsStruct '('key (String 'key2)) '('subkey (String '.)) '('value (String 'value2))))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yqls b/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yqls
index 5be6c09045..78fbca4ed0 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let row1 (AsStruct '('key1 (String 'key1)) '('key2 (String '.)) '('aaa (String 'value1))))
 (let row2 (AsStruct '('key1 (String 'key2)) '('key2 (String '.)) '('aaa (String 'value2))))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yqls b/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yqls
index 4780768ff4..569af1f6e2 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let world (Write! world res_sink (Key) (Int32 '1) '()))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SimpleWrite.yqls b/yql/essentials/tests/s-expressions/suites/Result/SimpleWrite.yqls
deleted file mode 100644
index d91538e365..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/SimpleWrite.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SimpleWriteByRef.yqls b/yql/essentials/tests/s-expressions/suites/Result/SimpleWriteByRef.yqls
deleted file mode 100644
index b8fd35ae40..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/SimpleWriteByRef.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('ref))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SkipTableByTempTableLength.yqls b/yql/essentials/tests/s-expressions/suites/Result/SkipTableByTempTableLength.yqls
deleted file mode 100644
index 2924cf4e00..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/SkipTableByTempTableLength.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let res_sink (DataSink 'result))
-(let data (Skip table1 (- (Max (Uint64 '1) (Length table1low)) (Uint64 '1))))
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TableScheme.cfg b/yql/essentials/tests/s-expressions/suites/Result/TableScheme.cfg
deleted file mode 100644
index 94fcaf1f6f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/TableScheme.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input infer_scheme.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TableScheme.yqls b/yql/essentials/tests/s-expressions/suites/Result/TableScheme.yqls
deleted file mode 100644
index e4180b783f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/TableScheme.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '('('infer_scheme))
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TableSchemeNotFail.yqls b/yql/essentials/tests/s-expressions/suites/Result/TableSchemeNotFail.yqls
deleted file mode 100644
index 729098839b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/TableSchemeNotFail.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '(
-             '('do_not_fail_on_invalid_schema)
-        )
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yqls b/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yqls
index 66bf82a11d..6eda6dda4e 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let vt1 (VariantType (TupleType (DataType 'Int32) (DataType 'String))))
 (let vt2 (VariantType (StructType '('x (DataType 'Int32)) '('y (DataType 'String)))))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yqls b/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yqls
index c5def78d58..3416550806 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let x (Uint32 '1))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yqls b/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yqls
index 5b80134b73..1b7e2525ea 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let s1 (AsStruct '('a (Uint32 '1)) '('b (String 'qwe))))
diff --git a/yql/essentials/tests/s-expressions/suites/Result/WorldIf.yqls b/yql/essentials/tests/s-expressions/suites/Result/WorldIf.yqls
deleted file mode 100644
index a634dbecb2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/WorldIf.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let res_sink (DataSink 'result))
-
-(let world (Write! world res_sink (Key) (String '1) '()))
-(let world (If! world (Bool 'false) (Write! world res_sink (Key) table1low '()) world))
-(let world (Commit! world res_sink))
-
-(let world (Write! world res_sink (Key) (String '2) '()))
-(let world (If! world (Bool 'true) (Write! world res_sink (Key) table1low '()) world))
-(let world (Commit! world res_sink))
-
-(let world (Write! world res_sink (Key) (String '3) '()))
-(let world (If! world (<= (Length table1low) (Uint64 '1))
-   (Write! world res_sink (Key) table1low '()) 
-   (Write! world res_sink (Key) table1 '())))
-(let world (Commit! world res_sink))
-
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Yson.yqls b/yql/essentials/tests/s-expressions/suites/Result/Yson.yqls
index f978241cfc..3af8636e5a 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Yson.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Result/Yson.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let data (Yson '@@
diff --git a/yql/essentials/tests/s-expressions/suites/Result/def_values.txt b/yql/essentials/tests/s-expressions/suites/Result/def_values.txt
deleted file mode 100644
index 5a5fca5c32..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/def_values.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{"key"="1";value="3"};
-{"key"="2";value="4";"subkey"="123"};
diff --git a/yql/essentials/tests/s-expressions/suites/Result/def_values.txt.attr b/yql/essentials/tests/s-expressions/suites/Result/def_values.txt.attr
deleted file mode 100644
index de393c2dc7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/def_values.txt.attr
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "_yql_row_spec"={
-        "Type"=["StructType";[
-            ["key";["DataType";"String"]];
-            ["subkey";["DataType";"String"]];
-            ["value";["DataType";"String"]];
-        ]];
-        "DefaultValues"={"key"="\"\"";"subkey"="\"\"";"value"="\"\"";};
-    };
-    "schema"=<"strict" = %true> [
-        {"type"="string"; "name"="key"};
-        {"type"="string"; "name"="subkey"};
-        {"type"="string"; "name"="value"}
-    ]
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Result/default.cfg b/yql/essentials/tests/s-expressions/suites/Result/default.cfg
index fe2b19a9ff..00dec6c3f8 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Result/default.cfg
@@ -1,3 +1 @@
-in Input input.txt
-out Output output.txt
 res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Result/dict.txt b/yql/essentials/tests/s-expressions/suites/Result/dict.txt
deleted file mode 100644
index c189e76627..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/dict.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="075";"subkey"="1";"value"={"b"=11;"a"=1;}};
-{"key"="800";"subkey"="2";"value"={"a"=2;}};
-{"key"="020";"subkey"="3";"value"={}};
-{"key"="150";"subkey"="4";"value"={"b"=13;"a"=4;}};
-{"key"="075";"subkey"="5";"value"={"b"=14;"a"=5;}};
-{"key"="100";"subkey"="6";"value"={"c"=15;"a"=6;}};
diff --git a/yql/essentials/tests/s-expressions/suites/Result/dict.txt.attr b/yql/essentials/tests/s-expressions/suites/Result/dict.txt.attr
deleted file mode 100644
index 6dd8d28db1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/dict.txt.attr
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    ["DictType"; ["DataType";"String"]; ["DataType";"Int32"];]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Result/infer_scheme.txt b/yql/essentials/tests/s-expressions/suites/Result/infer_scheme.txt
deleted file mode 100644
index eff01d5cf2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/infer_scheme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd";"extra"=1u};
-{"key"="020";"subkey"="3";"value"="q";"extra"=1u};
-{"key"="150";"subkey"="4";"value"="qzz";"extra"=1u};
diff --git a/yql/essentials/tests/s-expressions/suites/Result/infer_scheme.txt.attr b/yql/essentials/tests/s-expressions/suites/Result/infer_scheme.txt.attr
deleted file mode 100644
index bbd3d58b0d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/infer_scheme.txt.attr
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "infer_schema" = %true;
-    "schema_mode" = "strong";
-    "schema" = <strict=%false>[
-        {"type"="string"; "name"="key"};
-    ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Result/input.txt b/yql/essentials/tests/s-expressions/suites/Result/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Result/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Result/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Result/struct.txt b/yql/essentials/tests/s-expressions/suites/Result/struct.txt
deleted file mode 100644
index c92d2d7733..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/struct.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="075";"subkey"="1";"value"={"b"=11u;"a"=1;}};
-{"key"="800";"subkey"="2";"value"={"a"=2;}};
-{"key"="020";"subkey"="3";"value"={"a"=7}};
-{"key"="150";"subkey"="4";"value"={"b"=13u;"a"=4;}};
-{"key"="075";"subkey"="5";"value"={"b"=14u;"a"=5;}};
-{"key"="100";"subkey"="6";"value"={"a"=6;"c"="foo"}};
diff --git a/yql/essentials/tests/s-expressions/suites/Result/struct.txt.attr b/yql/essentials/tests/s-expressions/suites/Result/struct.txt.attr
deleted file mode 100644
index 1b386b578c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/struct.txt.attr
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    ["StructType"; [["a";["DataType";"Int32"]]; ["b";["OptionalType";["DataType";"Uint32"];]]]]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Result/yson.txt b/yql/essentials/tests/s-expressions/suites/Result/yson.txt
deleted file mode 100644
index 925448ce22..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/yson.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{"key"="075";"subkey"="1";"value"={"a"=1;}};
-{"key"="075";"subkey"="1";"value"={"$b"=#;}};
-{"key"="075";"subkey"="1";"value"={"c"=2u;}};
-{"key"="075";"subkey"="1";"value"={"d"=4.1;}};
-{"key"="075";"subkey"="1";"value"={"e"=%true;}};
-{"key"="075";"subkey"="1";"value"={"f"=[1;<x=1>"english text"]}};
-{"key"="100";"subkey"="6";"value"={"g"=<u=2>{x=<v="\xff\xff binary">[];y="русский текст"}}};
diff --git a/yql/essentials/tests/s-expressions/suites/Result/yson.txt.attr b/yql/essentials/tests/s-expressions/suites/Result/yson.txt.attr
deleted file mode 100644
index 0c28bda505..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Result/yson.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "Yson"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/Bug635.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/Bug635.yqls
deleted file mode 100644
index d2aee30dd8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/Bug635.yqls
+++ /dev/null
@@ -1,46 +0,0 @@
-(
-(let world (block '(
-  (let values (block '(
-    (let values (Struct))
-    (let values (AddMember values '"key" ("Just" (Cast ("Minus" (Int64 '"1")) 'Int32))))
-    (let values (AddMember values '"x" (String '"2")))
-    (return (AsList values))
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'append))))
-    (return (Commit! world sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Output"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (block '(
-        (return (Aggregate core '('"key") '()))
-      )))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("ToString" ("Coalesce" (Member row '"key") (Int64 '"34")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (let plato_sink (DataSink '"yt" '"plato"))
-    (let world (Commit! world plato_sink))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.cfg
deleted file mode 100644
index ed153c6223..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.cfg
+++ /dev/null
@@ -1 +0,0 @@
-out Output empty.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.yqls
deleted file mode 100644
index 6c9fb4ca13..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.yqls
+++ /dev/null
@@ -1,4 +0,0 @@
-(
-    (let world (Write! world (DataSink '"yt" '"plato") (Key '('table (String '"Output"))) (Void) '('('mode 'drop))))
-    (return (Commit! world (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.cfg
deleted file mode 100644
index 2047856002..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-xfail
-in Input empty_row.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.yqls
deleted file mode 100644
index 2080bede74..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.yqls
+++ /dev/null
@@ -1,6 +0,0 @@
-(
-    (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '('('infer_scheme))))
-    (let result (DataSink 'result))
-    (let world (Write! (Left! x) result (Key) (FlatMap (Right! x) (lambda '(item) (AsList item))) '('('type) '('autoref))))
-    (return (Commit! (Commit! world result) (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.cfg
deleted file mode 100644
index 3091572fb8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-xfail
-in Input empty.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.yqls
deleted file mode 100644
index 921334c2cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.yqls
+++ /dev/null
@@ -1,6 +0,0 @@
-(
-    (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-    (let result (DataSink 'result))
-    (let world (Write! (Left! x) result (Key) (FlatMap (Right! x) (lambda '(item) (AsList item))) '('('type) '('autoref))))
-    (return (Commit! (Commit! world result) (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.cfg
deleted file mode 100644
index 1e9928289c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-xfail
-in Input no_scheme.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.yqls
deleted file mode 100644
index 921334c2cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.yqls
+++ /dev/null
@@ -1,6 +0,0 @@
-(
-    (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-    (let result (DataSink 'result))
-    (let world (Write! (Left! x) result (Key) (FlatMap (Right! x) (lambda '(item) (AsList item))) '('('type) '('autoref))))
-    (return (Commit! (Commit! world result) (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNames.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/FieldNames.yqls
deleted file mode 100644
index ab951ab11b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNames.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-# read data from Input table
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source
-    (Key '('table (String 'Input)))
-    '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-
-# filter keys less than 100
-(let tresh (Int32 '100))
-(let table1low (Map table1 (lambda '(item) (block '(
-   (let val (Struct))
-   (let val (AddMember val 'foo (Member item 'key)))   
-   (let val (AddMember val 'bar (Member item 'value)))   
-   (let ret (Struct))
-   (let ret (AddMember ret 'key (Member item 'value)))
-   (let ret (AddMember ret 'subkey (String '"")))
-   (let ret (AddMember ret 'value val))
-   (return ret)
-)))))
-
-# write table1low to result sink
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink
-    (Key)
-    table1low '()))
-
-# finish
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNamesAndTypes.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/FieldNamesAndTypes.yqls
deleted file mode 100644
index 9db3af4c99..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNamesAndTypes.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (FlatMap input (lambda '(item) (block '(
-     (let res (Struct))
-     (let res (AddMember res 'foo (Member item 'key)))
-     (let res (AddMember res 'bar (Member item 'subkey)))
-     (return (AsList res))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
-
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.cfg
deleted file mode 100644
index b156037a24..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.cfg
+++ /dev/null
@@ -1 +0,0 @@
-in Input ForceInferPragma.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.txt b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.txt
deleted file mode 100644
index 4f5501a315..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{"key"="023";"subkey"="3";"value"="aaa"};
-{"key"="037";"subkey"="5";"value"=1};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.txt.attr
deleted file mode 100644
index 376c9c6bf6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.txt.attr
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value1";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    };
-    "schema"=<"strict" = %false> [
-        {"type"="string"; "name"="key"};
-        {"type"="string"; "name"="subkey"};
-    ]
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.yqls
deleted file mode 100644
index 33f40d279a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.yqls
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-    (let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"forceinferschema" '"2"))
-    (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-    (let result (DataSink 'result))
-    (let world (Write! (Left! x) result (Key) (Right! x) '('('type) '('autoref))))
-    (return (Commit! (Commit! world result) (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.cfg
deleted file mode 100644
index 02f8cd81f4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input ForceInferSchemaSort.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.txt b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.txt
deleted file mode 100644
index 1e61934b94..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a"="a"; "b"="b"; "c"="c1"};
-{"a"="a"; "b"="b"; "c"="c2"};
-{"a"="a"; "b"="b"; "c"="c3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.txt.attr
deleted file mode 100644
index 35c55ae0f6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.txt.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "schema"=<"strict" = %true; "unique_keys" = %true>
-    [
-        {"type"="string"; "name"="a"; "sort_order"="ascending"};
-        {"type"="string"; "name"="b"; "sort_order"="ascending"};
-        {"type"="string"; "name"="c"; "sort_order"="ascending"}
-    ]
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.yqls
deleted file mode 100644
index 3ef24c07f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"forceinferschema" '""))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.cfg
deleted file mode 100644
index a02e32d085..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input ForceInferSchemaSortNullPrefix.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.txt b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.txt
deleted file mode 100644
index 01081ba8ce..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a"=#; "b"=#; "c"="c1"};
-{"a"="a"; "b"="b"; "c"="c2"};
-{"a"="a"; "b"="b"; "c"="c3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.txt.attr
deleted file mode 100644
index 35c55ae0f6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.txt.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "schema"=<"strict" = %true; "unique_keys" = %true>
-    [
-        {"type"="string"; "name"="a"; "sort_order"="ascending"};
-        {"type"="string"; "name"="b"; "sort_order"="ascending"};
-        {"type"="string"; "name"="c"; "sort_order"="ascending"}
-    ]
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.yqls
deleted file mode 100644
index 3ef24c07f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"forceinferschema" '""))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.cfg
deleted file mode 100644
index a956100087..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input ForceInferSchemaSortNullSuffix.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.txt b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.txt
deleted file mode 100644
index 449b660552..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a"="a"; "b"="b"; "c"=#};
-{"a"="a"; "b"="b"; "c"="c2"};
-{"a"="a"; "b"="b"; "c"="c3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.txt.attr
deleted file mode 100644
index 35c55ae0f6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.txt.attr
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "schema"=<"strict" = %true; "unique_keys" = %true>
-    [
-        {"type"="string"; "name"="a"; "sort_order"="ascending"};
-        {"type"="string"; "name"="b"; "sort_order"="ascending"};
-        {"type"="string"; "name"="c"; "sort_order"="ascending"}
-    ]
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.yqls
deleted file mode 100644
index 3ef24c07f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"forceinferschema" '""))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.cfg
deleted file mode 100644
index f11401b640..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input IgnoreWeakSchemaOnWeak.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.yqls
deleted file mode 100644
index aaf61a9163..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"ignoreweakschema" '""))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"forceinferschema" '""))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.cfg
deleted file mode 100644
index f11401b640..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input IgnoreWeakSchemaOnWeak.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.yqls
deleted file mode 100644
index 85f3775676..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.yqls
+++ /dev/null
@@ -1,18 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"ignoreweakschema" '""))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"inferschema" '""))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.cfg
deleted file mode 100644
index 1b9a911d74..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input IgnoreWeakSchemaOnStrong.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.txt b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.txt
deleted file mode 100644
index 1e61934b94..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a"="a"; "b"="b"; "c"="c1"};
-{"a"="a"; "b"="b"; "c"="c2"};
-{"a"="a"; "b"="b"; "c"="c3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.txt.attr
deleted file mode 100644
index c78fe74feb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.txt.attr
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "schema"=<"strict" = %false; "unique_keys" = %false>
-    [
-        {"type"="any"; "name"="a"; "sort_order"="ascending"};
-        {"type"="any"; "name"="b"; "sort_order"="ascending"};
-        {"type"="any"; "name"="c"; "sort_order"="ascending"}
-    ];
-    "schema_mode"="strong"
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.yqls
deleted file mode 100644
index 40addc79c3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"ignoreweakschema" '""))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.cfg
deleted file mode 100644
index 0c64f31555..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input IgnoreWeakSchemaOnWeak.txt
-xfail
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.txt b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.txt
deleted file mode 100644
index 1e61934b94..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a"="a"; "b"="b"; "c"="c1"};
-{"a"="a"; "b"="b"; "c"="c2"};
-{"a"="a"; "b"="b"; "c"="c3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.txt.attr
deleted file mode 100644
index 1574638558..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.txt.attr
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "schema"=<"strict" = %false; "unique_keys" = %false>
-    [
-        {"type"="any"; "name"="a"; "sort_order"="ascending"};
-        {"type"="any"; "name"="b"; "sort_order"="ascending"};
-        {"type"="any"; "name"="c"; "sort_order"="ascending"}
-    ];
-    "schema_mode"="weak"
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.yqls
deleted file mode 100644
index 40addc79c3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"ignoreweakschema" '""))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.cfg
deleted file mode 100644
index cfe28950fc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.cfg
+++ /dev/null
@@ -1 +0,0 @@
-in Input InferPragma.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.txt b/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.txt
deleted file mode 100644
index 4f5501a315..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{"key"="023";"subkey"="3";"value"="aaa"};
-{"key"="037";"subkey"="5";"value"=1};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.txt.attr
deleted file mode 100644
index 3c0f7e55c1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "infer_schema" = %true
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.yqls
deleted file mode 100644
index cd6fe7c84c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.yqls
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-    (let world (Configure! world (DataSource '"yt" '"$all") '"Attr" '"inferschema" '"2"))
-    (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-    (let result (DataSink 'result))
-    (let world (Write! (Left! x) result (Key) (Right! x) '('('type) '('autoref))))
-    (return (Commit! (Commit! world result) (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.cfg
deleted file mode 100644
index 5f5d93efe2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input dict.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.yqls
deleted file mode 100644
index c04cb6b397..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1low (Map table1 (lambda '(item) (block '(
-    (let s (Struct))
-    (let s (AddMember s 'key (Member item 'key)))
-    (let s (AddMember s 'subkey (Member item 'subkey)))
-    (let keys (DictKeys (Member item 'value)))
-    (let keys (Sort keys (Bool 'True) (lambda '(x) x)))
-    (let s (AddMember s 'value keys))
-    (return s)
-)))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1low '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.cfg
deleted file mode 100644
index 42f62f4dfb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input non_ksv_input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.yqls
deleted file mode 100644
index cc664b337a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"age" '"name") '()))
-(let data (lambda '(item) (block '(
-  (let s (Struct))
-  (let s (AddMember s '"age" (Cast (Member item '"age") 'Uint64)))
-  (let s (AddMember s '"name" (Member item '"name")))
-  (return (AsList s))
-))))
-(let data (FlatMap (Right! x) data))
-(let key (lambda '(item) (block '(
-  (let age (Member item '"age"))
-  (let name (Member item '"name"))
-  (return '(age name))
-))))
-(let res (Sort data '((Bool 'false) (Bool 'false)) key))
-(let mr_sink (DataSink '"yt" '"plato"))
-(let res (Write! (Left! x) mr_sink (Key '('table (String '"Output"))) res '('('mode 'append))))
-(return (Commit! res mr_sink))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.cfg
deleted file mode 100644
index bad9ad9043..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output empty.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.yqls
deleted file mode 100644
index ad8e17ad01..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.yqls
+++ /dev/null
@@ -1,5 +0,0 @@
-(
-    (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) (Void) '()))
-    (let world (Write! (Left! x) (DataSink '"yt" '"plato") (Key '('table (String '"Output"))) (FlatMap (Right! x) (lambda '(item) (AsList item))) '('('mode 'renew))))
-    (return (Commit! world (DataSink '"yt" '"plato")))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.cfg
deleted file mode 100644
index 4f895b9823..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input group_by_tuple_input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.yqls
deleted file mode 100644
index 5b0236af0c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let keySelector (lambda '(x) '((Member x 'value) (Member x 'subkey))))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key (Nth key '0)))
-  (let s (AddMember s 'subkey (Nth key '1)))
-  (let s (AddMember s 'value (ToString (Length list))))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let result (PartitionByKey table keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.yqls
deleted file mode 100644
index b6bb863891..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'value)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (ToString (Length list))))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValueAndMap.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValueAndMap.yqls
deleted file mode 100644
index bc7222e7e1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValueAndMap.yqls
+++ /dev/null
@@ -1,41 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let yt.plato.Input (Right! x))
-(let select@0:0_input yt.plato.Input)
-(let output (block '(
-  (let select@0:0_output (Map select@0:0_input (lambda '(row) (block '(
-    (let res (Struct))
-    (let res (AddMember res 'foo (Member row 'value)))
-    (let res (AddMember res 'bar (Member row 'key)))
-    (return res)
-)
-))))
-  (let select@0:0_output (PartitionByKey select@0:0_output (lambda '(row) (block '(
-    (let res (Member row 'foo))
-    (return res)
-)
-)) (Void) (Void) (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-    (let key (Nth pair '0))
-    (let group (Collect (Nth pair '1)))
-    (let res (FlatMap group (lambda '(row) (block '(
-      (let res (Struct))
-      (let res (AddMember res 'subkey (ToString (Length group))))
-      (let res (AddMember res 'value (Member row 'bar)))
-      (let res (AddMember res 'key (Member row 'foo)))
-      (let res (AsList res))
-      (return res)
-)
-))))
-    (return res)
-)))))
-))
-  (return select@0:0_output)
-)
-))
-(let output (Sort output (Bool 'true) (lambda '(x) (Concat (Member x 'subkey) (Member x 'value)))))
-(let sink (DataSink 'result))
-(let world (Write! world sink (Key) output '()))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.cfg
deleted file mode 100644
index 4f895b9823..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input group_by_tuple_input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.yqls
deleted file mode 100644
index acd5dca2d2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let keySelector (lambda '(x) '((Member x 'value) (Member x 'subkey))))
-(let result (PartitionsByKeys table keySelector (Void) (Void) (lambda '(x) x)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.yqls
deleted file mode 100644
index 227eeaa709..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'value)))
-(let reducedTable (PartitionsByKeys table1 keySelector (Void) (Void) (lambda '(x) x)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.cfg
deleted file mode 100644
index effc27a938..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-xfail
-in Input1 empty.txt
-in Input2 input.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.yqls
deleted file mode 100644
index 0d175c9469..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let filter (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input2")))))
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (MrTableRangeStrict '"" filter))) (Void) '('('infer_scheme))))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.cfg
deleted file mode 100644
index f3b77c80df..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input sort_input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.yqls
deleted file mode 100644
index 6c106597e1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-# do not check tmp here (YQL-130, YQL-131)
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let yt.plato.Input (Right! x))
-(let input yt.plato.Input)
-(let output (Sort input (Bool 'true) (lambda '(row) (block '(
-    (let res (Member row 'value))
-    (return res)
-)
-))))
-(let output (Take output (Uint64 '5)))
-(let sink (DataSink 'result))
-(let world (Write! world sink (Key) output '()))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.cfg
deleted file mode 100644
index f3b77c80df..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input sort_input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.yqls
deleted file mode 100644
index 01624bc527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (Sort input (Bool 'true) (lambda '(item) (block '(
-     (return (/ (FromString (Member item 'key) 'Double) (FromString (Member item 'subkey) 'Double)))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.cfg
deleted file mode 100644
index c9fc780575..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input desc_sort_input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.yqls
deleted file mode 100644
index 6b98c46713..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (Sort input (Bool 'false) (lambda '(item) (block '(
-     (return (Member item 'key))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.cfg
deleted file mode 100644
index f3b77c80df..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input sort_input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.yqls
deleted file mode 100644
index 3d74c7388a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (Sort input (Bool 'true) (lambda '(item) (block '(
-     (return (Member item 'value))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
-
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.cfg
deleted file mode 100644
index d1e6db2a43..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input doubles_input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.yqls
deleted file mode 100644
index 6508146c9e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (Sort input (Bool 'true) (lambda '(item) (block '(
-     (return (Coalesce (FromString (Member item 'key) 'Double) (Double '0)))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortInts.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortInts.yqls
deleted file mode 100644
index a2266c98de..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortInts.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (Sort input (Bool 'true) (lambda '(item) (block '(
-     (return (Coalesce (FromString (Member item 'subkey) 'Uint64) (Uint64 '0)))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuples.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortTuples.yqls
deleted file mode 100644
index 0275b2d11d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuples.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (Sort input '((Bool 'true) (Bool 'true)) (lambda '(item) (block '(
-     (return '((Member item 'value) (Member item 'subkey)))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.yqls
deleted file mode 100644
index 05e9777d03..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let input (Right! x))
-  (let output (Sort input '((Bool 'true) (Bool 'true)) (lambda '(item) (block '(
-     (return '((Member item 'value) (Member item 'subkey)))
-  )))))
-  (return output)
-)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.cfg
deleted file mode 100644
index 590d6de49e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input unique_keys.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.yqls
deleted file mode 100644
index c65fa8f8ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.cfg
deleted file mode 100644
index 5318593448..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input unique_keys_strip.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.yqls
deleted file mode 100644
index c65fa8f8ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-
-(let x (Read! world mr_source
-    (Key '('tablescheme (String 'Input)))
-    (Void) '()
-))
-
-(let world (Left! x))
-(let scheme (Right! x))
-
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.cfg
deleted file mode 100644
index e39613226c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 empty.txt
-in Input2 empty.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.yqls
deleted file mode 100644
index aa1ba5873c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let filter (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input2")))))
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (MrTableRange '"" filter))) (Void) '('('infer_scheme))))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.cfg
deleted file mode 100644
index abafdbeb96..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 empty.txt
-in Input2 input.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.yqls
deleted file mode 100644
index aa1ba5873c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.yqls
+++ /dev/null
@@ -1,33 +0,0 @@
-(
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(let world (block '(
-  (let filter (lambda '(name) (And (>= name (String '"Input1")) (<= name (String '"Input2")))))
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (MrTableRange '"" filter))) (Void) '('('infer_scheme))))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsList row))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WriteNumbers.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/WriteNumbers.yqls
deleted file mode 100644
index d9bfcea077..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WriteNumbers.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-(let output5 (block '(
-  (let row (Struct))
-  (let row (AddMember row 'x (Int64 '1)))
-  (let row (AddMember row 'y (Int64 '2)))
-  (let row (AddMember row 'z (Int64 '3)))
-  (let insert1_output (AsList row))
-  (return insert1_output)
-)
-))
-(let sink (DataSink 'yt 'plato))
-(let world (Write! world sink (Key '('table (String 'Output))) output5 '('('mode 'append))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.cfg
deleted file mode 100644
index d611f0155e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-out Output2 output2.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.yqls b/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.yqls
deleted file mode 100644
index 7af6edc4ca..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.yqls
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(let output1 (block '(
-  (let row (Struct))
-  (let row (AddMember row 'x (String 'abc)))
-  (let row (AddMember row 'y (Int32 '2)))
-  (let row (AddMember row 'z (Int64 '3)))
-  (let insert1_output (AsList row))
-  (return insert1_output)
-)
-))
-(let sink (DataSink 'yt 'plato))
-(let world (Write! world sink (Key '('table (String 'Output))) output1 '('('mode 'append))))
-(let world (Commit! world sink))
-(let source (DataSource 'yt 'plato))
-(let x (Read! world source (Key '('table (String 'Output))) '('y) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let world (Write! world sink (Key '('table (String 'Output2))) table1 '('('mode 'append))))
-(let world (Commit! world sink))
-(let x (Read! world source (Key '('table (String 'Output2))) (Void) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table2 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/default.cfg b/yql/essentials/tests/s-expressions/suites/Scheme/default.cfg
deleted file mode 100644
index fe2b19a9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/default.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/desc_sort_input.txt b/yql/essentials/tests/s-expressions/suites/Scheme/desc_sort_input.txt
deleted file mode 100644
index 48706ed4c9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/desc_sort_input.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="abc";"subkey"="1";"value"="075"};
-{"key"="ddd";"subkey"="2";"value"="800"};
-{"key"="q";"subkey"="3";"value"="020"};
-{"key"="qzz";"subkey"="4";"value"="150"};
-{"key"="qw";"subkey"="5";"value"="075"};
-{"key"="dddx";"subkey"="6";"value"="100"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/desc_sort_input.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/desc_sort_input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/desc_sort_input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/dict.txt b/yql/essentials/tests/s-expressions/suites/Scheme/dict.txt
deleted file mode 100644
index c189e76627..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/dict.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="075";"subkey"="1";"value"={"b"=11;"a"=1;}};
-{"key"="800";"subkey"="2";"value"={"a"=2;}};
-{"key"="020";"subkey"="3";"value"={}};
-{"key"="150";"subkey"="4";"value"={"b"=13;"a"=4;}};
-{"key"="075";"subkey"="5";"value"={"b"=14;"a"=5;}};
-{"key"="100";"subkey"="6";"value"={"c"=15;"a"=6;}};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/dict.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/dict.txt.attr
deleted file mode 100644
index 6dd8d28db1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/dict.txt.attr
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    ["DictType"; ["DataType";"String"]; ["DataType";"Int32"];]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/doubles_input.txt b/yql/essentials/tests/s-expressions/suites/Scheme/doubles_input.txt
deleted file mode 100644
index 54b881cf72..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/doubles_input.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{"key"="1";"subkey"="6";"value"="a"};
-{"key"="1.1";"subkey"="7";"value"="b"};
-{"key"="0.1";"subkey"="5";"value"="c"};
-{"key"="-1";"subkey"="2";"value"="d"};
-{"key"="-1.1";"subkey"="1";"value"="e"};
-{"key"="-0.1";"subkey"="3";"value"="f"};
-{"key"="0";"subkey"="4";"value"="z"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/doubles_input.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/doubles_input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/doubles_input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/empty.txt b/yql/essentials/tests/s-expressions/suites/Scheme/empty.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/empty.txt
+++ /dev/null
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/empty.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/empty.txt.attr
deleted file mode 100644
index ada1f836f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/empty.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "infer_schema"=%true
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/empty_row.txt b/yql/essentials/tests/s-expressions/suites/Scheme/empty_row.txt
deleted file mode 100644
index d268b7d3ae..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/empty_row.txt
+++ /dev/null
@@ -1 +0,0 @@
-{};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/empty_row.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/empty_row.txt.attr
deleted file mode 100644
index 3c0f7e55c1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/empty_row.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "infer_schema" = %true
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/group_by_tuple_input.txt b/yql/essentials/tests/s-expressions/suites/Scheme/group_by_tuple_input.txt
deleted file mode 100644
index 613ebe7f0d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/group_by_tuple_input.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
-{"key"="075";"subkey"="3";"value"="q"};
-{"key"="100";"subkey"="2";"value"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/group_by_tuple_input.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/group_by_tuple_input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/group_by_tuple_input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/input.txt b/yql/essentials/tests/s-expressions/suites/Scheme/input.txt
deleted file mode 100644
index 7d4ce31a5d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/input.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
-{"key"="075";"subkey"="5";"value"="q"};
-{"key"="100";"subkey"="6";"value"="ddd"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/no_scheme.txt b/yql/essentials/tests/s-expressions/suites/Scheme/no_scheme.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/no_scheme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/no_scheme.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/no_scheme.txt.attr
deleted file mode 100644
index 3c0f7e55c1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/no_scheme.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "infer_schema" = %true
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/non_ksv_input.txt b/yql/essentials/tests/s-expressions/suites/Scheme/non_ksv_input.txt
deleted file mode 100644
index acb15b8973..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/non_ksv_input.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"age"="30";"name"="bob"};
-{"age"="16";"name"="alice"};
-{"age"="55";"name"="jone"};
-{"age"="45";"name"="silver"};
-{"age"="45";"name"="smith"};
-{"age"="90";"name"="stive"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/non_ksv_input.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/non_ksv_input.txt.attr
deleted file mode 100644
index db02940d83..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/non_ksv_input.txt.attr
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["age";["DataType";"String"]];["name";["DataType";"String"]]]]}
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/sort_input.txt b/yql/essentials/tests/s-expressions/suites/Scheme/sort_input.txt
deleted file mode 100644
index fe02ecfe9e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/sort_input.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
-{"key"="075";"subkey"="5";"value"="qw"};
-{"key"="100";"subkey"="6";"value"="dddx"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/sort_input.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/sort_input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/sort_input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys.txt b/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys.txt
deleted file mode 100644
index 6e7e05cd2e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a"="a"; "b"="b"; c="c1"};
-{"a"="a"; "b"="b"; c="c2"};
-{"a"="a"; "b"="b"; c="c3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys.txt.attr
deleted file mode 100644
index 8d0816e3f5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys.txt.attr
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "_read_schema"=<"strict"=%false>
-    [
-        {"type"="string"; "name"="a"};
-        {"type"="string"; "name"="b"};
-        {"type"="string"; "name"="c"}
-    ];
-    "schema"=<"strict" = %true; "unique_keys" = %true>
-    [
-        {"type"="string"; "name"="a"; "sort_order"="ascending"};
-        {"type"="string"; "name"="b"; "sort_order"="ascending"};
-        {"type"="string"; "name"="c"; "sort_order"="ascending"}
-    ]
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys_strip.txt b/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys_strip.txt
deleted file mode 100644
index 6e7e05cd2e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys_strip.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"a"="a"; "b"="b"; c="c1"};
-{"a"="a"; "b"="b"; c="c2"};
-{"a"="a"; "b"="b"; c="c3"};
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys_strip.txt.attr b/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys_strip.txt.attr
deleted file mode 100644
index b709a3f991..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Scheme/unique_keys_strip.txt.attr
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "_read_schema"=<"strict"=%false>
-    [
-        {"type"="string"; "name"="a"};
-        {"type"="string"; "name"="b"}
-    ];
-    "schema"=<"strict" = %true; "unique_keys" = %true>
-    [
-        {"type"="string"; "name"="a"; "sort_order"="ascending"};
-        {"type"="string"; "name"="b"; "sort_order"="ascending"};
-        {"type"="string"; "name"="c"; "sort_order"="ascending"}
-    ]
-}
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.cfg
deleted file mode 100644
index 7e61f75847..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.yqls
deleted file mode 100644
index 2e63d28e6a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let preMap (lambda '(item) (Just item)))
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let init (lambda '(key item) (FromString (Member item 'subkey) 'Uint32)))
-(let update (lambda '(key item state) (+ state (FromString (Member item 'subkey) 'Uint32))))
-(let finish (lambda '(key state) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (Coalesce (Map state (lambda '(x) (ToString x))) (String '""))))
-  (return (Just s))
-))))
-(let table2 (CombineByKey table1 preMap keyExtractor init update finish))
-(let mr_sink (DataSink 'yt 'plato))
-(let result (Sort table2 (Bool 'true) (lambda '(x) (Member x 'key))))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.cfg
deleted file mode 100644
index 7e61f75847..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.yqls
deleted file mode 100644
index 4957a8671d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let preMap (lambda '(item) (Iterator (AsList item))))
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let init (lambda '(key item) (FromString (Member item 'subkey) 'Uint32)))
-(let update (lambda '(key item state) (+ state (FromString (Member item 'subkey) 'Uint32))))
-(let finish (lambda '(key state) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (Coalesce (Map state (lambda '(x) (ToString x))) (String '""))))
-  (return (Iterator (AsList s)))
-))))
-(let table2 (CombineByKey table1 preMap keyExtractor init update finish))
-(let mr_sink (DataSink 'yt 'plato))
-(let result (Sort table2 (Bool 'true) (lambda '(x) (Member x 'key))))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Drop.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Drop.yqls
deleted file mode 100644
index 72c7873e91..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Drop.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-(let mr_sink (DataSink 'yt 'plato))
-(let data (AsList (AsStruct '('key (String 'abc)))))
-
-(let world (Write! world mr_sink
-    (Key '('table (String 'Output)))
-    data '('('mode 'renew))
-))
-
-(let world (Commit! world mr_sink))
-
-(let world (Write! world mr_sink
-    (Key '('table (String 'Output)))
-    (Void) '('('mode 'drop))
-))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.cfg
deleted file mode 100644
index e98936751d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in InputEmpty input_empty.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.yqls
deleted file mode 100644
index fbe31a1f8f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'InputEmpty))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.cfg
deleted file mode 100644
index 7e61f75847..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.yqls
deleted file mode 100644
index c28ef4d035..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let list (Skip (Take (Enumerate list) (Uint64 '2)) (Uint64 '1)))
-  (let r (FlatMap list (lambda '(x) (block '(
-    (let s (Struct))
-    (let s (AddMember s 'key key))
-    (let s (AddMember s 'subkey (String '.)))
-    (let s (AddMember s 'value (Concat (ToString (Nth x '0)) (ToString (Member (Nth x '1) 'value)))))
-    (return (AsList s))
-  )))))
-  (return r)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void)listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Fill.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Fill.yqls
deleted file mode 100644
index e48c1f7a2f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Fill.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let data (AsList 
-(AsStruct '('key (String 'key1)) '('subkey (String '"")) '('value (String 'value1)))
-(AsStruct '('key (String 'key2)) '('subkey (String '"")) '('value (String 'value2)))
-))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FillWithCount.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FillWithCount.yqls
deleted file mode 100644
index 20f0cd1ac2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FillWithCount.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let data (AsList 
-(AsStruct '('key (String 'key1)) '('subkey (String '"")) '('value (String 'value1)))
-(AsStruct '('key (String 'key2)) '('subkey (String '"")) '('value (ToString (Length table1))))
-))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.cfg
deleted file mode 100644
index 7e61f75847..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.yqls
deleted file mode 100644
index a5be6f207c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Filter table1 (lambda '(x) (< (Member x 'key) (String '500)))))
-(let preMap (lambda '(item) (Just item)))
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let init (lambda '(key item) (FromString (Member item 'subkey) 'Uint32)))
-(let update (lambda '(key item state) (+ state (FromString (Member item 'subkey) 'Uint32))))
-(let finish (lambda '(key state) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (Coalesce (Map state (lambda '(x) (ToString x))) (String '""))))
-  (return (Just s))
-))))
-(let table2 (CombineByKey table1 preMap keyExtractor init update finish))
-(let result (Sort table2 (Bool 'true) (lambda '(x) (Member x 'key))))
-(let mr_sink (DataSink 'yt 'plato))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/IteratorInMap.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/IteratorInMap.yqls
deleted file mode 100644
index fcc89eb21c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/IteratorInMap.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let handler (lambda '(row) (block '(
-    (let value (Member row 'value))
-    (return (ReplaceMember row 'value (Collect (Iterator (AsList value value)))))
-  ))))
-(let data (Map table1 handler))
-(let data (Sort data (Bool 'true) (lambda '(row) (Member row 'key))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data '('('mode 'append))))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) data '('('type))))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LMapOverTable.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LMapOverTable.yqls
deleted file mode 100644
index f86f4c0c21..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LMapOverTable.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 '100))
-(let table1low (LMap table1 (lambda '(stream) (block '(
-   (return (FlatMap stream (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret))))))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTableInsideMap.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTableInsideMap.yqls
deleted file mode 100644
index ccbd5bbbb4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTableInsideMap.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let table3 (Map table1 (lambda '(item) (block '(
-    (let s (AsStruct 
-       '('key (Member item 'key))
-       '('subkey (ToString (Length table2)))
-       '('value (Member item 'value))
-    ))
-    
-    (return s)
-)))))
-
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table3 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTempTableInsideMap.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTempTableInsideMap.yqls
deleted file mode 100644
index d2e6fd6aec..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTempTableInsideMap.yqls
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-
-(let table2 (Map table1 (lambda '(item) (block '(
-    (let s (AsStruct 
-       '('key (Member item 'key))
-       '('subkey (ToString (Length table1low)))
-       '('value (Member item 'value))
-    ))
-    
-    (return s)
-)))))
-
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.cfg
deleted file mode 100644
index 8e3bf0495d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_other.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.yqls
deleted file mode 100644
index e8caad830b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('_other) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String 'abc))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let value (Lookup (Member item '_other) (String 'value)) )
-   (let ret (FlatMap value (lambda '(item2) (block '(
-      (return (ListIf (== item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.cfg
deleted file mode 100644
index 846f89d5a3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input1 input_other.txt
-in Input2 input_other_strict.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.yqls
deleted file mode 100644
index 772527f2f6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source '((Key '('table (String 'Input1))) (Key '('table (String 'Input2)))) '('_other) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String 'abc))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let value (Lookup (Member item '_other) (String 'value)) )
-   (let ret (FlatMap value (lambda '(item2) (block '(
-      (return (ListIf (== item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.cfg
deleted file mode 100644
index 23b0cd29bd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input_other_strict.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.yqls
deleted file mode 100644
index e8caad830b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('_other) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String 'abc))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let value (Lookup (Member item '_other) (String 'value)) )
-   (let ret (FlatMap value (lambda '(item2) (block '(
-      (return (ListIf (== item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapStream.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapStream.yqls
deleted file mode 100644
index e9fe1806e8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapStream.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 '100))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (Collect (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (Iterator (ListIf (< item2 tresh) item)))
-   ))))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MissingColumn.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MissingColumn.yqls
deleted file mode 100644
index 73e0d903b4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MissingColumn.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey2 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.yqls
deleted file mode 100644
index cb740182a1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 '100))
-(let table1low (OrderedLMap table1 (lambda '(stream) (block '(
-   (return (OrderedFlatMap stream (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret))))))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.cfg
deleted file mode 100644
index d87afdedc4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input program26.input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.yqls
deleted file mode 100644
index 2645b699e4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(groups) (block '(
-  (return (Map groups (lambda '(group) (block '(
-     (let key (Nth group '0))
-     (let stream (Nth group '1))
-     (let s (Struct))
-     (let s (AddMember s 'key key))
-     (let s (AddMember s 'subkey (String '.)))
-     (let s (AddMember s 'value (ToString (Length (ForwardList stream)))))
-     (return s)
-  )))))
-))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.cfg
deleted file mode 100644
index d87afdedc4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input program26.input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.yqls
deleted file mode 100644
index 88c71a6f9d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let sortKeySelector (lambda '(x) (Member x 'value)))
-(let listHandler (lambda '(groups) (block '(
-  (return (Map groups (lambda '(group) (block '(
-     (let key (Nth group '0))
-     (let stream (Nth group '1))
-     (let s (Struct))
-     (let s (AddMember s 'key key))
-     (let s (AddMember s 'subkey (String '.)))
-     (let s (AddMember s 'value (Collect (Condense stream (String '"") (lambda '(item state) (Bool 'False)) (lambda '(item state) (Concat (Concat state (String '" ")) (Member item 'value)))))))
-     (return s)
-  )))))
-))))
-(let reducedTable (PartitionByKey table1 keySelector (Bool 'false) sortKeySelector listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.cfg
deleted file mode 100644
index 7e61f75847..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.yqls
deleted file mode 100644
index 938bb3e859..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let handler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (ToString (Length list))))
-  (return (Iterator (AsList s)))
-))))))
-(let table2 (PartitionByKey table1 keyExtractor (Void) (Void) handler))
-(let mr_sink (DataSink 'yt 'plato))
-(let result (Sort table2 (Bool 'true) (lambda '(x) (Member x 'key))))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) result '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Skip.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Skip.yqls
deleted file mode 100644
index f7d625e18f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Skip.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let offset (Uint64 '1))
-(let table2 (Skip table1 offset))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SkipTakeThenMap.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SkipTakeThenMap.yqls
deleted file mode 100644
index 5af618e78f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SkipTakeThenMap.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1 (Skip table1 (Uint64 '1)))
-(let table1 (Take table1 (Uint64 '2))) 
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String '"")))
-   (let s (AddMember s 'value value))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SomeKeys.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SomeKeys.txt
deleted file mode 100644
index 6d0b5b4d40..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SomeKeys.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="075";"subkey"="2";"value"="abc2"};
-{"key"="075";"subkey"="3";"value"="abc3"};
-{"key"="800";"subkey"="4";"value"="ddd"};
-{"key"="020";"subkey"="5";"value"="q"};
-{"key"="150";"subkey"="6";"value"="qzz"};
-{"key"="150";"subkey"="7";"value"="zz"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SomeKeys.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SomeKeys.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SomeKeys.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/TableInsertCastList.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/TableInsertCastList.yqls
deleted file mode 100644
index ce2f6fa8eb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/TableInsertCastList.yqls
+++ /dev/null
@@ -1,53 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (Filter core (lambda '(row) (Coalesce ("<" (Member row '"key") (String '"100")) (Bool 'false)))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"value" (MatchType (Member row '"key") 'Optional (lambda '(item) (Coalesce (Map item (lambda '(val) (IfType val (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Just (Convert item '"Int64")))))) (Nothing (OptionalType (DataType '"Int64"))))) (lambda '(item) (IfType item (DataType 'String) (lambda '(item) (FromString item '"Int64")) (lambda '(item) (Convert item '"Int64")))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'append))))
-    (return (Commit! world sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let values (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (Filter core (lambda '(row) (Coalesce (">=" (Member row '"key") (String '"100")) (Bool 'false)))))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"value" (Int64 '"1")))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let sink (DataSink '"yt" '"plato"))
-    (let world (Write! world sink (Key '('table (String '"Output"))) values '('('mode 'append))))
-    (return (Commit! world sink))
-  )))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Take.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Take.yqls
deleted file mode 100644
index 6a8c55c92d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Take.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let limit (Uint64 '2))
-(let table2 (Take table1 limit))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.cfg
deleted file mode 100644
index 7e61f75847..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input SomeKeys.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.yqls
deleted file mode 100644
index 80371ba528..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (Collect (Nth pair '1)))
-  (let list (Zip list (Skip list (Uint64 '1))))
-  (let r (FlatMap list (lambda '(x) (block '(
-    (let s (Struct))
-    (let s (AddMember s 'key key))
-    (let s (AddMember s 'subkey (String '.)))
-    (let s (AddMember s 'value (Concat (Member (Nth x '0) 'value) (ToString (Member (Nth x '1) 'value)))))
-    (return (AsList s))
-  )))))
-  (return r)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/default.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/default.cfg
deleted file mode 100644
index d481615947..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/default.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-in Input2 input.txt
-out Output2 output2.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input2.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input2.txt
deleted file mode 100644
index 3803cb8d65..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{"key"="a";"subkey"="1";"value"="b"};
-{"key"="c";"subkey"="2";"value"="d"};
-{"key"="e";"subkey"="3";"value"="f"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input2.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input2.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_empty.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_empty.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_empty.txt
+++ /dev/null
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_empty.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_empty.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_empty.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other.txt.attr
deleted file mode 100644
index 8cc87a0668..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "schema" = <
-        "strict" = %false;
-        "unique_keys" = %false
-    >
-    [{
-        "name" = "key";
-        "type" = "string"
-    }];         
-}
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other_strict.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other_strict.txt
deleted file mode 100644
index b043b210b0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other_strict.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"_other"=[["subkey";"1"];["value";"abc"]]};
-{"key"="800";"_other"=[["subkey";"2"];["value";"ddd"]]};
-{"key"="020";"_other"=[["subkey";"3"];["value";"q"]]};
-{"key"="150";"_other"=[["subkey";"4"];["value";"qzz"]]};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other_strict.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other_strict.txt.attr
deleted file mode 100644
index e7d68f4eea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/input_other_strict.txt.attr
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "_yql_row_spec" = {"Type" = [
-        "StructType";
-        [
-            [
-                "_other";
-                [
-                    "DictType";
-                    [
-                        "DataType";
-                        "String"
-                    ];
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ];
-            [
-                "key";
-                [
-                    "DataType";
-                    "Yson"
-                ]
-            ]
-        ]
-    ]};
-}
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program1.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program1.yqls
deleted file mode 100644
index 47e3d28b9e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program1.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 'x"64000000"))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let ret (FlatMap intValueOpt (lambda '(item2) (block '(
-      (return (ListIf (< item2 tresh) item))
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program10.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program10.yqls
deleted file mode 100644
index 8abd57a84b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program10.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let table1low2 (Filter table1low (lambda '(item2) (> (Member item2 'value) (String 'd)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program11.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program11.yqls
deleted file mode 100644
index 746ca7e40b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program11.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (ToString (+ (Int32 '100) (Int32 '200))))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program12.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program12.yqls
deleted file mode 100644
index 56a3ae6931..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program12.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1low (Filter table1 (lambda '(item) (block '(
-  (let tresh (String '100))
-  (let predicate (< (Member item 'key) tresh))
-  (return predicate)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program13.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program13.yqls
deleted file mode 100644
index 1b3276e796..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program13.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let data (block '(
-  (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-  (let world (Left! x))
-  (let table1 (Right! x))
-  (let tresh (String '100))
-  (let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-  (return table1low)
-)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) data '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program14.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program14.yqls
deleted file mode 100644
index 218e366ef9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program14.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-(let sink (DataSink 'yt 'plato))
-(let source (DataSource 'yt 'plato))
-(let table (Right! (Read! world source (Key '('table (String 'Input))) '('key 'subkey 'value) '())))
-(let filter (lambda '(item) (block '(
-  (let res (And (> (Member item 'value) (String 'd)) (< (Member item 'key) (String '100))))
-  (return res)
-)
-)))
-(let table (Filter table filter))
-(let world (Write! world sink (Key '('table (String 'Output))) table '('('mode 'append))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program15.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program15.yqls
deleted file mode 100644
index de5a1d5a47..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program15.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let table1low2 (Filter table1low (lambda '(item) (> (Member item 'key) (String '050)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program16.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program16.yqls
deleted file mode 100644
index 0347e8bef3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program16.yqls
+++ /dev/null
@@ -1,20 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let table1new (Map table1low (lambda '(item) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key (Concat (String '*) (Member item 'key))))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (String '.)))
-  (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1new '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program17.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program17.yqls
deleted file mode 100644
index de6ff0054b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program17.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (FlatMap table1 (lambda '(item) (ListIf (< (Member item 'key) tresh) item))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program18.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program18.yqls
deleted file mode 100644
index 60ab38e5e0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program18.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let table1new (Map table1low (lambda '(item) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key (Concat (String '*) (Member item 'key))))
-  (return s)
-)))))
-(let table1new2 (Map table1new (lambda '(item) (block '(
-  (let s (AddMember item 'subkey (String '.)))
-  (let s (AddMember s 'value (String '.)))
-  (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1new2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program19.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program19.yqls
deleted file mode 100644
index 0bd4afc826..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program19.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let table1new (Map table1low (lambda '(item) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key (Concat (String '*) (Member item 'key))))
-  (return s)
-)))))
-(let table1new2 (FlatMap table1new (lambda '(item) (block '(
-  (let s (AddMember item 'value (String '.)))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AsList s))
-  (let s (Extend s s))
-  (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1new2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.cfg
deleted file mode 100644
index 3ad8212f69..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-in Input2 input2.txt
-out Output output1.txt
-out Output2 output2.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.yqls
deleted file mode 100644
index 697af6afa2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1 '('('mode 'append))))
-(let x (Read! world mr_source (Key '('table (String 'Input2))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table2 (Right! x))
-(let world (Write! world mr_sink (Key '('table (String 'Output2))) table2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program20.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program20.yqls
deleted file mode 100644
index 237d4babc1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program20.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let table1new (Map table1low (lambda '(item) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key (Concat (String '*) (Member item 'key))))
-  (return s)
-)))))
-(let table1new2 (FlatMap table1new (lambda '(item) (block '(
-  (let s (AddMember item 'value (String '.)))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s1 (AsList s))
-  (let s (Append s1 s))
-  (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1new2 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program21.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program21.yqls
deleted file mode 100644
index 8492d10a4d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program21.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (String '100))
-(let table1low (Filter table1 (lambda '(item) (< (Member item 'key) tresh))))
-(let table1new (Map table1low (lambda '(item) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key (Concat (String '*) (Member item 'key))))
-  (return s)
-)))))
-(let table1new2 (FlatMap table1new (lambda '(item) (block '(
-  (let s (AddMember item 'value (String '.)))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s1 (AsList s))
-  (let s (Append s1 s))
-  (return s)
-)))))
-(let table1new3 (Filter table1new2 (lambda '(item) (> (Member item 'key) (String '*030)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1new3 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program22.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program22.yqls
deleted file mode 100644
index 76674f13da..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program22.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1sorted (Sort table1 (Bool 'true) (lambda '(item) (Member item 'key))))
-#(let table1sorted (Sort table1 (Tuple (Bool 'true) (Bool 'false)) (lambda '(item) (Tuple (Member item 'key) (Member item 'value)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1sorted '()))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program23.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program23.yqls
deleted file mode 100644
index 378711e378..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program23.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let tresh (Int32 '100))
-(let table1low (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let optPlus50 (Map intValueOpt (lambda '(item2) (+ (Int32 '50) item2))))
-   (let ret (FlatMap optPlus50 (lambda '(item2) (block '(
-      (let s (ListIf (< item2 tresh) item))
-      (return s)
-   )))))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program24.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program24.yqls
deleted file mode 100644
index 1c3c39d3ea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program24.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1even (FlatMap table1 (lambda '(item) (block '(
-   (let intValueOpt (FromString (Member item 'key) 'Int32))
-   (let equalsZero (lambda '(x) (== x (Int32 '0))))
-   (let isEven (lambda '(x) (Coalesce (Map (% x (Int32 '2)) equalsZero) (Bool 'false))))
-   (let filteredValue (Filter intValueOpt isEven))
-   (let ret (ListIf (Exists filteredValue) item))
-   (return ret)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1even '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.cfg
deleted file mode 100644
index d87afdedc4..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input program26.input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.input.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.input.txt
deleted file mode 100644
index 55183cdd00..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="0";"subkey"="1";"value"="abc"};
-{"key"="8";"subkey"="2";"value"="ddd"};
-{"key"="0";"subkey"="3";"value"="q"};
-{"key"="1";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.input.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.yqls
deleted file mode 100644
index 11dcbbbe57..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (ToString (Length list))))
-  (let ret (Just s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.cfg
deleted file mode 100644
index f23f5c9676..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input program27.input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.input.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.input.txt
deleted file mode 100644
index 55183cdd00..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="0";"subkey"="1";"value"="abc"};
-{"key"="8";"subkey"="2";"value"="ddd"};
-{"key"="0";"subkey"="3";"value"="q"};
-{"key"="1";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.input.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.yqls
deleted file mode 100644
index 2663ed1bb0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let revLen (Length (Reverse list)))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (ToString revLen)))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.cfg
deleted file mode 100644
index 6f69ec10ac..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input program28.input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.input.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.input.txt
deleted file mode 100644
index c59dba9c7b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.input.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{"key"="0";"subkey"="1";"value"="abc"};
-{"key"="1";"subkey"="2";"value"="qzz"};
-{"key"="2";"subkey"="3";"value"="uuu"};
-{"key"="0";"subkey"="4";"value"="aa"};
-{"key"="0";"subkey"="5";"value"="asd"};
-{"key"="0";"subkey"="6";"value"="asd"};
-{"key"="0";"subkey"="7";"value"="ss"};
-{"key"="0";"subkey"="8";"value"="ss"};
-{"key"="2";"subkey"="9";"value"="qqq"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.input.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.yqls
deleted file mode 100644
index 8ad311cd3c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.yqls
+++ /dev/null
@@ -1,26 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let list1 (Take list (Uint64 '5)))
-  (let list2 (Skip list (Uint64 '1)))
-  (let x (Concat (Concat (ToString (Length list1)) (String '"_")) (ToString (Length list2))))
-  (let s (AddMember s 'value (ToString x)))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.cfg b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.cfg
deleted file mode 100644
index 3123d957f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input program29.input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.input.txt b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.input.txt
deleted file mode 100644
index 684f20f67a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.input.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"="0";"subkey"="1";"value"="15"};
-{"key"="8";"subkey"="2";"value"="23"};
-{"key"="0";"subkey"="3";"value"="3"};
-{"key"="1";"subkey"="4";"value"="10"};
-{"key"="2";"subkey"="5";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.input.txt.attr b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.yqls
deleted file mode 100644
index 40a2407e1f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let ilist (FlatMap list (lambda '(item) (FromString (Member item 'value) 'Int32))))
-  (let sum (Fold ilist (Int32 '0) (lambda '(item state) (+ item state))))
-  (let s (AddMember s 'value (ToString sum)))
-  (let ret (AsList s))
-  (return ret)
-))))))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program8.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program8.yqls
deleted file mode 100644
index 894e1a15a1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program8.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program9.yqls b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program9.yqls
deleted file mode 100644
index 894e1a15a1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program9.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterTable.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/FilterTable.yqls
deleted file mode 100644
index 47e6d9a517..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterTable.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let table1 (Right! (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline)))))
-    (let tresh (String '300))
-    (let table1low (FlatMap table1 (lambda '(item) (block '(
-           (let intValueOpt (Member item 'key))
-           (return (ListIf (< intValueOpt tresh) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
-
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.cfg b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.cfg
deleted file mode 100644
index 386ab9ac7f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-udf string_udf
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.yqls
deleted file mode 100644
index 3d7eadd8df..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let strip (Udf 'String.Strip))
-    (let skip (Unwrap (Cast (Apply strip (String '" 4")) 'Uint64)))
-    (let table1 (Right! (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline) '('skip skip) '('take (Uint64 '3))))))
-    (let tresh (String '300))
-    (let table1low (FlatMap table1 (lambda '(item) (block '(
-           (let intValueOpt (Member item 'key))
-           (return (ListIf (< intValueOpt tresh) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
-
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithFields.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithFields.yqls
deleted file mode 100644
index e5293e0a57..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithFields.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let table1 (Right! (Read! world mr_source (Key '('table (String 'Input))) '('key 'value) '('('inline)))))
-    (let tresh (String '300))
-    (let table1low (FlatMap table1 (lambda '(item) (block '(
-           (let intValueOpt (Member item 'key))
-           (return (ListIf (< intValueOpt tresh) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
-
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithTake.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithTake.yqls
deleted file mode 100644
index e0d516738d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithTake.yqls
+++ /dev/null
@@ -1,15 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let table1 (Right! (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline) '('take (Uint64 '3))))))
-    (let tresh (String '300))
-    (let table1low (FlatMap table1 (lambda '(item) (block '(
-           (let intValueOpt (Member item 'key))
-           (return (ListIf (< intValueOpt tresh) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) table1low '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
-
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/InsideCombine.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/InsideCombine.yqls
deleted file mode 100644
index 529cd9be35..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/InsideCombine.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let mrtc (Right! (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline)))))
-    (let filter (FlatMap mrtc (lambda '(item) (block '(
-           (let value (Member item 'value))
-           (return (ListIf (< value (String 'qqq)) item))
-    )))))
-    (let filter (ToDict mrtc (lambda '(x) (Member x 'value)) (lambda '(x) (Member x 'subkey)) '('Hashed 'One 'Compact)))
-
-    (let preMap (lambda '(item) (Just item)))
-    (let keyExtractor (lambda '(item) (Member item 'key)))
-    (let init (lambda '(key item) (Contains filter (Member item 'value))))
-    (let update (lambda '(key item state) (And state (Contains filter (Member item 'value)))))
-    (let finish (lambda '(key state) (block '(
-        (let s (Struct))
-        (let s (AddMember s 'key key))
-        (let s (AddMember s 'subkey (String '.)))
-        (let s (AddMember s 'value (ToString state)))
-        (return (Just s))
-    ))))
-    (let out (CombineByKey table1 preMap keyExtractor init update finish))
-
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/InsideMap.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/InsideMap.yqls
deleted file mode 100644
index 1c9999ee3a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/InsideMap.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let mrtc (Right! (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline)))))
-    (let mrtc (FlatMap mrtc (lambda '(item) (block '(
-           (let key (Member item 'key))
-           (return (ListIf (> key (String '100)) item))
-    )))))
-    (let filter (ToDict mrtc (lambda '(x) (Member x 'key)) (lambda '(x) (Member x 'value)) '('Hashed 'One 'Compact)))
-
-    (let tresh (String '500))
-    (let out (FlatMap table1 (lambda '(item) (block '(
-           (let key (Member item 'key))
-           (return (ListIf (And (< key tresh) (Contains filter key)) item))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/InsideReduce.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/InsideReduce.yqls
deleted file mode 100644
index 71d61c2a0c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/InsideReduce.yqls
+++ /dev/null
@@ -1,31 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let mrtc (Right! (Read! world mr_source (Key '('table (String 'Input))) (Void) '('('inline)))))
-    (let mrtc (FlatMap mrtc (lambda '(item) (block '(
-           (let value (Member item 'value))
-           (return (ListIf (< value (String 'qqq)) item))
-    )))))
-    (let filter (ToDict mrtc (lambda '(x) (Member x 'value)) (lambda '(x) (Member x 'subkey)) '('Hashed 'One 'Compact)))
-
-    (let keySelector (lambda '(x) (Member x 'key)))
-    (let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-        (let key (Nth pair '0))
-        (let list (ForwardList (Nth pair '1)))
-        (let r (FlatMap list (lambda '(item) (block '(
-            (return (ListIf (Contains filter (Member item 'value)) item))
-        )))))
-        (return (FlatListIf (< key (String '500)) r))
-    ))))))
-    (let out (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-    (let out (Sort out (Bool 'true) (lambda '(x) (Member x 'key))))
-
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.cfg b/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.cfg
deleted file mode 100644
index d14bf78557..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-in Input1 input_other.txt
-in Input2 input_other_strict.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.yqls
deleted file mode 100644
index adde05c66d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let r (Right! (Read! world mr_source '((Key '('table (String 'Input1))) (Key '('table (String 'Input2)))) '('_other) '('('inline)))))
-
-    (let out (FlatMap table1 (lambda '(item) (block '(
-        (let key (Member item 'key))
-        (return (Map r (lambda '(x) (block '(
-            (let value (Lookup (Member x '_other) (String 'value)))
-            (return (AsStruct '('key key) '('value value))) 
-        )))))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.cfg b/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.cfg
deleted file mode 100644
index 2372a67784..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-in Input1 input_other.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.yqls
deleted file mode 100644
index 5ef7216f81..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let r (Right! (Read! world mr_source (Key '('table (String 'Input1))) '('_other) '('('inline)))))
-
-    (let out (FlatMap table1 (lambda '(item) (block '(
-        (let key (Member item 'key))
-        (return (Map r (lambda '(x) (block '(
-            (let value (Lookup (Member x '_other) (String 'value)))
-            (return (AsStruct '('key key) '('value value))) 
-        )))))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.cfg b/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.cfg
deleted file mode 100644
index 938bc7ecfc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-in Input1 input_other_strict.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.yqls b/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.yqls
deleted file mode 100644
index 5ef7216f81..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-    #comment
-    (let mr_source (DataSource 'yt 'plato))
-    (let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-    (let world (Left! x))
-    (let table1 (Right! x))
-
-    (let r (Right! (Read! world mr_source (Key '('table (String 'Input1))) '('_other) '('('inline)))))
-
-    (let out (FlatMap table1 (lambda '(item) (block '(
-        (let key (Member item 'key))
-        (return (Map r (lambda '(x) (block '(
-            (let value (Lookup (Member x '_other) (String 'value)))
-            (return (AsStruct '('key key) '('value value))) 
-        )))))
-    )))))
-    (let mr_sink (DataSink 'yt 'plato))
-    (let world (Write! world mr_sink (Key '('table (String 'Output))) out '('('mode 'append))))
-    (let world (Commit! world mr_sink))
-    (return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/default.cfg b/yql/essentials/tests/s-expressions/suites/TableContent/default.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/default.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/input.txt b/yql/essentials/tests/s-expressions/suites/TableContent/input.txt
deleted file mode 100644
index d1fa0973d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/input.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{"key"="075";"subkey"=".";"value"="abc"};
-{"key"="911";"subkey"=".";"value"="kkk"};
-{"key"="023";"subkey"=".";"value"="aaa"};
-{"key"="527";"subkey"=".";"value"="bbb"};
-{"key"="037";"subkey"=".";"value"="ddd"};
-{"key"="761";"subkey"=".";"value"="ccc"};
-{"key"="200";"subkey"=".";"value"="qqq"};
-{"key"="150";"subkey"=".";"value"="zzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/input.txt.attr b/yql/essentials/tests/s-expressions/suites/TableContent/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/input_other.txt b/yql/essentials/tests/s-expressions/suites/TableContent/input_other.txt
deleted file mode 100644
index 65949ea745..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/input_other.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="abc"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="qzz"};
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/input_other.txt.attr b/yql/essentials/tests/s-expressions/suites/TableContent/input_other.txt.attr
deleted file mode 100644
index 371a0d6ec2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/input_other.txt.attr
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "schema" = <
-        "strict" = %false;
-        "unique_keys" = %false
-    >
-    [{
-        "name" = "key";
-        "type" = "string"
-    }];
-}
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/input_other_strict.txt b/yql/essentials/tests/s-expressions/suites/TableContent/input_other_strict.txt
deleted file mode 100644
index b043b210b0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/input_other_strict.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"_other"=[["subkey";"1"];["value";"abc"]]};
-{"key"="800";"_other"=[["subkey";"2"];["value";"ddd"]]};
-{"key"="020";"_other"=[["subkey";"3"];["value";"q"]]};
-{"key"="150";"_other"=[["subkey";"4"];["value";"qzz"]]};
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/input_other_strict.txt.attr b/yql/essentials/tests/s-expressions/suites/TableContent/input_other_strict.txt.attr
deleted file mode 100644
index e7d68f4eea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TableContent/input_other_strict.txt.attr
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "_yql_row_spec" = {"Type" = [
-        "StructType";
-        [
-            [
-                "_other";
-                [
-                    "DictType";
-                    [
-                        "DataType";
-                        "String"
-                    ];
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ];
-            [
-                "key";
-                [
-                    "DataType";
-                    "Yson"
-                ]
-            ]
-        ]
-    ]};
-}
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ahead.yqls b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ahead.yqls
deleted file mode 100644
index b555f9f06c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ahead.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())))
-(let inputFlow (ToFlow (PersistableRepr (OrderedSqlProject $2 '((SqlProjectStarItem (TypeOf $2) '"" (lambda '($4) $4) '()))))))
-(let timeOrderRecover (TimeOrderRecover
-    inputFlow
-    (lambda '($3)  (Member $3 '"ts"))
-    (Interval '-10)
-    (Interval '5)
-    (Uint32 '12)
-))
-(let $3 (Write! world $1 (Key)(ForwardList timeOrderRecover)'('('type) '('autoref))))
-(return (CommitAll! (Commit! $3 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/default.cfg b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/default.cfg
deleted file mode 100644
index 58878f8945..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/default.cfg
+++ /dev/null
@@ -1 +0,0 @@
-in Input input.txt
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/delayed.yqls b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/delayed.yqls
deleted file mode 100644
index e72c6ab87e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/delayed.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())))
-(let inputFlow (ToFlow (PersistableRepr (OrderedSqlProject $2 '((SqlProjectStarItem (TypeOf $2) '"" (lambda '($4) $4) '()))))))
-(let timeOrderRecover (TimeOrderRecover
-    inputFlow
-    (lambda '($3)  (Member $3 '"ts"))
-    (Interval '-8)
-    (Interval '10)
-    (Uint32 '12)
-))
-(let $3 (Write! world $1 (Key)(ForwardList timeOrderRecover)'('('type) '('autoref))))
-(return (CommitAll! (Commit! $3 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path.yqls b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path.yqls
deleted file mode 100644
index 6e247b28bd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())))
-(let inputFlow (ToFlow (PersistableRepr (OrderedSqlProject $2 '((SqlProjectStarItem (TypeOf $2) '"" (lambda '($4) $4) '()))))))
-(let timeOrderRecover (TimeOrderRecover
-    inputFlow
-    (lambda '($3)  (Member $3 '"ts"))
-    (Interval '-10)
-    (Interval '10)
-    (Uint32 '20)
-))
-(let $3 (Write! world $1 (Key)(ForwardList timeOrderRecover)'('('type) '('autoref))))
-(return (CommitAll! (Commit! $3 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path_tighter.yqls b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path_tighter.yqls
deleted file mode 100644
index 3844a8e284..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path_tighter.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())))
-(let inputFlow (ToFlow (PersistableRepr (OrderedSqlProject $2 '((SqlProjectStarItem (TypeOf $2) '"" (lambda '($4) $4) '()))))))
-(let timeOrderRecover (TimeOrderRecover
-    inputFlow
-    (lambda '($3)  (Member $3 '"ts"))
-    (Interval '-9)
-    (Interval '10)
-    (Uint32 '12)
-))
-(let $3 (Write! world $1 (Key)(ForwardList timeOrderRecover)'('('type) '('autoref))))
-(return (CommitAll! (Commit! $3 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input.txt b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input.txt
deleted file mode 100644
index 995734fc7d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-{"ts"=1000u; "col1"="a"};
-{"ts"=1009u; "col1"="aaa"};
-{"ts"=1001u; "col1"="a"};
-{"ts"=1003u; "col1"="aaa"};
-{"ts"=1002u; "col1"="aa"};
-{"ts"=1005u; "col1"="aa"};
-{"ts"=1004u; "col1"="a"};
-{"ts"=1006u; "col1"="aaa"};
-{"ts"=1015u; "col1"="aa"};
-{"ts"=1007u; "col1"="a"};
-{"ts"=1008u; "col1"="aa"};
-{"ts"=1010u; "col1"="aa"};
-{"ts"=1011u; "col1"="aaa"};
-{"ts"=1012u; "col1"="aa"};
-{"ts"=1013u; "col1"="aaa"};
-{"ts"=1014u; "col1"="a"};
-{"ts"=1016u; "col1"="aaa"};
-{"ts"=1017u; "col1"="aaa"};
-{"ts"=1018u; "col1"="a"};
-{"ts"=1019u; "col1"="aaa"};
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input.txt.attr b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input.txt.attr
deleted file mode 100644
index 63d77d6812..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input.txt.attr
+++ /dev/null
@@ -1,6 +0,0 @@
-{"_yql_row_spec"={
-    "Type"=["StructType";[
-        ["ts";["DataType";"Timestamp"]];
-	["col1";["DataType";"String"]];
-    ]];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input_ordering.txt b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input_ordering.txt
deleted file mode 100644
index 1363c953b6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input_ordering.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{"ts"=1000u; "col1"="a1"};
-{"ts"=1000u; "col1"="a2"};
-{"ts"=1000u; "col1"="a3"};
-{"ts"=1000u; "col1"="a4"};
-{"ts"=1000u; "col1"="a5"};
-{"ts"=1001u; "col1"="b1"};
-{"ts"=1001u; "col1"="b2"};
-{"ts"=1001u; "col1"="b3"};
-{"ts"=1001u; "col1"="b4"};
-{"ts"=1001u; "col1"="b5"};
-{"ts"=1002u; "col1"="c1"};
-{"ts"=1002u; "col1"="c2"};
-{"ts"=1002u; "col1"="c3"};
-{"ts"=1002u; "col1"="c4"};
-{"ts"=1002u; "col1"="c5"};
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input_ordering.txt.attr b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input_ordering.txt.attr
deleted file mode 100644
index 63d77d6812..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/input_ordering.txt.attr
+++ /dev/null
@@ -1,6 +0,0 @@
-{"_yql_row_spec"={
-    "Type"=["StructType";[
-        ["ts";["DataType";"Timestamp"]];
-	["col1";["DataType";"String"]];
-    ]];
-}}
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.cfg b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.cfg
deleted file mode 100644
index 144fceddb1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.cfg
+++ /dev/null
@@ -1 +0,0 @@
-in Input input_ordering.txt
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.yqls b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.yqls
deleted file mode 100644
index 840af03240..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())))
-(let inputFlow (ToFlow (PersistableRepr (OrderedSqlProject $2 '((SqlProjectStarItem (TypeOf $2) '"" (lambda '($4) $4) '()))))))
-(let timeOrderRecover (TimeOrderRecover
-    inputFlow
-    (lambda '($3)  (Member $3 '"ts"))
-    (Interval '-10)
-    (Interval '10)
-    (Uint32 '100)
-))
-(let $3 (Write! world $1 (Key)(ForwardList timeOrderRecover)'('('type) '('autoref))))
-(return (CommitAll! (Commit! $3 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/row_limit.yqls b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/row_limit.yqls
deleted file mode 100644
index 1eec5d6236..0000000000
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/row_limit.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-(let $1 (DataSink 'result))
-(let $2 (Right! (Read! world (DataSource '"yt" '"plato") (MrTableConcat (Key '('table (String '"Input")))) (Void) '())))
-(let inputFlow (ToFlow (PersistableRepr (OrderedSqlProject $2 '((SqlProjectStarItem (TypeOf $2) '"" (lambda '($4) $4) '()))))))
-(let timeOrderRecover (TimeOrderRecover
-    inputFlow
-    (lambda '($3)  (Member $3 '"ts"))
-    (Interval '-10)
-    (Interval '10)
-    (Uint32 '3)
-))
-(let $3 (Write! world $1 (Key)(ForwardList timeOrderRecover)'('('type) '('autoref))))
-(return (CommitAll! (Commit! $3 $1)))
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.cfg b/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.cfg
deleted file mode 100644
index 9bed8d5096..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.yqls b/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.yqls
deleted file mode 100644
index 77573dbc12..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMap.yqls b/yql/essentials/tests/s-expressions/suites/Udf/AutoMap.yqls
deleted file mode 100644
index cd809a5881..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMap.yqls
+++ /dev/null
@@ -1,56 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("Apply" ("Udf" '"SimpleUdf.Increment") (Cast (Member row '"key") 'Uint32) (Int64 '"1"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("Apply" ("Udf" '"SimpleUdf.IncrementOpt") (Cast (Member row '"key") 'Uint32) (Int64 '"2"))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.cfg b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.cfg
deleted file mode 100644
index aa782f323c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.sql b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.sql
deleted file mode 100644
index 74baf57176..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-USE plato;
-
-$script = @@
-def f(x,y,z):
-  return x + y + z
-@@;
-
-$udf1=Python::f("(Int32{Flags:AutoMap},Int32{Flags:AutoMap},Int32{Flags:AutoMap})->Int32",$script);
-select $udf1(1,2,3);
-select $udf1(YQL::Just(1),2,3);
-select $udf1(YQL::Just(1),YQL::Just(2),3);
-select $udf1(YQL::Just(1),YQL::Just(2),YQL::Just(3));
-
-$udf2=Python::f("(Int32{Flags:AutoMap},Int32{Flags:AutoMap},Int32{Flags:AutoMap})->Int32?",$script);
-select $udf2(4,5,6);
-select $udf2(YQL::Just(4),5,6);
-select $udf2(YQL::Just(4),YQL::Just(5),6);
-select $udf2(YQL::Just(4),YQL::Just(5),YQL::Just(6));
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.yqls b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.yqls
deleted file mode 100644
index d1a4d9ccf8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.yqls
+++ /dev/null
@@ -1,206 +0,0 @@
-(
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let scriptudf0 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf1 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf2 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf3 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf4 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf5 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf6 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf7 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf0) (Int32 '"1") (Int32 '"2") (Int32 '"3")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf1) ("Just" (Int32 '"1")) (Int32 '"2") (Int32 '"3")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf2) ("Just" (Int32 '"1")) ("Just" (Int32 '"2")) (Int32 '"3")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf3) ("Just" (Int32 '"1")) ("Just" (Int32 '"2")) ("Just" (Int32 '"3"))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf4) (Int32 '"4") (Int32 '"5") (Int32 '"6")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf5) ("Just" (Int32 '"4")) (Int32 '"5") (Int32 '"6")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf6) ("Just" (Int32 '"4")) ("Just" (Int32 '"5")) (Int32 '"6")))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("Apply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1) '((DataType 'Int32) '"" '1)) scriptudf7) ("Just" (Int32 '"4")) ("Just" (Int32 '"5")) ("Just" (Int32 '"6"))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.cfg b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.cfg
deleted file mode 100644
index aa782f323c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.sql b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.sql
deleted file mode 100644
index fff1174f57..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-USE plato;
-
-$script = @@
-def f(x,y,z):
-  return x + y + z
-@@;
-
-$udf1=Python::f("(x:Int32{Flags:AutoMap},y:Int32{Flags:AutoMap},z:Int32{Flags:AutoMap})->Int32",$script);
-select $udf1(1 as x,2 as y,3 as z);
-select $udf1(YQL::Just(1) as x,2 as y,3 as z);
-select $udf1(YQL::Just(1) as x,YQL::Just(2) as y,3 as z);
-select $udf1(YQL::Just(1) as x,YQL::Just(2) as y,YQL::Just(3) as z);
-select $udf1(YQL::Just(1),YQL::Just(2) as y,YQL::Just(3) as z);
-select $udf1(YQL::Just(1),YQL::Just(2),YQL::Just(3) as z);
-
-$udf2=Python::f("(x:Int32{Flags:AutoMap},y:Int32{Flags:AutoMap},z:Int32{Flags:AutoMap})->Int32?",$script);
-select $udf2(4 as x,5 as y,6 as z);
-select $udf2(YQL::Just(4) as x,5 as y,6 as z);
-select $udf2(YQL::Just(4) as x,YQL::Just(5) as y,6 as z);
-select $udf2(YQL::Just(4) as x,YQL::Just(5) as y,YQL::Just(6) as z);
-select $udf2(YQL::Just(4),YQL::Just(5) as y,YQL::Just(6) as z);
-select $udf2(YQL::Just(4),YQL::Just(5),YQL::Just(6) as z);
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.yqls b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.yqls
deleted file mode 100644
index ce09dc0c3e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.yqls
+++ /dev/null
@@ -1,302 +0,0 @@
-(
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let scriptudf0 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf1 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf10 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf11 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf2 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf3 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf4 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf5 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf6 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf7 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf8 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(let scriptudf9 (String '@@
-def f(x,y,z):
-  return x + y + z
-@@))
-(import aggregate_module '"/lib/yql/aggregate.yqls")
-(import window_module '"/lib/yql/window.yqls")
-(import core_module '"/lib/yql/core.yqls")
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf0) '() (AsStruct '('x (Int32 '"1")) '('y (Int32 '"2")) '('z (Int32 '"3")))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf1) '() (AsStruct '('x ("Just" (Int32 '"1"))) '('y (Int32 '"2")) '('z (Int32 '"3")))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf2) '() (AsStruct '('x ("Just" (Int32 '"1"))) '('y ("Just" (Int32 '"2"))) '('z (Int32 '"3")))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf3) '() (AsStruct '('x ("Just" (Int32 '"1"))) '('y ("Just" (Int32 '"2"))) '('z ("Just" (Int32 '"3"))))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf4) '(("Just" (Int32 '"1"))) (AsStruct '('y ("Just" (Int32 '"2"))) '('z ("Just" (Int32 '"3"))))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((DataType 'Int32)) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf5) '(("Just" (Int32 '"1")) ("Just" (Int32 '"2"))) (AsStruct '('z ("Just" (Int32 '"3"))))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf6) '() (AsStruct '('x (Int32 '"4")) '('y (Int32 '"5")) '('z (Int32 '"6")))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf7) '() (AsStruct '('x ("Just" (Int32 '"4"))) '('y (Int32 '"5")) '('z (Int32 '"6")))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf8) '() (AsStruct '('x ("Just" (Int32 '"4"))) '('y ("Just" (Int32 '"5"))) '('z (Int32 '"6")))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf9) '() (AsStruct '('x ("Just" (Int32 '"4"))) '('y ("Just" (Int32 '"5"))) '('z ("Just" (Int32 '"6"))))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf10) '(("Just" (Int32 '"4"))) (AsStruct '('y ("Just" (Int32 '"5"))) '('z ("Just" (Int32 '"6"))))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let output (block '(
-    (let select (block '(
-      (let core (AsList (Uint32 '0)))
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (AsStruct '('"column0" ("NamedApply" (ScriptUdf 'Python3 '"f" (CallableType '() '((OptionalType (DataType 'Int32))) '((DataType 'Int32) 'x '1) '((DataType 'Int32) 'y '1) '((DataType 'Int32) 'z '1)) scriptudf11) '(("Just" (Int32 '"4")) ("Just" (Int32 '"5"))) (AsStruct '('z ("Just" (Int32 '"6"))))))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yqls b/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yqls
index 178b280ad6..d5d3fc5703 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yqls
@@ -1,14 +1,13 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let cachedType (CallableType '() '((DataType 'String)) '((OptionalType (DataType 'String)))))
 (let udf (Udf 'SimpleUdf.Echo (Void) (Void) '"" cachedType))
 (let x (String 'aaa))
 (let data (Apply udf x))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yqls b/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yqls
index 5d5a0989e0..32e7659e3a 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yqls
@@ -1,14 +1,13 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let fromString (Udf 'Callables.FromString))
 (let mul (Udf 'Callables.Mul))
 (let list (AsList (String '1) (String '2) (String '3) (String '4) (String '5)))
 (let data (Apply mul list fromString))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yqls b/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yqls
index aebf755663..bec272bdac 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yqls
@@ -1,12 +1,11 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let udf (Udf 'SimpleUdf.Echo))
 (let data (Map (AsList (String 'a) (String 'b)) udf))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yqls b/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yqls
index 817a744385..55e39bfa85 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let t1 (DataType 'Uint32))
@@ -9,10 +8,10 @@
 (let str (DataType 'String))
 (let s1 (StructType '('key str) '('subkey str) '('value str)))
 (let c1 (CallableType '() '(t1) '(o1) '(s1)))
-(let world (Write! world res_sink (Key) (FormatType c1) '()))
-(let world (Write! world res_sink (Key) (FormatType (CallableResultType c1)) '()))
-(let world (Write! world res_sink (Key) (FormatType (CallableArgumentType c1 '0)) '()))
-(let world (Write! world res_sink (Key) (FormatType (CallableArgumentType c1 '1)) '()))
+(let world (Write! world res_sink (Key) (FormatType c1) '('('type))))
+(let world (Write! world res_sink (Key) (FormatType (CallableResultType c1)) '('('type))))
+(let world (Write! world res_sink (Key) (FormatType (CallableArgumentType c1 '0)) '('('type))))
+(let world (Write! world res_sink (Key) (FormatType (CallableArgumentType c1 '1)) '('('type))))
 (let world (Commit! world res_sink))
 (return world)
-)
\ No newline at end of file
+)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.cfg b/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.cfg
deleted file mode 100644
index f493bfe9eb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-file custom_python.so yql/udfs/examples/custom_python/libcustom_python_udf.so
-os linux
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.yqls b/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.yqls
deleted file mode 100644
index a683757f68..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.yqls
+++ /dev/null
@@ -1,24 +0,0 @@
-(
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-# prepare python udf
-(let world (Configure! world (DataSource 'config) 'ImportUdfs 'custom_python.so))
-
-(let json (DataType 'Json))
-(let udfType (CallableType '() '(json) '(json)))
-(let udfScript (String '"from custom_python.foo import bar"))
-(let udf (ScriptUdf 'CustomPython 'bar udfType udfScript))
-
-# call udf
-(let x (Json '@@{"abc":1}@@))
-(let result (Apply udf x))
-
-# output result with type
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '( '('type) )))
-
-# finish
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.cfg b/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.cfg
deleted file mode 100644
index 240cfb2bf5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-file myfile yql/essentials/udfs/test/test_import/libtest_import_udf.so
-res result.txt
-os linux
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.yqls b/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.yqls
deleted file mode 100644
index e9da004a74..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.yqls
+++ /dev/null
@@ -1,23 +0,0 @@
-# not supported on windows
-(
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-# (1) import udfs from 'myfile'
-(let config (DataSource 'config))
-(let world (Configure! world config 'ImportUdfs 'myfile))
-# (2) execute 'TestImportUdf.Concat'
-(let name (String 'Jamel))
-(let hello (Udf 'TestImportUdf.Concat))
-(let foo_data (Apply hello (String '"Hello, ") name))
-
-# (3) execute 'TestImportUdf.Repeat'
-(let bar_data (Apply (Udf 'TestImportUdf.Repeat) (String 'x) (Uint64 '3)))
-
-# (4) output results
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) foo_data '('('type))))
-(let world (Write! world res_sink (Key) bar_data '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yqls b/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yqls
index 082da79b04..4b3f097595 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list (AsList (String 'A) (String 'B) (String 'C) (String 'D) (String 'E)))
@@ -19,7 +18,7 @@
 ))
 (let func (lambda '(item state) (Concat state item)))
 (let data (Apply fold list state func))
-(let world (Write! world res_sink (Key) data '()))
+(let world (Write! world res_sink (Key) data '('('type))))
 (let world (Commit! world res_sink))
 (return world)
 )
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yqls b/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yqls
index adfa44066a..762d380389 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yqls
@@ -1,7 +1,6 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let f1 (lambda '(x y) (block '(
@@ -32,34 +31,34 @@
 (let strCall (Callable strType (lambda '() s1)))
 
 # lambdas
-(let world (Write! world res_sink (Key) (NamedApply f1 '((Uint32 '1) (Uint32 '2)) (AsStruct)) '()))
-(let world (Write! world res_sink (Key) (NamedApply f1dep '((Uint32 '1)) (AsStruct) (DependsOn (Uint32 '2))) '()))
+(let world (Write! world res_sink (Key) (NamedApply f1 '((Uint32 '1) (Uint32 '2)) (AsStruct)) '('('type))))
+(let world (Write! world res_sink (Key) (NamedApply f1dep '((Uint32 '1)) (AsStruct) (DependsOn (Uint32 '2))) '('('type))))
 
 # callables
-(let world (Write! world res_sink (Key) (NamedApply call '((Uint32 '1) (Uint32 '2)) (AsStruct)) '()))
-(let world (Write! world res_sink (Key) (NamedApply call (Apply tuple_call) (AsStruct)) '()))
+(let world (Write! world res_sink (Key) (NamedApply call '((Uint32 '1) (Uint32 '2)) (AsStruct)) '('('type))))
+(let world (Write! world res_sink (Key) (NamedApply call (Apply tuple_call) (AsStruct)) '('('type))))
 
 # opt. positional
-(let world (Write! world res_sink (Key) (NamedApply optCall '((Uint32 '1) (Uint32 '2)) (AsStruct)) '()))
-(let world (Write! world res_sink (Key) (NamedApply optCall (Apply optTuple1) (AsStruct)) '()))
-(let world (Write! world res_sink (Key) (NamedApply optCall (Apply optTuple2) (AsStruct)) '()))
-(let world (Write! world res_sink (Key) (NamedApply optCall '((Uint32 '1)) (AsStruct)) '()))
+(let world (Write! world res_sink (Key) (NamedApply optCall '((Uint32 '1) (Uint32 '2)) (AsStruct)) '('('type))))
+(let world (Write! world res_sink (Key) (NamedApply optCall (Apply optTuple1) (AsStruct)) '('('type))))
+(let world (Write! world res_sink (Key) (NamedApply optCall (Apply optTuple2) (AsStruct)) '('('type))))
+(let world (Write! world res_sink (Key) (NamedApply optCall '((Uint32 '1)) (AsStruct)) '('('type))))
 
 # named
 (let world (Write! world res_sink (Key) (NamedApply call '((Uint32 '1)) (AsStruct 
 '('Arg2 (Uint32 '2))
-)) '()))
+)) '('('type))))
 
 (let world (Write! world res_sink (Key) (NamedApply call '() (AsStruct 
 '('Arg2 (Uint32 '2)) '('Arg1 (Uint32 '1))
-)) '()))
+)) '('('type))))
 
-(let world (Write! world res_sink (Key) (NamedApply call '() (Apply strCall)) '()))
+(let world (Write! world res_sink (Key) (NamedApply call '() (Apply strCall)) '('('type))))
 
 #opt. named
 (let world (Write! world res_sink (Key) (NamedApply optCall '() (AsStruct 
 '('Arg1 (Uint32 '1))
-)) '()))
+)) '('('type))))
 
 (let world (Commit! world res_sink))
 (return world)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedArgUdf.yqls b/yql/essentials/tests/s-expressions/suites/Udf/NamedArgUdf.yqls
deleted file mode 100644
index b32401ac2c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedArgUdf.yqls
+++ /dev/null
@@ -1,44 +0,0 @@
-(
-#comment
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let udf (Udf 'SimpleUdf.NamedArgs ))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf udf)) '('('type))))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1)) 
-  (AsStruct)) 
-'()))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1) (Uint32 '2)) 
-  (AsStruct)) 
-'()))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1)) 
-  (AsStruct '('C (Uint32 '3)))) 
-'()))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1)) 
-  (AsStruct '('C (Uint32 '3)) '('D (Uint32 '4)))) 
-'()))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1)) 
-  (AsStruct '('D (Uint32 '4)))) 
-'()))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1) (Uint32 '2)) 
-  (AsStruct '('D (Uint32 '4)))) 
-'()))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1) (Uint32 '2) (Uint32 '3)) 
-  (AsStruct)) 
-'()))
-(let world (Write! world res_sink (Key) (NamedApply udf 
-  '((Uint32 '1) (Uint32 '2) (Uint32 '3) (Uint32 '4)) 
-  (AsStruct))  
-'()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapName.yqls b/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapName.yqls
deleted file mode 100644
index 719a56a72d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapName.yqls
+++ /dev/null
@@ -1,60 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("NamedApply" ("Udf" '"SimpleUdf.Increment") '() (AsStruct
-          '('Arg1 (Cast (Member row '"key") 'Uint32)) '('Arg2 (Uint32 '"1"))
-        ))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("NamedApply" ("Udf" '"SimpleUdf.IncrementOpt") '() (AsStruct
-          '('Arg1 (Cast (Member row '"key") 'Uint32)) '('Arg2 (Uint32 '"2"))
-        ))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapPos.yqls b/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapPos.yqls
deleted file mode 100644
index 37c8674711..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapPos.yqls
+++ /dev/null
@@ -1,56 +0,0 @@
-(
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("NamedApply" ("Udf" '"SimpleUdf.Increment") '((Cast (Member row '"key") 'Uint32) (Uint32 '"1")) (AsStruct))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let x (Read! world (DataSource '"yt" '"plato") (Key '('table (String '"Input"))) '('"key") '()))
-  (let world (Left! x))
-  (let table0 (Right! x))
-  (let output (block '(
-    (let select (block '(
-      (let core table0)
-      (let core (FlatMap core (lambda '(row) (block '(
-        (let res (Struct))
-        (let res (AddMember res '"column0" ("NamedApply" ("Udf" '"SimpleUdf.IncrementOpt") '((Cast (Member row '"key") 'Uint32) (Uint32 '"2")) (AsStruct))))
-        (let res (AsList res))
-        (return res)
-      )))))
-      (return core)
-    )))
-    (return select)
-  )))
-  (let world (block '(
-    (let result_sink (DataSink 'result))
-    (let world (Write! world result_sink (Key) output '('('type) '('autoref) '('columns '('"column0")))))
-    (return (Commit! world result_sink))
-  )))
-  (return world)
-)))
-(let world (block '(
-  (let plato_sink (DataSink '"yt" '"plato"))
-  (let world (Commit! world plato_sink))
-  (return world)
-)))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.cfg b/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.cfg
deleted file mode 100644
index 956cb08312..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-udf stat_udf
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.yqls b/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.yqls
deleted file mode 100644
index affd7f4d55..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.yqls
+++ /dev/null
@@ -1,45 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let udfTDigest_Create (Udf 'Stat.TDigest_Create))
-(let udfTDigest_AddValue (Udf 'Stat.TDigest_AddValue))
-(let udfTDigest_GetPercentile (Udf 'Stat.TDigest_GetPercentile))
-(let udfTDigest_Serialize (Udf 'Stat.TDigest_Serialize))
-(let udfTDigest_Deserialize (Udf 'Stat.TDigest_Deserialize))
-(let udfTDigest_Merge (Udf 'Stat.TDigest_Merge))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (let x (Apply udfTDigest_Create (Double '1.0)))
-   (let y (Apply udfTDigest_Create (Double '2.0)))
-   (let jx (Just x))
-   (let jy (Just y))
-   (let n (Nothing (OptionalType (TypeOf x))))
-   (let handler (lambda '(x y) (Apply udfTDigest_Merge x y)))
-   (let newValue value)
-   (let newValue (Concat newValue (String '" => ")))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Map
-       (OptionalReduce jx jy handler) (lambda '(r) 
-       (ToString (Apply udfTDigest_GetPercentile r (Double '0.75))
-       ))) (String '?)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Map
-       (OptionalReduce jx n handler) (lambda '(r) 
-       (ToString (Apply udfTDigest_GetPercentile r (Double '0.75))
-       ))) (String '?)))))
-   (let newValue (Concat newValue (Concat (String '" ") (Coalesce (Map
-       (OptionalReduce n n handler) (lambda '(r) 
-       (ToString (Apply udfTDigest_GetPercentile r (Double '0.75))
-       ))) (String '?)))))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (Member item 'subkey)))
-   (let s (AddMember s 'value newValue))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.cfg b/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.cfg
deleted file mode 100644
index 57571ef968..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-udf simple_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.yqls b/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.yqls
deleted file mode 100644
index 8703e76e49..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let res_sink (DataSink 'result))
-(let x (String 'bbb))
-(let udf (Udf 'SimpleUdf.EchoWithRunPrefix (String 'aaa) (Void) '""))
-(let data (Apply udf x))
-(let world (Write! world res_sink (Key) data '()))
-(let udf (Udf 'SimpleUdf.EchoWithRunPrefix))
-(let data (Apply udf x))
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.cfg b/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.cfg
deleted file mode 100644
index 57571ef968..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-udf simple_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.yqls
deleted file mode 100644
index ce81c3df0d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let res_sink (DataSink 'result))
-(let udf (Udf 'SimpleUdf.EchoWithPrefix))
-(let x (String 'aaa))
-(let y (String 'bbb))
-(let data (Apply udf x))
-(let world (Write! world res_sink (Key) data '()))
-(let data (Apply udf x y))
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.cfg b/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.cfg
deleted file mode 100644
index 9bed8d5096..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.yqls
deleted file mode 100644
index 4e5766f779..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.cfg b/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.cfg
deleted file mode 100644
index 4de5e2339f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input Percentiles.txt
-out Output output.txt
-udf stat_udf
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.txt b/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.txt
deleted file mode 100644
index b500ea3b02..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="10"};
-{"key"="b";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="3"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.yqls b/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.yqls
deleted file mode 100644
index 0a15c6095a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.yqls
+++ /dev/null
@@ -1,45 +0,0 @@
-(
-#comment
-(let udfTDigest_Create (Udf 'Stat.TDigest_Create))
-(let udfTDigest_AddValue (Udf 'Stat.TDigest_AddValue))
-(let udfTDigest_GetPercentile (Udf 'Stat.TDigest_GetPercentile))
-(let udfTDigest_Serialize (Udf 'Stat.TDigest_Serialize))
-(let udfTDigest_Deserialize (Udf 'Stat.TDigest_Deserialize))
-(let udfTDigest_Merge (Udf 'Stat.TDigest_Merge))
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let preMap (lambda '(item) (Just item)))
-(let keyExtractor (lambda '(item) (Member item 'key)))
-(let init (lambda '(key item) (Apply udfTDigest_Create (Unwrap (FromString (Member item 'value) 'Double)))))
-(let update (lambda '(key item state) (Apply udfTDigest_AddValue state (Unwrap (FromString (Member item 'value) 'Double)))))
-(let finish (lambda '(key state) (block '(
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let s (AddMember s 'value (Apply udfTDigest_Serialize state)))
-  (return (Just s))
-))))
-(let table2 (CombineByKey table1 preMap keyExtractor init update finish))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (ForwardList (Nth pair '1)))
-  (let init (lambda '(item) (Apply udfTDigest_Deserialize (Member item 'value))))
-  (let update (lambda '(item state) (Apply udfTDigest_Merge (Apply udfTDigest_Deserialize (Member item 'value)) state)))
-  (let state (Unwrap (Fold1 list init update)))
-  (let s (Struct))
-  (let s (AddMember s 'key key))
-  (let s (AddMember s 'subkey (String '.)))
-  (let g1 (ToString (Apply udfTDigest_GetPercentile state (Double '0.75))))
-  (let g2 (ToString (Apply udfTDigest_GetPercentile state (Double '0.999))))
-  (let s (AddMember s 'value (Concat (Concat g1 (String '" ")) g2)))
-  (let ret (Just s))
-  (return ret)
-))))))
-(let table3 (PartitionByKey table2 keyExtractor (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt 'plato))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table3 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.cfg b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.cfg
deleted file mode 100644
index 8bd0a53757..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-udf pire_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.yqls
deleted file mode 100644
index 54c06596ad..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let udf (Udf 'Pire.Match (String '\d+)))
-(let table1map (Filter table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (return (Apply udf value))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.cfg b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.cfg
deleted file mode 100644
index d01e7622a0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf pire_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.yqls
deleted file mode 100644
index 90391c2264..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.yqls
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-#comment
-(let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
-
-(let res_sink (DataSink 'result))
-(let udf (Udf 'Pire.Match (String '.?\d.?)))
-(let world (Write! world res_sink (Key) (Apply udf (String 'abc)) '()))
-(let world (Write! world res_sink (Key) (Apply udf (String 'x6y)) '()))
-(let world (Write! world res_sink (Key) (FormatType (TypeOf udf)) '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.cfg b/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.cfg
deleted file mode 100644
index 8fa549ddb5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input_proto.txt
-udf protobuf_udf
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.yqls b/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.yqls
deleted file mode 100644
index c3b00f1716..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.cfg b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.cfg
deleted file mode 100644
index 8dd001f619..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input_proto_opt.txt
-udf protobuf_udf
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.yqls b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.yqls
deleted file mode 100644
index c3b00f1716..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.cfg b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.cfg
deleted file mode 100644
index 8fa549ddb5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input_proto.txt
-udf protobuf_udf
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.yqls b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.yqls
deleted file mode 100644
index 89ab89671f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('tablescheme (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yqls
index 9029469690..0afaa914a7 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let ui32 (DataType 'Uint32))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yqls
index 29a7d26a0a..55f7637e32 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # common types
 (let ui64 (DataType 'Uint64))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yqls
index 887526632b..740480b44c 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let ui64 (DataType 'Uint64))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yqls
index b6e6a00171..d4e9cd2906 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let i64 (DataType 'Int64))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yqls
index 164f870ec8..b09c6f6fb5 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let i64 (DataType 'Int64))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yqls
index 2c9a022cae..24132e3c4b 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let i64 (DataType 'Int64))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yqls
index 1a7f7f9dbd..c06a9f502c 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let ui32 (DataType 'Uint32))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yqls
index 89e0bd435d..78dd5695a5 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let ui32 (DataType 'Uint32))
@@ -25,7 +24,7 @@ def NewPerson(name, age):
 
 # output result with type
 (let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) result '()))
+(let world (Write! world res_sink (Key) result '('('type))))
 
 # finish
 (let world (Commit! world res_sink))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yqls b/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yqls
index ef5f4e1549..1620adfeb9 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yqls
@@ -1,6 +1,5 @@
 (
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 # prepare python udf
 (let ui32 (DataType 'Uint32))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.cfg
deleted file mode 100644
index ce0f9208d8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input2.txt
-out Output output.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.yqls
deleted file mode 100644
index 894e1a15a1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.cfg
deleted file mode 100644
index cb892c3e09..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input2.txt
-out Output output.txt
-udf dummylog
-udf pire_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.yqls
deleted file mode 100644
index c3752b674e..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let udf (Udf 'Pire.Match (String '@@.*\d.*@@)))
-(let table1map (Filter table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (return (Apply udf value))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.cfg
deleted file mode 100644
index b6d398353a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-in Input input2.txt
-in Input2 input3.txt
-out Output output.txt
-udf dummylog
-udf pire_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.yqls
deleted file mode 100644
index 58c57253c1..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.yqls
+++ /dev/null
@@ -1,22 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source 
-'(
-(Key '('table (String 'Input))) 
-(Key '('table (String 'Input2))) 
-)
-
-'('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let udf (Udf 'Pire.Match (String '@@.*\d.*@@)))
-(let table1map (Filter table1 (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (return (Apply udf value))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.cfg
deleted file mode 100644
index cf41c46471..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-in Input1 input_many1.txt
-in Input2 input_many2.txt
-in Input3 input_many3.txt
-in Input4 input_many4.txt
-out Output output.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.yqls
deleted file mode 100644
index fad593cd98..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source 
-(Key '('table (MrTableRange '"" (lambda '($i) (And (>= $i (String '"Input1")) (<= $i (String '"Input~")))) '""))) 
-'('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableLimit (Take table (Uint64 '9)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tableLimit '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.cfg
deleted file mode 100644
index 227f4e34f7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-in Input1 input_many1.txt
-in Input2 input_many1.txt
-in Input3 input_many2.txt
-in Input4 input_many2.txt
-out Output output.txt
-udf dummylog
-udf pire_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.yqls
deleted file mode 100644
index d86392d08a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.yqls
+++ /dev/null
@@ -1,19 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source 
-(Key '('table (MrTableRange '"" (lambda '($i) (And (>= $i (String '"Input1")) (<= $i (String '"Input~")))) '""))) 
-'('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let udf (Udf 'Pire.Match (String '@@.*\d.*@@)))
-(let table (Filter table (lambda '(item) (block '(
-   (let value (Member item 'value))
-   (return (Apply udf value))
-)))))
-(let tableLimit (Take table (Uint64 '9)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tableLimit '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.cfg
deleted file mode 100644
index 076884ed54..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-in Input1 input_many1.txt
-in Input2 input_many1.txt
-in Input3 input_many1.txt
-in Input4 input_many1.txt
-out Output output.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.yqls
deleted file mode 100644
index fad593cd98..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source 
-(Key '('table (MrTableRange '"" (lambda '($i) (And (>= $i (String '"Input1")) (<= $i (String '"Input~")))) '""))) 
-'('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let tableLimit (Take table (Uint64 '9)))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) tableLimit '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.cfg
deleted file mode 100644
index ce0f9208d8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input2.txt
-out Output output.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.yqls
deleted file mode 100644
index df1bf89415..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.yqls
+++ /dev/null
@@ -1,25 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let listHandler (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-  (let key (Nth pair '0))
-  (let list (Collect (Nth pair '1)))
-  (let r (FlatMap list (lambda '(x) (block '(
-    (let s (Struct))
-    (let s (AddMember s 'key key))
-    (let s (AddMember s 'subkey (String '.)))
-    (let s (AddMember s 'value (ToString (Length list))))
-    (return (AsList s))
-  )))))
-  (return r)
-))))))
-(let keySelector (lambda '(x) (Member x 'key)))
-(let reducedTable (PartitionByKey table1 keySelector (Void) (Void) listHandler))
-(let mr_sink (DataSink 'yt 'plato))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) reducedTable '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.cfg
deleted file mode 100644
index ce0f9208d8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input2.txt
-out Output output.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.yqls
deleted file mode 100644
index 01df591aa8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.yqls
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let output (Sort table1 (Bool 'true) (lambda '(item) (block '(
-   (return (Member item 'key))
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) output '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.cfg
deleted file mode 100644
index 43da70bb81..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input2.txt
-out Output output.txt
-udf dummylog
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.yqls
deleted file mode 100644
index 09a346ac6d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (MrTableRange '"" (lambda '($i) (And (>= $i (String '"Input")) (<= $i (String '"Input~")))) '""))) '('key) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.cfg
deleted file mode 100644
index 5f1288aa57..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-out Output output.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.yqls
deleted file mode 100644
index ffc63f7bb5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1 '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.cfg b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.cfg
deleted file mode 100644
index 9bed8d5096..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.yqls b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.yqls
deleted file mode 100644
index b39a63ed36..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.cfg b/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.cfg
deleted file mode 100644
index c60ed039b2..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input5.txt
-udf structs_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.yqls b/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.yqls
deleted file mode 100644
index 2f14a89709..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let table (Right! x))
-(let sink (DataSink 'result))
-(let world (Write! world sink (Key) table '('('type))))
-(let world (Commit! world sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Sleep.cfg b/yql/essentials/tests/s-expressions/suites/Udf/Sleep.cfg
deleted file mode 100644
index 7cb3e39eea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/Sleep.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
-udf simple_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Sleep.yqls b/yql/essentials/tests/s-expressions/suites/Udf/Sleep.yqls
deleted file mode 100644
index 86d036c80f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/Sleep.yqls
+++ /dev/null
@@ -1,35 +0,0 @@
-(
-(let sleep (Udf 'SimpleUdf.Sleep))
-(let 01sec (Uint64 '100000))
-(let 05sec (Uint64 '500000))
-(let 03sec (Uint64 '300000))
-
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let data1 (Apply sleep (+ 05sec 01sec)))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String  '1)))
-   (let s (AddMember s 'value (ToString data1)))
-   (return s)
-)))))
-(let table2map (Map table1 (lambda '(item) (block '(
-   (let data1 (Apply sleep (+ 03sec 03sec)))
-   (let s (Struct))
-   (let s (AddMember s 'key (Member item 'key)))
-   (let s (AddMember s 'subkey (String  '2)))
-   (let s (AddMember s 'value (ToString data1)))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt 'plato))
-(let res_sink (DataSink 'result))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '()))
-(let world (Write! world res_sink (Key) table2map '()))
-(let world (Commit! world mr_sink))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.cfg b/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.cfg
deleted file mode 100644
index 386ab9ac7f..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-udf string_udf
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.yqls b/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.yqls
deleted file mode 100644
index 6085f8d620..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input))) '('key 'subkey 'value) '()))
-(let world (Left! x))
-(let table1 (Right! x))
-(let udf (Udf 'String.JoinFromList))
-(let table1map (Map table1 (lambda '(item) (block '(
-   (let key (Member item 'key))
-   (let value (Apply udf (AsList (Member item 'key) (Member item 'subkey) (Member item 'value)) (String '"_")))
-   (let s (Struct))
-   (let s (AddMember s 'key key))
-   (let s (AddMember s 'subkey (String '.)))
-   (let s (AddMember s 'value value))
-   (return s)
-)))))
-(let mr_sink (DataSink 'yt (quote plato)))
-(let world (Write! world mr_sink (Key '('table (String 'Output))) table1map '('('mode 'append))))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.cfg b/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.cfg
deleted file mode 100644
index 9bed8d5096..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.yqls b/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.yqls
deleted file mode 100644
index dd7da1dfb0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('tablescheme (String 'Input))) (Void) '()))
-(let world (Left! x))
-(let scheme (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) scheme '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.cfg b/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.cfg
deleted file mode 100644
index 38a048bf8d..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input TopFreq.txt
-out Output output.txt
-udf topfreq_udf
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.txt b/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.txt
deleted file mode 100644
index b500ea3b02..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="10"};
-{"key"="b";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="3"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="a";"subkey"=".";"value"="2"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
-{"key"="b";"subkey"=".";"value"="1"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.yqls b/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.yqls
index c5f7d2e123..3c8e821127 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.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/Udf/TypeInspection.yqls b/yql/essentials/tests/s-expressions/suites/Udf/TypeInspection.yqls
index eecfa7e41d..c38937c49f 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/TypeInspection.yqls
+++ b/yql/essentials/tests/s-expressions/suites/Udf/TypeInspection.yqls
@@ -1,17 +1,16 @@
 (
 #comment
 (let config (DataSource 'config))
-(let world (Configure! world config 'PureDataSource 'yt))
 
 (let res_sink (DataSink 'result))
 (let list1 (AsList (String 'A) (String 'B) (String 'C) (String 'D) (String 'E)))
 (let list2 (AsList (Uint32 '1) (Uint32 '2) (Uint32 '3)))
 (let zip (Udf 'TypeInspection.Zip (Void)
-	(TupleType
-		(TypeOf '(list1 list2))
-		(StructType)
-		(TupleType)
-	)
+    (TupleType
+        (TypeOf '(list1 list2))
+        (StructType)
+        (TupleType)
+    )
 ))
 (let data (Apply zip list1 list2))
 (let world (Write! world res_sink (Key) data '('('type))))
@@ -19,11 +18,11 @@
 (let stream1 (Iterator list1))
 (let stream2 (Iterator list2))
 (let interleave (Udf 'TypeInspection.Interleave (Void)
-	(TupleType
-		(TypeOf '(stream1 stream2))
-		(StructType)
-		(TupleType)
-	)
+    (TupleType
+        (TypeOf '(stream1 stream2))
+        (StructType)
+        (TupleType)
+    )
 ))
 (let data (Apply interleave stream1 stream2))
 (let world (Write! world res_sink (Key) (Collect data) '('('type))))
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/block_4_columns.csv b/yql/essentials/tests/s-expressions/suites/Udf/block_4_columns.csv
deleted file mode 100644
index 15956fb4fe..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/block_4_columns.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-a,b,c,d
-1,2,3,4
-one,two,three,four
-A,B,C,D
-
-E,F,G,dgf
-G,H,I,J
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/default.cfg b/yql/essentials/tests/s-expressions/suites/Udf/default.cfg
index 7cb3e39eea..8da645df35 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/default.cfg
+++ b/yql/essentials/tests/s-expressions/suites/Udf/default.cfg
@@ -1,4 +1,3 @@
-in Input input.txt
-out Output output.txt
 res result.txt
 udf simple_udf
+
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/file_3_columns.csv b/yql/essentials/tests/s-expressions/suites/Udf/file_3_columns.csv
deleted file mode 100644
index e4324930c7..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/file_3_columns.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-key,subkey,value
-String,String,String
-k1,sk1,v1
-k2,sk2,v2
-
-
-this line will be ignored
-
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input.txt b/yql/essentials/tests/s-expressions/suites/Udf/input.txt
deleted file mode 100644
index df76c64125..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="a7c"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="q8z"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input2.txt b/yql/essentials/tests/s-expressions/suites/Udf/input2.txt
deleted file mode 100644
index df76c64125..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="a7c"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="q8z"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input2.txt.attr
deleted file mode 100644
index c6f7f36696..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input2.txt.attr
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "_yql_read_udf"="DummyLog.ReadRecord";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input3.txt b/yql/essentials/tests/s-expressions/suites/Udf/input3.txt
deleted file mode 100644
index 090fe1cefd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="834";"subkey"="5";"value"="aa"};
-{"key"="987";"subkey"="6";"value"="798"};
-{"key"="124";"subkey"="7";"value"="001"};
-{"key"="623";"subkey"="8";"value"="002"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input3.txt.attr
deleted file mode 100644
index c6f7f36696..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input3.txt.attr
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "_yql_read_udf"="DummyLog.ReadRecord";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input4.txt b/yql/essentials/tests/s-expressions/suites/Udf/input4.txt
deleted file mode 100644
index 090fe1cefd..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="834";"subkey"="5";"value"="aa"};
-{"key"="987";"subkey"="6";"value"="798"};
-{"key"="124";"subkey"="7";"value"="001"};
-{"key"="623";"subkey"="8";"value"="002"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input4.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input4.txt.attr
deleted file mode 100644
index 5c5444bff8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input4.txt.attr
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "_yql_read_udf"="DummyLog.ReadRecord2";
-    "_yql_read_udf_type_config"="AAA";
-    "_yql_read_udf_run_config"="BBB";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input5.txt b/yql/essentials/tests/s-expressions/suites/Udf/input5.txt
deleted file mode 100644
index de514b7e8b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input5.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{"key"="Vasya";"subkey"="Pupkin";"value"="33"};
-{"key"="Naum";"subkey"="Prikhoder";"value"="66"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input5.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input5.txt.attr
deleted file mode 100644
index 6c072165b5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input5.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_read_udf"="Person.New";
-    "_yql_read_udf_type_config"="RemapKSV";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many1.txt b/yql/essentials/tests/s-expressions/suites/Udf/input_many1.txt
deleted file mode 100644
index 2fa12a4a52..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"="075";"subkey"="1_1";"value"="a7c"};
-{"key"="800";"subkey"="2_1";"value"="ddd"};
-{"key"="020";"subkey"="3_1";"value"="q"};
-{"key"="150";"subkey"="4_1";"value"="q8z"};
-{"key"="200";"subkey"="5_1";"value"="a7a"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many1.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input_many1.txt.attr
deleted file mode 100644
index 5f9afadd11..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many1.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_read_udf"="DummyLog.ReadRecord";
-    "_yql_read_udf_type_config"="1";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many2.txt b/yql/essentials/tests/s-expressions/suites/Udf/input_many2.txt
deleted file mode 100644
index 2b1bab42f8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many2.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-{"key"="075";"subkey"="1_2";"value"="a7c"};
-{"key"="800";"subkey"="2_2";"value"="ddd"};
-{"key"="020";"subkey"="3_2";"value"="q"};
-{"key"="150";"subkey"="4_2";"value"="q8z"};
-{"key"="200";"subkey"="5_2";"value"="a7a"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many2.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input_many2.txt.attr
deleted file mode 100644
index 4e7e0e6b62..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many2.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_read_udf"="DummyLog.ReadRecord";
-    "_yql_read_udf_type_config"="2";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many3.txt b/yql/essentials/tests/s-expressions/suites/Udf/input_many3.txt
deleted file mode 100644
index 2ce03b8925..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1_3";"value"="a7c"};
-{"key"="800";"subkey"="2_3";"value"="ddd"};
-{"key"="020";"subkey"="3_3";"value"="q"};
-{"key"="150";"subkey"="4_3";"value"="q8z"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many3.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input_many3.txt.attr
deleted file mode 100644
index f09165629a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many3.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_read_udf"="DummyLog.ReadRecord";
-    "_yql_read_udf_type_config"="3";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many4.txt b/yql/essentials/tests/s-expressions/suites/Udf/input_many4.txt
deleted file mode 100644
index c9f1e005d9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many4.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1_4";"value"="a7c"};
-{"key"="800";"subkey"="2_4";"value"="ddd"};
-{"key"="020";"subkey"="3_4";"value"="q"};
-{"key"="150";"subkey"="4_4";"value"="q8z"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_many4.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input_many4.txt.attr
deleted file mode 100644
index f491d07f59..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_many4.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_read_udf"="DummyLog.ReadRecord";
-    "_yql_read_udf_type_config"="4";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_proto.txt b/yql/essentials/tests/s-expressions/suites/Udf/input_proto.txt
deleted file mode 100644
index d2eaef7f29..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_proto.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"key"="1";"subkey"="\n\x10\x08\7\x12\x0C\n\ntext value";"value"="\n\x10\x08\7\x12\x0C\n\ntext value"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_proto.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input_proto.txt.attr
deleted file mode 100644
index f11824f2b8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_proto.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_proto_field_value"="{\"name\":\"TA\",\"meta\":\"H4sIAAAAAAAAA42Puw6CQBBFszw0DEp0Y4E2GmyolriJHyAPS6rVflFMTBCUR8Hn+KcuD0ui3WRy59wzcIJ1co9yntfOM8/KLKpuTv1KnKp0rqTdWBQk5uM5SEFhKhvZNqhKmE8CPAHF5yU30QbZmqUDCvAIpONuhmA/jL30WCywXsMI+SPuGJAOn0XdGVZDFhfl6qf1VuBdPAX1zJOq46vYAOSbkhh1Kosf4I2GC/mfhb3YcOD78EoYHfACkNva6FQjLZow11rCmJ3SqoivjaPXB4Sj9wEBmoL3ogEAAA==\",\"lists\":{\"optional\":true}}";
-    "_yql_proto_field_subkey"="{\"name\":\"TA\",\"meta\":\"H4sIAAAAAAAAA42Puw6CQBBFszw0DEp0Y4E2GmyolriJHyAPS6rVflFMTBCUR8Hn+KcuD0ui3WRy59wzcIJ1co9yntfOM8/KLKpuTv1KnKp0rqTdWBQk5uM5SEFhKhvZNqhKmE8CPAHF5yU30QbZmqUDCvAIpONuhmA/jL30WCywXsMI+SPuGJAOn0XdGVZDFhfl6qf1VuBdPAX1zJOq46vYAOSbkhh1Kosf4I2GC/mfhb3YcOD78EoYHfACkNva6FQjLZow11rCmJ3SqoivjaPXB4Sj9wEBmoL3ogEAAA==\",\"lists\":{\"optional\":true}}";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_proto_opt.txt b/yql/essentials/tests/s-expressions/suites/Udf/input_proto_opt.txt
deleted file mode 100644
index d2eaef7f29..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_proto_opt.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"key"="1";"subkey"="\n\x10\x08\7\x12\x0C\n\ntext value";"value"="\n\x10\x08\7\x12\x0C\n\ntext value"};
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/input_proto_opt.txt.attr b/yql/essentials/tests/s-expressions/suites/Udf/input_proto_opt.txt.attr
deleted file mode 100644
index ad3ff15521..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/input_proto_opt.txt.attr
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "_yql_row_spec"={"Type"=["StructType";[["key";["OptionalType";["DataType";"String"]]];["subkey";["OptionalType";["DataType";"String"]]];["value";["OptionalType";["DataType";"String"]]]]]};
-    "_yql_proto_field_value"="{\"name\":\"TA\",\"meta\":\"H4sIAAAAAAAAA42Puw6CQBBFszw0DEp0Y4E2GmyolriJHyAPS6rVflFMTBCUR8Hn+KcuD0ui3WRy59wzcIJ1co9yntfOM8/KLKpuTv1KnKp0rqTdWBQk5uM5SEFhKhvZNqhKmE8CPAHF5yU30QbZmqUDCvAIpONuhmA/jL30WCywXsMI+SPuGJAOn0XdGVZDFhfl6qf1VuBdPAX1zJOq46vYAOSbkhh1Kosf4I2GC/mfhb3YcOD78EoYHfACkNva6FQjLZow11rCmJ3SqoivjaPXB4Sj9wEBmoL3ogEAAA==\",\"lists\":{\"optional\":true}}";
-    "_yql_proto_field_subkey"="{\"name\":\"TA\",\"meta\":\"H4sIAAAAAAAAA42Puw6CQBBFszw0DEp0Y4E2GmyolriJHyAPS6rVflFMTBCUR8Hn+KcuD0ui3WRy59wzcIJ1co9yntfOM8/KLKpuTv1KnKp0rqTdWBQk5uM5SEFhKhvZNqhKmE8CPAHF5yU30QbZmqUDCvAIpONuhmA/jL30WCywXsMI+SPuGJAOn0XdGVZDFhfl6qf1VuBdPAX1zJOq46vYAOSbkhh1Kosf4I2GC/mfhb3YcOD78EoYHfACkNva6FQjLZow11rCmJ3SqoivjaPXB4Sj9wEBmoL3ogEAAA==\",\"lists\":{\"optional\":true}}";
-}
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/struct_4_fields.csv b/yql/essentials/tests/s-expressions/suites/Udf/struct_4_fields.csv
deleted file mode 100644
index fab478d14a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/Udf/struct_4_fields.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-F1I,F2OI,F3N,F4ON
-Int32,Uint32?,Float,Double?
-1,,1.5,3.1415926
-5,1,2.5,
--12,100,44,105
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.cfg b/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.cfg
deleted file mode 100644
index 2ac9312f92..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input1 input.txt
-in Input2 input6.txt
-in InputView input_view.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.yqls b/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.yqls
deleted file mode 100644
index 5a2597e5cc..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.yqls
+++ /dev/null
@@ -1,32 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-(let res_sink (DataSink 'result))
-(let source_any (DataSource 'yt '"$all"))
-
-(let world (Configure! world source_any '"Attr" '"inferschema" '"1"))
-(let world (Configure! world source_any '"Attr" '"maxrowweight" '"128m"))
-
-(let x1 (Read! world mr_source (Key
-    '('table (String 'InputView))
-) (Void) '()))
-
-(let world (Left! x1))
-(let data (Right! x1))
-
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-
-(let x2 (Read! world mr_source (Key
-    '('table (String 'InputView))
-) (Void) '()))
-
-(let world (Left! x2))
-(let data (Right! x2))
-
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/DsvCount.cfg b/yql/essentials/tests/s-expressions/suites/View/DsvCount.cfg
deleted file mode 100644
index db6c9d1b8c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/DsvCount.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input3.txt
-out Output output.txt
-res result.txt
-udf dsv_udf
diff --git a/yql/essentials/tests/s-expressions/suites/View/DsvCount.yqls b/yql/essentials/tests/s-expressions/suites/View/DsvCount.yqls
deleted file mode 100644
index 3fa0a24d9b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/DsvCount.yqls
+++ /dev/null
@@ -1,50 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) '('dict) '()))
-(let world (Left! x))
-(let Input (Right! x))
-(let select1_input11 Input)
-(let output12 (block '(
-  (let select1_output select1_input11)
-  (let select1_output (Filter select1_output (lambda '(row) (block '(
-    (let res (Coalesce (!= (Not (Exists (Lookup (Member row 'dict) (String '"c")))) (Bool 'true)) (Bool 'false)))
-    (return res)
-)
-))))
-  (let select1_output (PartitionByKey select1_output (lambda '(row) (block '(
-    (let res (String '""))
-    (return res)
-)
-)) (Void) (Void) (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-    (let key (Nth pair '0))
-    (let group (ForwardList (Nth pair '1)))
-    (let aggr (Fold1 group (lambda '(row) (block '(
-      (let res (Struct))
-      (let res (AddMember res 'Count7 (Convert (Exists (Unwrap (Lookup (Member row 'dict) (String '"a")))) 'Uint64)))
-      (return res)
-)
-)) (lambda '(row state) (block '(
-      (let res (Struct))
-      (let res (AddMember res 'Count7 (OptionalReduce (Member state 'Count7) (Convert (Exists (Unwrap (Lookup (Member row 'dict) (String '"a")))) 'Uint64) (lambda '(a b) (+ a b)))))
-      (return res)
-)
-))))
-    (let res (FlatMap aggr (lambda '(row) (block '(
-      (let res (Struct))
-      (let res (AddMember res 'a_count (Member row 'Count7)))
-      (let res (AsList res))
-      (return res)
-)
-))))
-    (return res)
-)))))
-))
-  (return select1_output)
-)
-))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) output12 '('('type) '('autoref) '('columns '('a_count)))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.cfg b/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.cfg
deleted file mode 100644
index db6c9d1b8c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input3.txt
-out Output output.txt
-res result.txt
-udf dsv_udf
diff --git a/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.yqls b/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.yqls
deleted file mode 100644
index f186cb7101..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.yqls
+++ /dev/null
@@ -1,53 +0,0 @@
-(
-(let x (Read! world (DataSource 'yt 'plato) (Key '('table (String 'Input))) '('dict 'key) '()))
-(let world (Left! x))
-(let Input (Right! x))
-(let select1_input12 Input)
-(let output13 (block '(
-  (let select1_output select1_input12)
-  (let select1_output (Filter select1_output (lambda '(row) (block '(
-    (let res (Coalesce (!= (Not (Exists (Lookup (Member row 'dict) (String '"b")))) (Bool 'true)) (Bool 'false)))
-    (return res)
-)
-))))
-  (let select1_output (PartitionByKey select1_output (lambda '(row) (block '(
-    (let res (Member row 'key))
-    (return res)
-)
-)) (Void) (Void) (lambda '(stream) (FlatMap stream (lambda '(pair) (block '(
-    (let key (Nth pair '0))
-    (let group (ForwardList (Nth pair '1)))
-    (let aggr (Fold1 group (lambda '(row) (block '(
-      (let res (Struct))
-      (let res (AddMember res 'key (Member row 'key)))
-      (let res (AddMember res 'Count7 (Convert (Exists (Lookup (Member row 'dict) (String '"a"))) 'Uint64)))
-      (return res)
-)
-)) (lambda '(row state) (block '(
-      (let res (Struct))
-      (let res (AddMember res 'key (Member row 'key)))
-      (let res (AddMember res 'Count7 (OptionalReduce (Member state 'Count7) (Convert (Exists (Lookup (Member row 'dict) (String '"a"))) 'Uint64) (lambda '(a b) (+ a b)))))
-      (return res)
-)
-))))
-    (let res (FlatMap aggr (lambda '(row) (block '(
-      (let res (Struct))
-      (let res (AddMember res 'key (Member row 'key)))
-      (let res (AddMember res 'a (Member row 'Count7)))
-      (let res (AsList res))
-      (return res)
-)
-))))
-    (return res)
-)))
-))))
-  (return select1_output)
-)
-))
-(let result_sink (DataSink 'result))
-(let world (Write! world result_sink (Key) output13 '('('type) '('autoref) '('columns '('key 'a)))))
-(let plato_sink (DataSink 'yt 'plato))
-(let world (Commit! world plato_sink))
-(let world (Commit! world result_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.cfg b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.cfg
deleted file mode 100644
index 44b1761859..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input2.txt
-out Output output.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.yqls b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.yqls
deleted file mode 100644
index 3574c04daf..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input)) '('view (String 'key1))) '('column0) '() ) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.cfg b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.cfg
deleted file mode 100644
index 44b1761859..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input2.txt
-out Output output.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.yqls b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.yqls
deleted file mode 100644
index 7e579328e6..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input)) '('view (String 'key2))) '('column0) '() ) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.cfg b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.cfg
deleted file mode 100644
index 44b1761859..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input input2.txt
-out Output output.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.yqls b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.yqls
deleted file mode 100644
index 5d429021c3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('tablescheme (String 'Input)) '('view (String 'key1))) (Void) '()) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1Data.yqls b/yql/essentials/tests/s-expressions/suites/View/Key1Data.yqls
deleted file mode 100644
index 85a3398e41..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1Data.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let source_any (DataSource 'yt '"$all"))
-
-(let world (Configure! world source_any '"Attr" '"inferschema" '"1"))
-(let world (Configure! world source_any '"Attr" '"maxrowweight" '"128m"))
-
-(let x (Read! world mr_source (Key '('table (String 'Input)) '('view (String 'key1))) '('column0) '() ) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1Scheme.yqls b/yql/essentials/tests/s-expressions/suites/View/Key1Scheme.yqls
deleted file mode 100644
index 5d429021c3..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/Key1Scheme.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('tablescheme (String 'Input)) '('view (String 'key1))) (Void) '()) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/MasterScheme.yqls b/yql/essentials/tests/s-expressions/suites/View/MasterScheme.yqls
deleted file mode 100644
index 0a9e55e5a5..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/MasterScheme.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('tablescheme (String 'Input))) (Void) '()) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/NoReadData.yqls b/yql/essentials/tests/s-expressions/suites/View/NoReadData.yqls
deleted file mode 100644
index 7e27b9b42a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/NoReadData.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let source_any (DataSource 'yt '"$all"))
-
-(let world (Configure! world source_any '"Attr" '"inferschema" '"1"))
-(let world (Configure! world source_any '"Attr" '"maxrowweight" '"128m"))
-
-(let x (Read! world mr_source (Key '('table (String 'Input)) '('view (String 'noread))) '('value) '() ) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/NoReadScheme.yqls b/yql/essentials/tests/s-expressions/suites/View/NoReadScheme.yqls
deleted file mode 100644
index b231e96834..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/NoReadScheme.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('tablescheme (String 'Input)) '('view (String 'noread))) (Void) '()) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/RawView.cfg b/yql/essentials/tests/s-expressions/suites/View/RawView.cfg
deleted file mode 100644
index 61289d7a17..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/RawView.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input1 input2.txt
-in Input2 input5.txt
-res result.txt
-udf dummylog
diff --git a/yql/essentials/tests/s-expressions/suites/View/RawView.yqls b/yql/essentials/tests/s-expressions/suites/View/RawView.yqls
deleted file mode 100644
index d23c50d85c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/RawView.yqls
+++ /dev/null
@@ -1,40 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let res_sink (DataSink 'result))
-(let source_any (DataSource 'yt '"$all"))
-
-(let world (Configure! world source_any '"Attr" '"inferschema" '"1"))
-(let world (Configure! world source_any '"Attr" '"maxrowweight" '"128m"))
-
-(let x (Read! world mr_source (Key
-    '('table (String 'Input1))
-    '('view (String 'raw))
-) (Void) '()))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let world (Write! world res_sink (Key) data '()))
-
-(let x (Read! world mr_source (Key
-    '('table (String 'Input1))
-) (Void) '()))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let world (Write! world res_sink (Key) data '()))
-
-(let x (Read! world mr_source (Key
-    '('table (String 'Input2))
-    '('view (String 'raw))
-) (Void) '()))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let world (Write! world res_sink (Key) data '()))
-
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.cfg b/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.cfg
deleted file mode 100644
index 2ac9312f92..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input1 input.txt
-in Input2 input6.txt
-in InputView input_view.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.yqls b/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.yqls
deleted file mode 100644
index 8588e4df39..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.yqls
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-(let res_sink (DataSink 'result))
-(let source_any (DataSource 'yt '"$all"))
-
-(let world (Configure! world source_any '"Attr" '"inferschema" '"1"))
-(let world (Configure! world source_any '"Attr" '"maxrowweight" '"128m"))
-
-(let x (Read! world mr_source (Key
-    '('table (String 'InputView))
-) (Void) '()))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.cfg b/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.cfg
deleted file mode 100644
index 2ac9312f92..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-in Input1 input.txt
-in Input2 input6.txt
-in InputView input_view.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.yqls b/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.yqls
deleted file mode 100644
index c90fdf788a..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.yqls
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let mr_sink (DataSink 'yt 'plato))
-(let res_sink (DataSink 'result))
-
-(let x (Read! world mr_source (Key
-    '('tablescheme (String 'InputView))
-) (Void) '()))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.cfg b/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.cfg
deleted file mode 100644
index ad52c79527..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-in Input input.txt
-out Output output.txt
diff --git a/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.yqls b/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.yqls
deleted file mode 100644
index f5eb0c356b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('table (String 'Input)) '('view (String 'trivial))) '('value) '() ) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let mr_sink (DataSink 'yt 'plato))
-(let world (Write! world mr_sink (Key '('table (String 'Output)) ) table1 '() ))
-(let world (Commit! world mr_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/TrivialScheme.yqls b/yql/essentials/tests/s-expressions/suites/View/TrivialScheme.yqls
deleted file mode 100644
index 8062a7feb8..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/TrivialScheme.yqls
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-#comment
-(let mr_source (DataSource 'yt 'plato))
-(let x (Read! world mr_source (Key '('tablescheme (String 'Input)) '('view (String 'trivial))) (Void) '()) )
-(let world (Left! x))
-(let table1 (Right! x))
-(let res_sink (DataSink 'result))
-(let world (Write! world res_sink (Key) table1 '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.cfg b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.cfg
deleted file mode 100644
index d3e8c7c671..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input4.txt
-res result.txt
-udf simple_udf
diff --git a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.yqls b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.yqls
deleted file mode 100644
index 4d2b6066ad..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let res_sink (DataSink 'result))
-
-(let x (Read! world mr_source (Key
-    '('table (String 'Input))
-    '('view (String 'key1))
-) (Void) '()))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.cfg b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.cfg
deleted file mode 100644
index 4cc66ff555..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input6.txt
-res result.txt
-udf python3_udf
diff --git a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.yqls b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.yqls
deleted file mode 100644
index e5dc7a8838..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.yqls
+++ /dev/null
@@ -1,16 +0,0 @@
-(
-(let mr_source (DataSource 'yt 'plato))
-(let res_sink (DataSink 'result))
-
-(let x (Read! world mr_source (Key
-    '('table (String 'Input))
-    '('view (String 'my))
-) (Void) '()))
-
-(let world (Left! x))
-(let data (Right! x))
-
-(let world (Write! world res_sink (Key) data '()))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/suites/View/default.cfg b/yql/essentials/tests/s-expressions/suites/View/default.cfg
deleted file mode 100644
index fe2b19a9ff..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/default.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-in Input input.txt
-out Output output.txt
-res result.txt
diff --git a/yql/essentials/tests/s-expressions/suites/View/input.txt b/yql/essentials/tests/s-expressions/suites/View/input.txt
deleted file mode 100644
index df76c64125..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="a7c"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="q8z"};
diff --git a/yql/essentials/tests/s-expressions/suites/View/input.txt.attr b/yql/essentials/tests/s-expressions/suites/View/input.txt.attr
deleted file mode 100644
index 06c67fd2cb..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input.txt.attr
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "_yql_view_trivial"="SELECT key, subkey, value FROM self";
-    "_yql_view_key1"="SELECT key || \"key\" FROM self";
-    "_yql_view_noread"="SELECT 1 as key, 2 as value";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/View/input2.txt b/yql/essentials/tests/s-expressions/suites/View/input2.txt
deleted file mode 100644
index df76c64125..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="a7c"};
-{"key"="800";"subkey"="2";"value"="ddd"};
-{"key"="020";"subkey"="3";"value"="q"};
-{"key"="150";"subkey"="4";"value"="q8z"};
diff --git a/yql/essentials/tests/s-expressions/suites/View/input2.txt.attr b/yql/essentials/tests/s-expressions/suites/View/input2.txt.attr
deleted file mode 100644
index 4e7dfb3804..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input2.txt.attr
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "_yql_view_trivial"="SELECT key, subkey, value FROM self";
-    "_yql_view_key1"="SELECT key || \"key\" FROM self";
-    "_yql_view_key2"="SELECT key || \"key\" FROM self_raw";
-    "_yql_view_noread"="SELECT 1 as key, 2 as value";
-    "_yql_read_udf"="DummyLog.ReadRecord2";
-    "_yql_read_udf_type_config"="AAA";
-    "_yql_read_udf_run_config"="BBB";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/View/input3.txt b/yql/essentials/tests/s-expressions/suites/View/input3.txt
deleted file mode 100644
index ad6793f93c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{"key"="075";"subkey"="1";"value"="a=B@@b=a@@c=a"};
-{"key"="800";"subkey"="2";"value"="b=1@@c=2@@d=3"};
-{"key"="020";"subkey"="3";"value"="a=i@@c=j"};
-{"key"="150";"subkey"="4";"value"="a=A"};
diff --git a/yql/essentials/tests/s-expressions/suites/View/input3.txt.attr b/yql/essentials/tests/s-expressions/suites/View/input3.txt.attr
deleted file mode 100644
index 14544c6d7b..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input3.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_read_udf"="Dsv.ReadRecord";
-    "_yql_read_udf_run_config"="@@";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/View/input4.txt b/yql/essentials/tests/s-expressions/suites/View/input4.txt
deleted file mode 100644
index d15f960f63..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input4.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{"key"="0";"subkey"="-";"value"="zero"};
-{"key"="1";"subkey"="-";"value"="one"};
-{"key"="2";"subkey"="-";"value"="two"};
-{"key"="3";"subkey"="-";"value"="three"};
-{"key"="4";"subkey"="-";"value"="four"};
-{"key"="5";"subkey"="-";"value"="five"};
-{"key"="6";"subkey"="-";"value"="six"};
-{"key"="7";"subkey"="-";"value"="seven"};
-{"key"="8";"subkey"="-";"value"="eight"};
-{"key"="9";"subkey"="-";"value"="nine"};
diff --git a/yql/essentials/tests/s-expressions/suites/View/input4.txt.attr b/yql/essentials/tests/s-expressions/suites/View/input4.txt.attr
deleted file mode 100644
index e6e4b7d750..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input4.txt.attr
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "_yql_view_key1"="SELECT SimpleUdf::Concat(SimpleUdf::Concat(key, \" - \"), value) FROM self";
-    "_yql_view_key2"="SELECT key || \"key\" FROM self_raw";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/View/input5.txt b/yql/essentials/tests/s-expressions/suites/View/input5.txt
deleted file mode 100644
index 24f23d3d81..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input5.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"key"="foo";"subkey"=".";"value"="bar"};
diff --git a/yql/essentials/tests/s-expressions/suites/View/input5.txt.attr b/yql/essentials/tests/s-expressions/suites/View/input5.txt.attr
deleted file mode 100644
index b6100e5fd0..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input5.txt.attr
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
\ No newline at end of file
diff --git a/yql/essentials/tests/s-expressions/suites/View/input6.txt b/yql/essentials/tests/s-expressions/suites/View/input6.txt
deleted file mode 100644
index d15f960f63..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input6.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{"key"="0";"subkey"="-";"value"="zero"};
-{"key"="1";"subkey"="-";"value"="one"};
-{"key"="2";"subkey"="-";"value"="two"};
-{"key"="3";"subkey"="-";"value"="three"};
-{"key"="4";"subkey"="-";"value"="four"};
-{"key"="5";"subkey"="-";"value"="five"};
-{"key"="6";"subkey"="-";"value"="six"};
-{"key"="7";"subkey"="-";"value"="seven"};
-{"key"="8";"subkey"="-";"value"="eight"};
-{"key"="9";"subkey"="-";"value"="nine"};
diff --git a/yql/essentials/tests/s-expressions/suites/View/input6.txt.attr b/yql/essentials/tests/s-expressions/suites/View/input6.txt.attr
deleted file mode 100644
index 7f425e31ea..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input6.txt.attr
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "_yql_view_my"="$udfScript=\"def f(row):\n\treturn {'myvalue':b'm' + row.value}\n\";$udf=Python3::f(Callable<(Struct<key:String,subkey:String,value:String>)->Struct<myvalue:String>>, $udfScript);PROCESS self USING $udf(TableRow());";
-    "_yql_row_spec" = {
-        "Type" = [
-            "StructType";
-            [
-                [
-                    "key";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "subkey";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ];
-                [
-                    "value";
-                    [
-                        "DataType";
-                        "String"
-                    ]
-                ]
-            ]
-        ]
-    }
-}
diff --git a/yql/essentials/tests/s-expressions/suites/View/input_view.txt b/yql/essentials/tests/s-expressions/suites/View/input_view.txt
deleted file mode 100644
index d664c9eec9..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input_view.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-$f = ($x)->{return $x+1};
-
-select key,min(num) as num from (
-select key,$f(0) as `num` from Input1
-union all
-select key,$f(1) as `num` from Input2
-)
-group by key
-order by key
-
diff --git a/yql/essentials/tests/s-expressions/suites/View/input_view.txt.attr b/yql/essentials/tests/s-expressions/suites/View/input_view.txt.attr
deleted file mode 100644
index 41ea51e276..0000000000
--- a/yql/essentials/tests/s-expressions/suites/View/input_view.txt.attr
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "_yql_type"="view";
-    "type"="document";
-}
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.cfg b/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.cfg
deleted file mode 100644
index 907c9ea175..0000000000
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-res result.txt
-file myfile yql/essentials/udfs/test/test_import/libtest_import_udf.so
-os linux
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.yqls b/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.yqls
deleted file mode 100644
index 92abfcd35c..0000000000
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.yqls
+++ /dev/null
@@ -1,12 +0,0 @@
-# not supported on windows
-(
-#comment
-(let config (DataSource 'config))
-(let world (Configure! world config 'ImportUdfs 'myfile))
-(let world (Configure! world config 'PureDataSource 'yt))
-(let res_sink (DataSink 'result))
-(let data (Apply (Udf 'TestImportUdf.Concat) (String 'abc) (String '"")))
-(let world (Write! world res_sink (Key) data '('('type))))
-(let world (Commit! world res_sink))
-(return world)
-)
diff --git a/yql/essentials/tests/s-expressions/ya.make b/yql/essentials/tests/s-expressions/ya.make
new file mode 100644
index 0000000000..5219b361ec
--- /dev/null
+++ b/yql/essentials/tests/s-expressions/ya.make
@@ -0,0 +1,5 @@
+SUBSCRIBER(g:yql)
+
+RECURSE_FOR_TESTS(
+    minirun
+)
diff --git a/yql/essentials/tests/sql/minirun/part0/test.py b/yql/essentials/tests/sql/minirun/part0/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part0/test.py
+++ b/yql/essentials/tests/sql/minirun/part0/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part1/test.py b/yql/essentials/tests/sql/minirun/part1/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part1/test.py
+++ b/yql/essentials/tests/sql/minirun/part1/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part2/test.py b/yql/essentials/tests/sql/minirun/part2/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part2/test.py
+++ b/yql/essentials/tests/sql/minirun/part2/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part3/test.py b/yql/essentials/tests/sql/minirun/part3/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part3/test.py
+++ b/yql/essentials/tests/sql/minirun/part3/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part4/test.py b/yql/essentials/tests/sql/minirun/part4/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part4/test.py
+++ b/yql/essentials/tests/sql/minirun/part4/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part5/test.py b/yql/essentials/tests/sql/minirun/part5/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part5/test.py
+++ b/yql/essentials/tests/sql/minirun/part5/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part6/test.py b/yql/essentials/tests/sql/minirun/part6/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part6/test.py
+++ b/yql/essentials/tests/sql/minirun/part6/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part7/test.py b/yql/essentials/tests/sql/minirun/part7/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part7/test.py
+++ b/yql/essentials/tests/sql/minirun/part7/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part8/test.py b/yql/essentials/tests/sql/minirun/part8/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part8/test.py
+++ b/yql/essentials/tests/sql/minirun/part8/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/part9/test.py b/yql/essentials/tests/sql/minirun/part9/test.py
index 1cb2e7f049..9c41b3dbc7 100644
--- a/yql/essentials/tests/sql/minirun/part9/test.py
+++ b/yql/essentials/tests/sql/minirun/part9/test.py
@@ -1,14 +1,14 @@
 import pytest
 import yatest
 
-from pure import run_test
+from pure import run_test, DATA_PATH
 from test_utils import pytest_generate_tests_for_part
 from yql_utils import pytest_get_current_part
 
 
 def pytest_generate_tests(metafunc):
     current_part, part_count = pytest_get_current_part(yatest.common.source_path(__file__))
-    return pytest_generate_tests_for_part(metafunc, current_part, part_count)
+    return pytest_generate_tests_for_part(metafunc, current_part, part_count, data_path=DATA_PATH)
 
 
 @pytest.mark.parametrize('what', ['Results', 'Debug', 'RunOnOpt', 'LLVM'])
diff --git a/yql/essentials/tests/sql/minirun/pure.py b/yql/essentials/tests/sql/minirun/pure.py
index 20683a0a7d..ea5949f698 100644
--- a/yql/essentials/tests/sql/minirun/pure.py
+++ b/yql/essentials/tests/sql/minirun/pure.py
@@ -12,9 +12,10 @@ from yql_utils import execute, get_tables, get_files, get_http_files, \
     normalize_result
 from yqlrun import YQLRun
 
-from test_utils import get_config, get_parameters_json, DATA_PATH
+from test_utils import get_config, get_parameters_json
 from test_file_common import run_file, run_file_no_cache, get_gateways_config, get_sql_query
 
+DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 ASTDIFF_PATH = yql_binary_path('yql/essentials/tools/astdiff/astdiff')
 MINIRUN_PATH = yql_binary_path('yql/essentials/tools/minirun/minirun')
 
@@ -23,7 +24,7 @@ def run_test(suite, case, cfg, tmpdir, what, yql_http_file_server):
     if get_gateway_cfg_suffix() != '' and what not in ('Results','LLVM'):
         pytest.skip('non-trivial gateways.conf')
 
-    config = get_config(suite, case, cfg)
+    config = get_config(suite, case, cfg, data_path = DATA_PATH)
 
     xfail = is_xfail(config)
     if xfail and what != 'Results':
@@ -37,7 +38,7 @@ def run_test(suite, case, cfg, tmpdir, what, yql_http_file_server):
     if is_with_final_result_issues(config):
         extra_final_args += ['--with-final-issues']
     (res, tables_res) = run_file('pure', suite, case, cfg, config, yql_http_file_server, MINIRUN_PATH,
-                                 extra_args=extra_final_args, allow_llvm=False)
+                                 extra_args=extra_final_args, allow_llvm=False, data_path=DATA_PATH)
 
     to_canonize = []
     assert xfail or os.path.exists(res.results_file)
diff --git a/yql/essentials/tests/sql/sql2yql/test_sql2yql.py b/yql/essentials/tests/sql/sql2yql/test_sql2yql.py
index 59669e66a3..d7da321868 100644
--- a/yql/essentials/tests/sql/sql2yql/test_sql2yql.py
+++ b/yql/essentials/tests/sql/sql2yql/test_sql2yql.py
@@ -2,11 +2,13 @@ import os
 
 import yatest.common
 
-from test_utils import pytest_generate_tests_by_template, DATA_PATH, SQLRUN_PATH, SQL_FLAGS
+from test_utils import pytest_generate_tests_by_template, SQLRUN_PATH, SQL_FLAGS
+
+DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 
 
 def pytest_generate_tests(metafunc):
-    return pytest_generate_tests_by_template('.sql', metafunc)
+    return pytest_generate_tests_by_template('.sql', metafunc, data_path=DATA_PATH)
 
 
 def get_sql2yql_cmd(suite, case, case_file, out_dir, ansi_lexer, test_format, test_double_format):
diff --git a/yql/essentials/tests/sql/sql2yql/test_sql_format.py b/yql/essentials/tests/sql/sql2yql/test_sql_format.py
index a21f6a5697..fdf2ca75e8 100644
--- a/yql/essentials/tests/sql/sql2yql/test_sql_format.py
+++ b/yql/essentials/tests/sql/sql2yql/test_sql_format.py
@@ -3,11 +3,13 @@ import yatest.common
 import pytest
 
 from test_sql2yql import get_sql2yql_cmd
-from test_utils import pytest_generate_tests_by_template, DATA_PATH
+from test_utils import pytest_generate_tests_by_template
+
+DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 
 
 def pytest_generate_tests(metafunc):
-    return pytest_generate_tests_by_template('.sql', metafunc)
+    return pytest_generate_tests_by_template('.sql', metafunc, data_path=DATA_PATH)
 
 
 def test(suite, case, tmpdir):
diff --git a/yql/essentials/tests/sql/sql2yql/test_sql_negative.py b/yql/essentials/tests/sql/sql2yql/test_sql_negative.py
index bf43ed43f1..8f8ac58361 100644
--- a/yql/essentials/tests/sql/sql2yql/test_sql_negative.py
+++ b/yql/essentials/tests/sql/sql2yql/test_sql_negative.py
@@ -3,13 +3,14 @@ import pytest
 import yatest.common
 from yql_utils import get_supported_providers, get_param
 
-from test_utils import pytest_generate_tests_for_run, get_config, SQLRUN_PATH, DATA_PATH
+from test_utils import pytest_generate_tests_for_run, get_config, SQLRUN_PATH
 
 NEGATIVE_TEMPLATE = '.sqlx'
+DATA_PATH = yatest.common.source_path('yql/essentials/tests/sql/suites')
 
 
 def pytest_generate_tests(metafunc):
-    pytest_generate_tests_for_run(metafunc, NEGATIVE_TEMPLATE)
+    pytest_generate_tests_for_run(metafunc, NEGATIVE_TEMPLATE, data_path=DATA_PATH)
 
 
 def run_sql2yql(program_sql, out_dir, err_file_path):
@@ -39,7 +40,7 @@ def run_sql2yql(program_sql, out_dir, err_file_path):
 
 
 def test(suite, case, cfg, tmpdir):
-    config = get_config(suite, case, cfg)
+    config = get_config(suite, case, cfg, DATA_PATH)
 
     if 'yt' not in get_supported_providers(config):
         pytest.skip('YT provider is not supported here')
diff --git a/yql/essentials/tests/ya.make b/yql/essentials/tests/ya.make
index 99a9c79f1a..84f41287db 100644
--- a/yql/essentials/tests/ya.make
+++ b/yql/essentials/tests/ya.make
@@ -3,6 +3,7 @@ SUBSCRIBER(g:yql)
 RECURSE(
     common
     postgresql
+    s-expressions
     sql
 )