Intermediate changes

commit_hash:27af5f8a0a7836d78ffdc205213f07f79dd9f7ad
author: robot-piglet <robot-piglet@yandex-team.com> 2024-12-13 15:14:50 +0300
committer: robot-piglet <robot-piglet@yandex-team.com> 2024-12-13 16:07:36 +0300
commit: 5cbdc6f2bc811da3e6104da774a30b25a54a8708 (patch)
tree: 68f3ddb0d928332e5ea73853f40f4670f4babb65
parent: 1402a032649d20ffb80a541f706afcd31cd897fa (diff)
download: ydb-5cbdc6f2bc811da3e6104da774a30b25a54a8708.tar.gz
1147 files changed, 0 insertions, 2 deletions
diff --git a/library/python/testing/recipe/__init__.py b/library/python/testing/recipe/__init__.py
index be5c956fd5a..0d90ea410aa 100644
--- a/library/python/testing/recipe/__init__.py
+++ b/library/python/testing/recipe/__init__.py
@@ -62,8 +62,6 @@ def get_options():
 
     ya = Ya(context=context, build_root=args.build_root, source_root=args.source_root, output_dir=args.output_dir, env_file=args.env_file)
 
-    ya._data_root = ""  # XXX remove
-
     sanitizer_extra_checks = args.sanitizer_extra_checks
     if sanitizer_extra_checks:
         for envvar in ['LSAN_OPTIONS', 'ASAN_OPTIONS']:
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yqls
index ae95d15a68c..ae95d15a68c 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yqls
index f0a27ab8d58..f0a27ab8d58 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrCount.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yqls
index ab948dc6493..ab948dc6493 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrMinMax.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFields.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFields.yqls
index e9565555ef1..e9565555ef1 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFields.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFields.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFieldsUsingTuple.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFieldsUsingTuple.yqls
index 502366d6d5e..502366d6d5e 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFieldsUsingTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroubByTwoFieldsUsingTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroupByOneField.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroupByOneField.yqls
index b309a99b1ca..b309a99b1ca 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroupByOneField.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateGroupByOneField.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateOptState.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateOptState.yqls
index bb969257851..bb969257851 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateOptState.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateOptState.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateRead.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateRead.yqls
index 70d8879fc0e..70d8879fc0e 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateRead.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateRead.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinct.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinct.yqls
index 94034d32af9..94034d32af9 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctUsingTuple.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctUsingTuple.yqls
index d4f0adca764..d4f0adca764 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctUsingTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctUsingTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctWithParents.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctWithParents.yqls
index 27c4faf6473..27c4faf6473 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctWithParents.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadDistinctWithParents.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadWithParents.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadWithParents.yqls
index b0b2f6a084d..b0b2f6a084d 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadWithParents.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateReadWithParents.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateSameDistinct.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateSameDistinct.yqls
index 9f4fb017570..9f4fb017570 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateSameDistinct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateSameDistinct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutGroup.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutGroup.yqls
index 472d0234d1c..472d0234d1c 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutGroup.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutGroup.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutTraits.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutTraits.yqls
index 59dd4cabc3e..59dd4cabc3e 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutTraits.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/AggregateWithoutTraits.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug1.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug1.yqls
index 0a2a83b345a..0a2a83b345a 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug2.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug2.yqls
index 1558d5a3a9e..1558d5a3a9e 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug2.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.yqls
index 61e56c5a0f2..61e56c5a0f2 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/Bug3.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.yqls
index 312c7578869..312c7578869 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/EmptyOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yqls
index b25953f460b..b25953f460b 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregate.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yqls
index d3c83583429..d3c83583429 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateUsingTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yqls
index 4357fcf5c75..4357fcf5c75 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateWithParents.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yqls
index 73069b70617..73069b70617 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZero.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yqls
index 857859cc2c7..857859cc2c7 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/InMemAggregateZeroOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.yqls
index f18d8573a43..f18d8573a43 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_4.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.yqls
index 18d89027daa..18d89027daa 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/Level_5.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.yqls
index 64ee248ed90..64ee248ed90 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/SameTrait.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yqls
index 7a8c8845dc3..7a8c8845dc3 100644
--- a/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yql
+++ b/yql/essentials/tests/s-expressions/suites/Aggregation/Traits.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/AndOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Builtins/AndOverOptional.yqls
index 4b878ab6d05..4b878ab6d05 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/AndOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/AndOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Arithmetic.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Arithmetic.yqls
index ac50a50ada3..ac50a50ada3 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Arithmetic.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Arithmetic.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticOverEmptyOptionals.yql b/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticOverEmptyOptionals.yqls
index fa25eff9ff8..fa25eff9ff8 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticOverEmptyOptionals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticOverEmptyOptionals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.yql b/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.yqls
index 2df7e940fe7..2df7e940fe7 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/ArithmeticUnary.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.yql b/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.yqls
index 76a39cde33f..76a39cde33f 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/AsTagged.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogical.yql b/yql/essentials/tests/s-expressions/suites/Builtins/BitLogical.yqls
index 801f98c809e..801f98c809e 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogical.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/BitLogical.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogicalOverEmptyOptionals.yql b/yql/essentials/tests/s-expressions/suites/Builtins/BitLogicalOverEmptyOptionals.yqls
index bad75321c1b..bad75321c1b 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitLogicalOverEmptyOptionals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/BitLogicalOverEmptyOptionals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitShifts.yql b/yql/essentials/tests/s-expressions/suites/Builtins/BitShifts.yqls
index d38c5df0c26..d38c5df0c26 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitShifts.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/BitShifts.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/BitShiftsOverEmptyOptionals.yql b/yql/essentials/tests/s-expressions/suites/Builtins/BitShiftsOverEmptyOptionals.yqls
index d2dd9c92b4c..d2dd9c92b4c 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/BitShiftsOverEmptyOptionals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/BitShiftsOverEmptyOptionals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Cast.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Cast.yqls
index edf5b44792b..edf5b44792b 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Cast.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Cast.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/CastStruct.yql b/yql/essentials/tests/s-expressions/suites/Builtins/CastStruct.yqls
index ff4a01823d6..ff4a01823d6 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/CastStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/CastStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Coalesce.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Coalesce.yqls
index b03717e0149..b03717e0149 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Coalesce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Coalesce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/CombineByKey.yql b/yql/essentials/tests/s-expressions/suites/Builtins/CombineByKey.yqls
index 5fa1b5c0373..5fa1b5c0373 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/CombineByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/CombineByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Compare.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Compare.yqls
index bd5b02bfc8a..bd5b02bfc8a 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Compare.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Compare.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/CompareWithEmptyOptionals.yql b/yql/essentials/tests/s-expressions/suites/Builtins/CompareWithEmptyOptionals.yqls
index 4e7c2ed97f3..4e7c2ed97f3 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/CompareWithEmptyOptionals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/CompareWithEmptyOptionals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Concat.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Concat.yqls
index d423bbd1a22..d423bbd1a22 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Concat.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Concat.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Condense.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Condense.yqls
index d601958e3e4..d601958e3e4 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Condense.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Condense.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Condense1.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Condense1.yqls
index 18996241624..18996241624 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Condense1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Condense1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Contains.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Contains.yqls
index 1dbafaba7de..1dbafaba7de 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Contains.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Contains.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Convert.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Convert.yqls
index 74e0bf07e57..74e0bf07e57 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Convert.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Convert.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/DicItems.yql b/yql/essentials/tests/s-expressions/suites/Builtins/DicItems.yqls
index 95277fbb510..95277fbb510 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/DicItems.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/DicItems.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yql b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yqls
index d7d096c666d..d7d096c666d 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yql b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yqls
index aabfde50091..aabfde50091 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/DivePrefixMembersOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Enumerate.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Enumerate.yqls
index 245bccb5a72..245bccb5a72 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Enumerate.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Enumerate.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Exists.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Exists.yqls
index a45adbeeebf..a45adbeeebf 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Exists.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Exists.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Extract.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Extract.yqls
index 97637f6e252..97637f6e252 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Extract.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Extract.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FilterAndSize.yql b/yql/essentials/tests/s-expressions/suites/Builtins/FilterAndSize.yqls
index db9c86ab6d5..db9c86ab6d5 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FilterAndSize.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/FilterAndSize.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembers.yql b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembers.yqls
index 7bb2ee9823c..7bb2ee9823c 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional.yql b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional.yqls
index 4a2d27f7ce6..4a2d27f7ce6 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yql b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yqls
index 42b30ea2423..42b30ea2423 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/FlattenMembersOptional2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Floats.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Floats.yqls
index 08f9f647971..08f9f647971 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Floats.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Floats.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Fold.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Fold.yqls
index 34544fa51e1..34544fa51e1 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Fold.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Fold.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Fold1.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Fold1.yqls
index d360f24111f..d360f24111f 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Fold1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Fold1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Fold2Lambda.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Fold2Lambda.yqls
index 9d15c7ceb82..9d15c7ceb82 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Fold2Lambda.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Fold2Lambda.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/FromString.yql b/yql/essentials/tests/s-expressions/suites/Builtins/FromString.yqls
index ba534b346df..ba534b346df 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/FromString.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/FromString.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/GroupByKey.yql b/yql/essentials/tests/s-expressions/suites/Builtins/GroupByKey.yqls
index 931c95d7b61..931c95d7b61 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/GroupByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/GroupByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/HasItems.yql b/yql/essentials/tests/s-expressions/suites/Builtins/HasItems.yqls
index 2500618f6f5..2500618f6f5 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/HasItems.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/HasItems.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/If.yql b/yql/essentials/tests/s-expressions/suites/Builtins/If.yqls
index f0cd523350b..f0cd523350b 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/If.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/If.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/IfType.yql b/yql/essentials/tests/s-expressions/suites/Builtins/IfType.yqls
index 9503f0ed595..9503f0ed595 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/IfType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/IfType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/IntTypes.yql b/yql/essentials/tests/s-expressions/suites/Builtins/IntTypes.yqls
index 56b74c715c9..56b74c715c9 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/IntTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/IntTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Just.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Just.yqls
index eac651c3478..eac651c3478 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Just.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Just.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideMap.yql b/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideMap.yqls
index f308062a086..f308062a086 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideReduce.yql b/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideReduce.yqls
index a28b93a7a79..a28b93a7a79 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/LengthInsideReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ListAppendPrependExtend.yql b/yql/essentials/tests/s-expressions/suites/Builtins/ListAppendPrependExtend.yqls
index c58fcc163d3..c58fcc163d3 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ListAppendPrependExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/ListAppendPrependExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Logical.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Logical.yqls
index 100c3df83b5..100c3df83b5 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Logical.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Logical.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Lookup.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Lookup.yqls
index 2eb0e2ff1f6..2eb0e2ff1f6 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Lookup.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Lookup.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.yql b/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.yqls
index 5eb3cb79d77..5eb3cb79d77 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/MatchType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/MinMax.yql b/yql/essentials/tests/s-expressions/suites/Builtins/MinMax.yqls
index 71a972e7e9b..71a972e7e9b 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/MinMax.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/MinMax.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/MinMaxOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Builtins/MinMaxOverOptional.yqls
index 87b210c7253..87b210c7253 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/MinMaxOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/MinMaxOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Nanvl.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Nanvl.yqls
index 899ddf853d5..899ddf853d5 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Nanvl.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Nanvl.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/NotOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Builtins/NotOverOptional.yqls
index 6a4f6f8e197..6a4f6f8e197 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/NotOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/NotOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Now.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Now.yqls
index f187eeef747..f187eeef747 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Now.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Now.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Nth.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Nth.yqls
index 0e3fc4acf62..0e3fc4acf62 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Nth.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Nth.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalIf.yql b/yql/essentials/tests/s-expressions/suites/Builtins/OptionalIf.yqls
index 08758ca2b4f..08758ca2b4f 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalIf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/OptionalIf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalReduce.yql b/yql/essentials/tests/s-expressions/suites/Builtins/OptionalReduce.yqls
index f53f027cbe7..f53f027cbe7 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/OptionalReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/OptionalReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/OrOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Builtins/OrOverOptional.yqls
index 8a1440b4a01..8a1440b4a01 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/OrOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/OrOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Random.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Random.yqls
index 2e6b0f72364..2e6b0f72364 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Random.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Random.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Reverse.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Reverse.yqls
index d9d5058791a..d9d5058791a 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Reverse.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Reverse.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Skip.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Skip.yqls
index 3691a0bc21d..3691a0bc21d 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Skip.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Skip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/SkipAfterTake.yql b/yql/essentials/tests/s-expressions/suites/Builtins/SkipAfterTake.yqls
index 75ce137d759..75ce137d759 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/SkipAfterTake.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/SkipAfterTake.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Sort.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Sort.yqls
index 7333ac3a148..7333ac3a148 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Sort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Sort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.yql b/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.yqls
index 8d61d0d81b4..8d61d0d81b4 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/SortByOptionalNumbers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/SortBySubkeyInsideReduce.yql b/yql/essentials/tests/s-expressions/suites/Builtins/SortBySubkeyInsideReduce.yqls
index db65afbd998..db65afbd998 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/SortBySubkeyInsideReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/SortBySubkeyInsideReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Substring.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Substring.yqls
index 7a43121bdc0..7a43121bdc0 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Substring.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Substring.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Take.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Take.yqls
index 16e5ff7c870..16e5ff7c870 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Take.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Take.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TakeAfterSkip.yql b/yql/essentials/tests/s-expressions/suites/Builtins/TakeAfterSkip.yqls
index 8fb8659c080..8fb8659c080 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TakeAfterSkip.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/TakeAfterSkip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ToIndexDict.yql b/yql/essentials/tests/s-expressions/suites/Builtins/ToIndexDict.yqls
index 866fd55415d..866fd55415d 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ToIndexDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/ToIndexDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TryMember.yql b/yql/essentials/tests/s-expressions/suites/Builtins/TryMember.yqls
index 2c8d57527ea..2c8d57527ea 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TryMember.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/TryMember.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TwoSkip.yql b/yql/essentials/tests/s-expressions/suites/Builtins/TwoSkip.yqls
index 453205bc668..453205bc668 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TwoSkip.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/TwoSkip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TwoTake.yql b/yql/essentials/tests/s-expressions/suites/Builtins/TwoTake.yqls
index abd4639a4c4..abd4639a4c4 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TwoTake.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/TwoTake.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/TypeConstructors.yql b/yql/essentials/tests/s-expressions/suites/Builtins/TypeConstructors.yqls
index 50527bf4fd7..50527bf4fd7 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/TypeConstructors.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/TypeConstructors.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/UnionAll.yql b/yql/essentials/tests/s-expressions/suites/Builtins/UnionAll.yqls
index e332263266a..e332263266a 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/UnionAll.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/UnionAll.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Unwrap.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Unwrap.yqls
index 2180970236a..2180970236a 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Unwrap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Unwrap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/XorOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Builtins/XorOverOptional.yqls
index 3d605c38b60..3d605c38b60 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/XorOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/XorOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/Zip.yql b/yql/essentials/tests/s-expressions/suites/Builtins/Zip.yqls
index 0455714f000..0455714f000 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/Zip.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/Zip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Builtins/ZipAll.yql b/yql/essentials/tests/s-expressions/suites/Builtins/ZipAll.yqls
index 554544466a6..554544466a6 100644
--- a/yql/essentials/tests/s-expressions/suites/Builtins/ZipAll.yql
+++ b/yql/essentials/tests/s-expressions/suites/Builtins/ZipAll.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToEnormousList.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToEnormousList.yqls
index 95a0ec25555..95a0ec25555 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToEnormousList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToEnormousList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yqls
index 157a109a64f..157a109a64f 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataFloatTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yqls
index 746f8f987df..746f8f987df 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataIntegralTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yqls
index fd605370d22..fd605370d22 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDataTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yqls
index 95377162e7e..95377162e7e 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yqls
index 6330d3262a2..6330d3262a2 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yqls
index 6039cd0719b..6039cd0719b 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverNull.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yqls
index 9141b62154b..9141b62154b 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yqls
index 6654166a270..6654166a270 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yqls
index 3ad49c4744c..3ad49c4744c 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yql b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yqls
index 020cf599045..020cf599045 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/AlterToOverVariant.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yql b/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yqls
index 8f253ab7a09..8f253ab7a09 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/HasNullFalse.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yql b/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yqls
index a26295ffadb..a26295ffadb 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/HasNullTrue.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yqls
index 6dc4b237c5d..6dc4b237c5d 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yqls
index 8f00b970d19..8f00b970d19 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yqls
index 6044a39e4e6..6044a39e4e6 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverNull.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yqls
index c10d1243e9d..c10d1243e9d 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yqls
index 11fd9ebc306..11fd9ebc306 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverResource.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yqls
index 1ac4fd613eb..1ac4fd613eb 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStream.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yqls
index 94bc8b7842c..94bc8b7842c 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yqls
index 33421380cb5..33421380cb5 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yql b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yqls
index ea34cbd481b..ea34cbd481b 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/SafeCastOverVariant.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yql b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yqls
index ee7aa8e401b..ee7aa8e401b 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yql b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yqls
index 146ed0dbe9c..146ed0dbe9c 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yql b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yqls
index d7c66842b07..d7c66842b07 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverNull.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yql b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yqls
index 28cf793e44e..28cf793e44e 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yql b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yqls
index afa021dd112..afa021dd112 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yql b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yqls
index 4f2319f1eac..4f2319f1eac 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yql b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yqls
index b533e16780a..b533e16780a 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/StrictCastOverVariant.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yql b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yqls
index 1bc57c71bf2..1bc57c71bf2 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yql b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yqls
index 06493832053..06493832053 100644
--- a/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yql
+++ b/yql/essentials/tests/s-expressions/suites/Casts/TryRemoveAllOptionals2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Config/DataSinks.yql b/yql/essentials/tests/s-expressions/suites/Config/DataSinks.yqls
index b1a80a56603..b1a80a56603 100644
--- a/yql/essentials/tests/s-expressions/suites/Config/DataSinks.yql
+++ b/yql/essentials/tests/s-expressions/suites/Config/DataSinks.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Config/DataSources.yql b/yql/essentials/tests/s-expressions/suites/Config/DataSources.yqls
index 0621a7e0160..0621a7e0160 100644
--- a/yql/essentials/tests/s-expressions/suites/Config/DataSources.yql
+++ b/yql/essentials/tests/s-expressions/suites/Config/DataSources.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Config/PureCommit.yql b/yql/essentials/tests/s-expressions/suites/Config/PureCommit.yqls
index 8578faff3c7..8578faff3c7 100644
--- a/yql/essentials/tests/s-expressions/suites/Config/PureCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Config/PureCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.yql b/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.yqls
index 606e06e0e4a..606e06e0e4a 100644
--- a/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Config/YtNativeRes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/Copy.yql b/yql/essentials/tests/s-expressions/suites/Dynamic/Copy.yqls
index 9b7882d255e..9b7882d255e 100644
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/Copy.yql
+++ b/yql/essentials/tests/s-expressions/suites/Dynamic/Copy.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/Limit.yql b/yql/essentials/tests/s-expressions/suites/Dynamic/Limit.yqls
index c7190c8f882..c7190c8f882 100644
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/Limit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Dynamic/Limit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/TablePull.yql b/yql/essentials/tests/s-expressions/suites/Dynamic/TablePull.yqls
index 4ba424cb1e9..4ba424cb1e9 100644
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/TablePull.yql
+++ b/yql/essentials/tests/s-expressions/suites/Dynamic/TablePull.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Dynamic/TableScheme.yql b/yql/essentials/tests/s-expressions/suites/Dynamic/TableScheme.yqls
index b10df583ba9..b10df583ba9 100644
--- a/yql/essentials/tests/s-expressions/suites/Dynamic/TableScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/Dynamic/TableScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.yqls
index 00d991912a8..00d991912a8 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendAfterOverride.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.yqls
index 65db044c0d5..65db044c0d5 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.yqls
index b51c4e8418a..b51c4e8418a 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.yqls
index 46099b0328a..46099b0328a 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDesc.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.yqls
index 587bc78b081..587bc78b081 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedDescAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.yqls
index e9a055f5d1c..e9a055f5d1c 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendBySortedInSameCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.yqls
index 6b7ac4b1754..6b7ac4b1754 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.yqls
index 4aa79168840..4aa79168840 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.yqls
index 65db044c0d5..65db044c0d5 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.yqls
index 37fb7a1e86c..37fb7a1e86c 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedBySortedAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.yqls
index 1b314c3f2e1..1b314c3f2e1 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/AppendToSortedInSameCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/Bug2318.yql b/yql/essentials/tests/s-expressions/suites/Epochs/Bug2318.yqls
index 5734271142a..5734271142a 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/Bug2318.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/Bug2318.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.yqls
index 110b23d6ed2..110b23d6ed2 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/CopySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.yql b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.yqls
index c834415dd18..c834415dd18 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.yqls
index 5803f92df9a..5803f92df9a 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/DoubleAppendBySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/DropTable.yql b/yql/essentials/tests/s-expressions/suites/Epochs/DropTable.yqls
index ab423f96a37..ab423f96a37 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/DropTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/DropTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.yql b/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.yqls
index 513c1609921..513c1609921 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/FailDoubleOverride.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.yql b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.yqls
index 27a8f343985..27a8f343985 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.yql b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.yqls
index 914cff8c91b..914cff8c91b 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/FailDropAndModify2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.yql b/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.yqls
index f2047207e74..f2047207e74 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/FailMixedAppendOverride.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.yqls
index f27a8961725..f27a8961725 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.yqls
index c08723a840d..c08723a840d 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideBySortedAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.yqls
index 383a70fad1e..383a70fad1e 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.yqls
index a29f76402f9..a29f76402f9 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.yqls
index b43deb2cd98..b43deb2cd98 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDesc.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.yqls
index 71c6b7ef4fd..71c6b7ef4fd 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedBySortedDescAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.yqls
index f27a8961725..f27a8961725 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.yqls
index 643a22242ba..643a22242ba 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideSortedDescBySortedAfterCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideType.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideType.yqls
index f9b513d556b..f9b513d556b 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideWithSort.yql b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideWithSort.yqls
index 946c9f2d682..946c9f2d682 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/OverrideWithSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/OverrideWithSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/PredictSort.yql b/yql/essentials/tests/s-expressions/suites/Epochs/PredictSort.yqls
index b3f57179c34..b3f57179c34 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/PredictSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/PredictSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.yql b/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.yqls
index f2266e36a67..f2266e36a67 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/ReadFromGrandCommit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.yql b/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.yqls
index ecb64cf46c5..ecb64cf46c5 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmaBeforeTableScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmas.yql b/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmas.yqls
index f3c7e35b7d2..f3c7e35b7d2 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmas.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/ReorderPragmas.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Epochs/UseAndOverrideType.yql b/yql/essentials/tests/s-expressions/suites/Epochs/UseAndOverrideType.yqls
index 7980440ada9..7980440ada9 100644
--- a/yql/essentials/tests/s-expressions/suites/Epochs/UseAndOverrideType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Epochs/UseAndOverrideType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.yqls
index 89a1e027659..89a1e027659 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug15491.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.yqls
index 7f37ba29ab6..7f37ba29ab6 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1716.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.yqls
index 2247aa8e0bb..2247aa8e0bb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug1924.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.yqls
index 09a8847b4a1..09a8847b4a1 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/Bug2566.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yqls
index 655f2a82076..655f2a82076 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiConvertToCommonTypeAlias.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiCrossSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiCrossSelfStr.yqls
index 944bb5f6dea..944bb5f6dea 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiCrossSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiCrossSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiExclusionSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiExclusionSelfStr.yqls
index 0b94fa907fd..0b94fa907fd 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiExclusionSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiExclusionSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3OptStr.yqls
index dc7718c8062..dc7718c8062 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3Str.yqls
index 894e36e1b91..894e36e1b91 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullCross3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3OptStr.yqls
index b115bd69075..b115bd69075 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3Str.yqls
index 0683a16ba8a..0683a16ba8a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullExclusion3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3OptStr.yqls
index db3690c50ae..db3690c50ae 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3Str.yqls
index 2339478283a..2339478283a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullFull3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3OptStr.yqls
index 786062ec459..786062ec459 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3Str.yqls
index 4f4a0eda4d8..4f4a0eda4d8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullInner3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3OptStr.yqls
index 293639aa221..293639aa221 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3Str.yqls
index 5d7c766dc59..5d7c766dc59 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeft3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3OptStr.yqls
index 0ed5172d924..0ed5172d924 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3Str.yqls
index bb8bb2e5236..bb8bb2e5236 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftOnly3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3OptStr.yqls
index c5382a89c2b..c5382a89c2b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3Str.yqls
index 0afd1f691e1..0afd1f691e1 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullLeftSemi3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3OptStr.yqls
index 89ca16a047c..89ca16a047c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3Str.yqls
index b5016c4e11d..b5016c4e11d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRight3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3OptStr.yqls
index d6e16050745..d6e16050745 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3Str.yqls
index 97a13fa2b9e..97a13fa2b9e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightOnly3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3OptStr.yqls
index a64f8a6705f..a64f8a6705f 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3Str.yqls
index 951e1d462bc..951e1d462bc 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullRightSemi3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfStr.yqls
index 1d50eb59598..1d50eb59598 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnNoOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnNoOpt1Opt2Str.yqls
index af309a36eb9..af309a36eb9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnNoOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnNoOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1NoOpt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1NoOpt2Str.yqls
index 536807ec3d1..536807ec3d1 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1NoOpt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1NoOpt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1Opt2Str.yqls
index cae4788bf3b..cae4788bf3b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOptPartial1OptPartial2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOptPartial1OptPartial2Str.yqls
index 08748168f64..08748168f64 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOptPartial1OptPartial2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnOptPartial1OptPartial2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnStr.yqls
index 8f7d2e40d2e..8f7d2e40d2e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiFullSelfTwoColumnStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3OptStr.yqls
index 9f014d1580f..9f014d1580f 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3Str.yqls
index b9c69bf087e..b9c69bf087e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerCross3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerDiffIntTypes.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerDiffIntTypes.yqls
index 6d7b8198a68..6d7b8198a68 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerDiffIntTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerDiffIntTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3OptStr.yqls
index 7f144be37fb..7f144be37fb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3Str.yqls
index 769cfb16579..769cfb16579 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerExclusion3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3OptStr.yqls
index 5b0febe8afb..5b0febe8afb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3Str.yqls
index b2436aff7ff..b2436aff7ff 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerFull3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3OptStr.yqls
index 0c12e211750..0c12e211750 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3Str.yqls
index 598c2ef4ec3..598c2ef4ec3 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3StrRename.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3StrRename.yqls
index a3258f553c7..a3258f553c7 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3StrRename.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerInner3StrRename.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3OptStr.yqls
index be7f6267c83..be7f6267c83 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3Str.yqls
index 03aa454da51..03aa454da51 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeft3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3OptStr.yqls
index 5ec5cd9a3f0..5ec5cd9a3f0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3Str.yqls
index a081fd1505c..a081fd1505c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftOnly3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3OptStr.yqls
index eebaf0acbd4..eebaf0acbd4 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3Str.yqls
index 4b40b0c0092..4b40b0c0092 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerLeftSemi3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypes.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypes.yqls
index 8a259534c31..8a259534c31 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypesTwoColumn.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypesTwoColumn.yqls
index 9abc122fd9c..9abc122fd9c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypesTwoColumn.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerOptDiffIntTypesTwoColumn.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3OptStr.yqls
index b4b825991ef..b4b825991ef 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3Str.yqls
index 4e11a1b8c0b..4e11a1b8c0b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRight3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3OptStr.yqls
index 2bf637ce0d0..2bf637ce0d0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3Str.yqls
index f1f3eec7ac7..f1f3eec7ac7 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightOnly3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3OptStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3OptStr.yqls
index 6e5d4d95d06..6e5d4d95d06 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3OptStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3OptStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3Str.yqls
index 808c44795bf..808c44795bf 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerRightSemi3Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntSameDiff.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntSameDiff.yqls
index de061d0050c..de061d0050c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntSameDiff.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntSameDiff.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntTakeDiff.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntTakeDiff.yqls
index 479d4760178..479d4760178 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntTakeDiff.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfIntTakeDiff.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStr.yqls
index 9de2396e4d9..9de2396e4d9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStrRename.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStrRename.yqls
index 932539b39a5..932539b39a5 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStrRename.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfStrRename.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnNoOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnNoOpt1Opt2Str.yqls
index d02d26aafbd..d02d26aafbd 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnNoOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnNoOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1NoOpt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1NoOpt2Str.yqls
index 168fab831b4..168fab831b4 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1NoOpt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1NoOpt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2Str.yqls
index 110a3b617b7..110a3b617b7 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne1.yqls
index 5a9f9ca659c..5a9f9ca659c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne12.yqls
index 0d5b7d16018..0d5b7d16018 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne2.yqls
index 5d15a2bab87..5d15a2bab87 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasOne2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasTwo.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasTwo.yqls
index 4c2225f7c5d..4c2225f7c5d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasTwo.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOpt1Opt2StrAliasTwo.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOptPartial1OptPartial2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOptPartial1OptPartial2Str.yqls
index c6d7543ed3e..c6d7543ed3e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOptPartial1OptPartial2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnOptPartial1OptPartial2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnStr.yqls
index 7444baa207d..7444baa207d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiInnerSelfTwoColumnStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.yqls
index c07a92aa2ae..c07a92aa2ae 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.yqls
index 8fdfeda61ad..8fdfeda61ad 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertCommonI8U8.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.yqls
index f24772569c2..f24772569c2 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.yqls
index 54c482a6248..54c482a6248 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiJoinConvertMapI8U8.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftOnlySelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftOnlySelfStr.yqls
index a7593fde405..a7593fde405 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftOnlySelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftOnlySelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfStr.yqls
index d589fcda91c..d589fcda91c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnNoOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnNoOpt1Opt2Str.yqls
index 78921fa69b9..78921fa69b9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnNoOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnNoOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1NoOpt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1NoOpt2Str.yqls
index 09a21c9a81e..09a21c9a81e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1NoOpt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1NoOpt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1Opt2Str.yqls
index 8f36e81eb5c..8f36e81eb5c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOptPartial1OptPartial2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOptPartial1OptPartial2Str.yqls
index 25e1eb92404..25e1eb92404 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOptPartial1OptPartial2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnOptPartial1OptPartial2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnStr.yqls
index c644c56a26d..c644c56a26d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSelfTwoColumnStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSemiSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSemiSelfStr.yqls
index e9aaf3442f5..e9aaf3442f5 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSemiSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiLeftSemiSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfInt.yqls
index 5409c45d547..5409c45d547 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfStr.yqls
index 64ba1df974a..64ba1df974a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12FullSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfInt.yqls
index ed5b9c6896e..ed5b9c6896e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfStr.yqls
index 9ed83ad59e0..9ed83ad59e0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12InnerSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfInt.yqls
index 4896831f5af..4896831f5af 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfStr.yqls
index c7d3ee062d7..c7d3ee062d7 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12LeftSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfInt.yqls
index 69e10681b27..69e10681b27 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfStr.yqls
index 64ba1df974a..64ba1df974a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey12RightSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfInt.yqls
index e664996232e..e664996232e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfStr.yqls
index 24de4a45d89..24de4a45d89 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1FullSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfInt.yqls
index c2340bb816a..c2340bb816a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfStr.yqls
index 9fe63d8ec27..9fe63d8ec27 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1InnerSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfInt.yqls
index 4cfb26b64e9..4cfb26b64e9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfStr.yqls
index 5fa76d8942d..5fa76d8942d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1LeftSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfInt.yqls
index fed99eefc5f..fed99eefc5f 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfStr.yqls
index 24de4a45d89..24de4a45d89 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey1RightSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfInt.yqls
index 02b042ac3ab..02b042ac3ab 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfStr.yqls
index ba2798678fa..ba2798678fa 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2FullSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfInt.yqls
index 435fdc1a9cd..435fdc1a9cd 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfStr.yqls
index d61db9da693..d61db9da693 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2InnerSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfInt.yqls
index 924287c0f9b..924287c0f9b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfStr.yqls
index 3d1c3605fcd..3d1c3605fcd 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2LeftSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfInt.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfInt.yqls
index a2a085a7225..a2a085a7225 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfInt.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfInt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfStr.yqls
index ba2798678fa..ba2798678fa 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiOptKey2RightSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightOnlySelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightOnlySelfStr.yqls
index b528c144678..b528c144678 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightOnlySelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightOnlySelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfStr.yqls
index 76b372e52f3..76b372e52f3 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnNoOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnNoOpt1Opt2Str.yqls
index 155db305bcc..155db305bcc 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnNoOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnNoOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1NoOpt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1NoOpt2Str.yqls
index dc0928a52c4..dc0928a52c4 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1NoOpt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1NoOpt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1Opt2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1Opt2Str.yqls
index 0d550e7db3a..0d550e7db3a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1Opt2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOpt1Opt2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOptPartial1OptPartial2Str.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOptPartial1OptPartial2Str.yqls
index 9d539854bd0..9d539854bd0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOptPartial1OptPartial2Str.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnOptPartial1OptPartial2Str.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnStr.yqls
index 5a6ff8cd0f6..5a6ff8cd0f6 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSelfTwoColumnStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSemiSelfStr.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSemiSelfStr.yqls
index 71c2d26461b..71c2d26461b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSemiSelfStr.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/EquiRightSemiSelfStr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/ExtractRenameFromFlatMapOverJoin.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/ExtractRenameFromFlatMapOverJoin.yqls
index 33f059a9648..33f059a9648 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/ExtractRenameFromFlatMapOverJoin.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/ExtractRenameFromFlatMapOverJoin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner.yqls
index dee596e70a8..dee596e70a8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner3.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner3.yqls
index ded633225d1..ded633225d1 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner3.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInner3.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInnerTwoColumns.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInnerTwoColumns.yqls
index 4cbe3482ed0..4cbe3482ed0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInnerTwoColumns.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenInnerTwoColumns.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.yqls
index 9533ee9fb89..9533ee9fb89 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeft.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi.yqls
index 2b3166643e1..2b3166643e1 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi3.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi3.yqls
index 45726993372..45726993372 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi3.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/FlattenLeftSemi3.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoin.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoin.yqls
index d0c8c821b6b..d0c8c821b6b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoin.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoinFat.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoinFat.yqls
index 94718f84d11..94718f84d11 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoinFat.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftSmallInnerJoinFat.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftUniqueRightMap.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftUniqueRightMap.yqls
index d77b848dc71..d77b848dc71 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftUniqueRightMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintLeftUniqueRightMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoin.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoin.yqls
index 6e842ae76b8..6e842ae76b8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoin.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoinFat.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoinFat.yqls
index c9e4a7e0f67..c9e4a7e0f67 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoinFat.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightSmallInnerJoinFat.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueInnerMap.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueInnerMap.yqls
index 16a90e3314c..16a90e3314c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueInnerMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueInnerMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftMap.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftMap.yqls
index a3e4e456ea4..a3e4e456ea4 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftSemiShardedMap.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftSemiShardedMap.yqls
index c726a4c4179..c726a4c4179 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftSemiShardedMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/HintRightUniqueLeftSemiShardedMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.yqls
index 707b389f4bb..707b389f4bb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/InOutSettings.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yqls
index 59f07eb137d..59f07eb137d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yqls
index 6245dd77bdd..6245dd77bdd 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yqls
index 0063b7b7ef8..0063b7b7ef8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Alias12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yqls
index 7807ba6e082..7807ba6e082 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMem3Rename.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yqls
index 549fa2d3024..549fa2d3024 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yqls
index 50ee09cda05..50ee09cda05 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yqls
index 374fafce96e..374fafce96e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasOne2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yqls
index e9c47c9c760..e9c47c9c760 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemAliasTwo12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yqls
index ef2ce92878b..ef2ce92878b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemDiffIntTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yqls
index 7e0a5a7fc2b..7e0a5a7fc2b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yqls
index 759d3983ac0..759d3983ac0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt1Opt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yqls
index 861a63112ff..861a63112ff 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemOpt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yqls
index 14636284d28..14636284d28 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemRename.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yqls
index 0b21ecc24d8..0b21ecc24d8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumns.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yqls
index 66060097b8d..66060097b8d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yqls
index 15834403ddb..15834403ddb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt1Opt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yqls
index 0ddee9815bc..0ddee9815bc 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/JoinInMemTwoColumnsOpt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.yqls
index f142bfd3d6d..f142bfd3d6d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinLimit1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinMergeFields.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinMergeFields.yqls
index e5a08be9c9a..e5a08be9c9a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinMergeFields.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/SelfJoinMergeFields.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/SqlInToJoin.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/SqlInToJoin.yqls
index 46ad794a8be..46ad794a8be 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/SqlInToJoin.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/SqlInToJoin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiCrossSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiCrossSelf.yqls
index 6d784c12f1c..6d784c12f1c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiCrossSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiCrossSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiExclusionSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiExclusionSelf.yqls
index b3e903ce7b7..b3e903ce7b7 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiExclusionSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiExclusionSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullSelf.yqls
index cf1497bcef8..cf1497bcef8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullTwoFieldsSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullTwoFieldsSelf.yqls
index a682416effa..a682416effa 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullTwoFieldsSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiFullTwoFieldsSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1EatOptSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1EatOptSelf.yqls
index 28be4deee9d..28be4deee9d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1EatOptSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1EatOptSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1Self.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1Self.yqls
index 005fca072ad..005fca072ad 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1Self.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1Self.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1bSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1bSelf.yqls
index 676843a418d..676843a418d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1bSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested1bSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested2Self.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested2Self.yqls
index ecfc4263ec2..ecfc4263ec2 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested2Self.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerNested2Self.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerSelf.yqls
index 633de6fcaed..633de6fcaed 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerTwoFieldsSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerTwoFieldsSelf.yqls
index 793ee813061..793ee813061 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerTwoFieldsSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiInnerTwoFieldsSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftOnlySelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftOnlySelf.yqls
index 867c048f8b6..867c048f8b6 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftOnlySelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftOnlySelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSelf.yqls
index 1fc31dc3504..1fc31dc3504 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSemiSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSemiSelf.yqls
index 15fa410fc63..15fa410fc63 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSemiSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftSemiSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftTwoFieldsSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftTwoFieldsSelf.yqls
index b305596d208..b305596d208 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftTwoFieldsSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiLeftTwoFieldsSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptFullSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptFullSelf.yqls
index 2bb5d8dfc5c..2bb5d8dfc5c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptFullSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptFullSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptInnerSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptInnerSelf.yqls
index d37d7f696bb..d37d7f696bb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptInnerSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptInnerSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptLeftSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptLeftSelf.yqls
index 74edcb9ae21..74edcb9ae21 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptLeftSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptLeftSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptRightSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptRightSelf.yqls
index 47f1a8923a5..47f1a8923a5 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptRightSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiOptRightSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightOnlySelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightOnlySelf.yqls
index 0a0a502ca6b..0a0a502ca6b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightOnlySelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightOnlySelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSelf.yqls
index 9fe527324cc..9fe527324cc 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSemiSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSemiSelf.yqls
index 4e69796c1f8..4e69796c1f8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSemiSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightSemiSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightTwoFieldsSelf.yql b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightTwoFieldsSelf.yqls
index d5145b4dec9..d5145b4dec9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightTwoFieldsSelf.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoin/TypeEquiRightTwoFieldsSelf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAllAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAllAny.yqls
index 283fccceff9..283fccceff9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAllAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAllAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAll.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAll.yqls
index af7dbd189d8..af7dbd189d8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAll.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAll.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAny.yqls
index e8016a12604..e8016a12604 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/CommonAnyAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yqls
index 0db96ff6549..0db96ff6549 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAllAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yqls
index 42b1a608406..42b1a608406 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAll.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yqls
index 53b2d9eaae2..53b2d9eaae2 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/InMemAnyAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAllAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAllAny.yqls
index cca73e9d751..cca73e9d751 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAllAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAllAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAll.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAll.yqls
index e9547bfd315..e9547bfd315 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAll.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAll.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAny.yqls
index e5bc5906b3e..e5bc5906b3e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/LookupAnyAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAllAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAllAny.yqls
index ad84352890a..ad84352890a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAllAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAllAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAll.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAll.yqls
index 037e8aafc07..037e8aafc07 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAll.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAll.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAny.yqls
index f1ce069c3ea..f1ce069c3ea 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MapAnyAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAllAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAllAny.yqls
index 5845432182e..5845432182e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAllAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAllAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAll.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAll.yqls
index 5f12b8e34e8..5f12b8e34e8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAll.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAll.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAny.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAny.yqls
index eaad119c210..eaad119c210 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAny.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinAny/MergeAnyAny.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommon.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommon.yqls
index fd0cd3266b1..fd0cd3266b1 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommon.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommon.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonKey2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonKey2.yqls
index 04d4ac8e78d..04d4ac8e78d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonKey2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonKey2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1.yqls
index c2925077b41..c2925077b41 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12.yqls
index 4f530fd62fc..4f530fd62fc 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12Key2.yqls
index 430c9269214..430c9269214 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt12Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1Key2.yqls
index da741bd8314..da741bd8314 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt1Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2.yqls
index 10ceca2c98c..10ceca2c98c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2Key2.yqls
index 0cd36f7c36f..0cd36f7c36f 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinCommon/JoinCommonOpt2Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMap.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMap.yqls
index 8739797e8f4..8739797e8f4 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapKey2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapKey2.yqls
index eef99f2886e..eef99f2886e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapKey2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapKey2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1.yqls
index e50b5b2bf5a..e50b5b2bf5a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12.yqls
index 64367c4c335..64367c4c335 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12Key2.yqls
index 51af3fa6f09..51af3fa6f09 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt12Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1Key2.yqls
index 3a089710e92..3a089710e92 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt1Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2.yqls
index 678ed1b9eac..678ed1b9eac 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2Key2.yqls
index 2e36542a533..2e36542a533 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/JoinMapOpt2Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.yqls
index 58a877a3880..58a877a3880 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMap/bug3054.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.yqls
index f6b50489a6b..f6b50489a6b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Bug2333.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Cross2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Cross2_12.yqls
index 9b331b9f827..9b331b9f827 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Cross2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Cross2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_12.yqls
index 3518a4c5d4d..3518a4c5d4d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_1o2o.yqls
index 90b210133ae..90b210133ae 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_12.yqls
index 65f4e896c00..65f4e896c00 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_1o2o.yqls
index a6f66f231e4..a6f66f231e4 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Exclusion2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12.yqls
index ebb11c95606..ebb11c95606 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12u.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12u.yqls
index 9047dae5cb1..9047dae5cb1 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12u.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_12u.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1o2o.yqls
index 4f3b39aead0..4f3b39aead0 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2.yqls
index cce29bdeba6..cce29bdeba6 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2u.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2u.yqls
index b2025d9f136..b2025d9f136 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2u.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2_1u2u.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_12.yqls
index e73d11378cc..e73d11378cc 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_1o2o.yqls
index 02fe6bd9b73..02fe6bd9b73 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Full2key12_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12.yqls
index 6a0eca2a30c..6a0eca2a30c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12o.yqls
index 4aa5328146b..4aa5328146b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_12o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2.yqls
index e114fdd3205..e114fdd3205 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2o.yqls
index dfef6fe6c84..dfef6fe6c84 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12.yqls
index 28175bd604f..28175bd604f 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12o.yqls
index 981d1a26d3b..981d1a26d3b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_12o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2.yqls
index f217a74ac36..f217a74ac36 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2o.yqls
index c397a2f86cd..c397a2f86cd 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Inner2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_123.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_123.yqls
index 5f4c36f6e0a..5f4c36f6e0a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_123.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_123.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_1o2o3o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_1o2o3o.yqls
index 959778c020c..959778c020c 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_1o2o3o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3_1o2o3o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_123.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_123.yqls
index af7186040de..af7186040de 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_123.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_123.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_1o2o3o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_1o2o3o.yqls
index f1e98e13034..f1e98e13034 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_1o2o3o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/InnerInner3key2_1o2o3o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.yqls
index 46c35ef2a9e..46c35ef2a9e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithNonStrict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.yqls
index 0cd1abd0e96..0cd1abd0e96 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/JoinWithSortedDesc.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_12.yqls
index 203d420f059..203d420f059 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_1o2o.yqls
index 1cc15375b5b..1cc15375b5b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_12.yqls
index f376fd59f53..f376fd59f53 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_1o2o.yqls
index ecbcf526494..ecbcf526494 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Left2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_12.yqls
index 7ad7499a36a..7ad7499a36a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_1o2o.yqls
index eee4c487260..eee4c487260 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_12.yqls
index 7983fd5c845..7983fd5c845 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_1o2o.yqls
index 72d92bae070..72d92bae070 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftOnly2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_12.yqls
index b9b78b1e30a..b9b78b1e30a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_1o2o.yqls
index cbfc95831dc..cbfc95831dc 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_12.yqls
index fb3e649ac76..fb3e649ac76 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_1o2o.yqls
index c97954aec4e..c97954aec4e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/LeftSemi2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_12.yqls
index c0cfeddbacd..c0cfeddbacd 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_1o2o.yqls
index 0d9096f170e..0d9096f170e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_12.yqls
index d6e27227a06..d6e27227a06 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_1o2o.yqls
index 26a9da603e2..26a9da603e2 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/Right2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_12.yqls
index ac557b7c394..ac557b7c394 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_1o2o.yqls
index 818530c6444..818530c6444 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_12.yqls
index 57525fe5cd8..57525fe5cd8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_1o2o.yqls
index d94a379a98e..d94a379a98e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightOnly2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_12.yqls
index 2d97e5de4f6..2d97e5de4f6 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_1o2o.yqls
index 78812b05040..78812b05040 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_12.yqls
index 614f56af07e..614f56af07e 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_1o2o.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_1o2o.yqls
index 36754914d34..36754914d34 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_1o2o.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinMerge/RightSemi2key2_1o2o.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrdered.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrdered.yqls
index d16765b530d..d16765b530d 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrdered.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrdered.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedKey2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedKey2.yqls
index 86ddc7edeaa..86ddc7edeaa 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedKey2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedKey2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1.yqls
index dc6553ace88..dc6553ace88 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12.yqls
index 52ec5510315..52ec5510315 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12Key2.yqls
index c283681f65a..c283681f65a 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt12Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1Key2.yqls
index c0fd196bb3f..c0fd196bb3f 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt1Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2.yqls
index cc2f36e4b9b..cc2f36e4b9b 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2Key2.yqls
index 06a7f9e7901..06a7f9e7901 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinOrdered/JoinOrderedOpt2Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinType.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinType.yqls
index 16d3de6d284..16d3de6d284 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinType.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeKey2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeKey2.yqls
index 7fc7ecf8ab5..7fc7ecf8ab5 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeKey2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeKey2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1.yqls
index a20d8aec9bb..a20d8aec9bb 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12.yqls
index d566b92b1c9..d566b92b1c9 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12Key2.yqls
index b2027e278b8..b2027e278b8 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt12Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1Key2.yqls
index 5ab66d2fc5f..5ab66d2fc5f 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt1Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2.yqls
index 96f210378d2..96f210378d2 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2Key2.yql b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2Key2.yqls
index e5f7c57d6d6..e5f7c57d6d6 100644
--- a/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2Key2.yql
+++ b/yql/essentials/tests/s-expressions/suites/EquiJoinType/JoinTypeOpt2Key2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yql b/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yqls
index b6d23e3c3ee..b6d23e3c3ee 100644
--- a/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/ConfigureFileFromUrl.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yql b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yqls
index 6e65cc1e652..6e65cc1e652 100644
--- a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToOneFile.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yql b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yqls
index 6e65cc1e652..6e65cc1e652 100644
--- a/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/DifferentAliasesToSameFiles.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/FileContent.yql b/yql/essentials/tests/s-expressions/suites/File/FileContent.yqls
index 3e34cb8a581..3e34cb8a581 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FileContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/FileContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/FilePath.yql b/yql/essentials/tests/s-expressions/suites/File/FilePath.yqls
index 1b036e6da4c..1b036e6da4c 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FilePath.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/FilePath.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yql b/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yqls
index fa4d5835ce9..fa4d5835ce9 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/FilePathFromRoot.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.yql b/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.yqls
index 203ac402541..203ac402541 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/FillWithFileContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/FolderPath.yql b/yql/essentials/tests/s-expressions/suites/File/FolderPath.yqls
index e676a8a14dc..e676a8a14dc 100644
--- a/yql/essentials/tests/s-expressions/suites/File/FolderPath.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/FolderPath.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yql b/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yqls
index 78799b4126d..78799b4126d 100644
--- a/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/HomeFiles.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.yql b/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.yqls
index d481de68098..d481de68098 100644
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/MapWithFileContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.yql b/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.yqls
index fcd006e0aa9..fcd006e0aa9 100644
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/MapWithFilePath.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.yql b/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.yqls
index a9bd5a3ada6..a9bd5a3ada6 100644
--- a/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/MapWithFolderPath.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/File/RootFiles.yql b/yql/essentials/tests/s-expressions/suites/File/RootFiles.yqls
index cf275fb841a..cf275fb841a 100644
--- a/yql/essentials/tests/s-expressions/suites/File/RootFiles.yql
+++ b/yql/essentials/tests/s-expressions/suites/File/RootFiles.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/AggregateWithFilter.yql b/yql/essentials/tests/s-expressions/suites/Filter/AggregateWithFilter.yqls
index 0f811313c61..0f811313c61 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/AggregateWithFilter.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/AggregateWithFilter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/CloseRange.yql b/yql/essentials/tests/s-expressions/suites/Filter/CloseRange.yqls
index 8f8a2ebb287..8f8a2ebb287 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/CloseRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/CloseRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/CloseRangeOnSortedInput.yql b/yql/essentials/tests/s-expressions/suites/Filter/CloseRangeOnSortedInput.yqls
index 67767e39c00..67767e39c00 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/CloseRangeOnSortedInput.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/CloseRangeOnSortedInput.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRange.yql b/yql/essentials/tests/s-expressions/suites/Filter/EmptyRange.yqls
index 5e3c989afae..5e3c989afae 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/EmptyRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRangeOnSortedInput.yql b/yql/essentials/tests/s-expressions/suites/Filter/EmptyRangeOnSortedInput.yqls
index 4dca20b467a..4dca20b467a 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/EmptyRangeOnSortedInput.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/EmptyRangeOnSortedInput.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/Equal.yql b/yql/essentials/tests/s-expressions/suites/Filter/Equal.yqls
index 77d9b0ea8a0..77d9b0ea8a0 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/Equal.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/Equal.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/EqualOnSortedInput.yql b/yql/essentials/tests/s-expressions/suites/Filter/EqualOnSortedInput.yqls
index f69dde24bf6..f69dde24bf6 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/EqualOnSortedInput.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/EqualOnSortedInput.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.yqls
index 25e70ab0806..25e70ab0806 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Double.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.yqls
index 7e51737f4f8..7e51737f4f8 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Float.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.yqls
index 9b61dfc6336..9b61dfc6336 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.yqls
index bd121653b7e..bd121653b7e 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Int64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.yqls
index 91c443c6a82..91c443c6a82 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.yqls
index dcd71898d44..dcd71898d44 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvByte-Uint64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.yqls
index f3e31ddd821..f3e31ddd821 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Byte.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.yqls
index 01b53116ac3..01b53116ac3 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Float.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.yqls
index 9c6f02ce770..9c6f02ce770 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.yqls
index c2e5812eaf7..c2e5812eaf7 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Int64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.yqls
index ddf42e56cca..ddf42e56cca 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.yqls
index f34acbcdba8..f34acbcdba8 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvDouble-Uint64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.yqls
index ea85b0f4f80..ea85b0f4f80 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Double.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.yqls
index 9c6f02ce770..9c6f02ce770 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.yqls
index c2e5812eaf7..c2e5812eaf7 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Int64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.yqls
index ddf42e56cca..ddf42e56cca 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.yqls
index f34acbcdba8..f34acbcdba8 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvFloat-Uint64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.yqls
index 7fd743bdee1..7fd743bdee1 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Double.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.yqls
index 520276f126e..520276f126e 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Float.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.yqls
index b921b10b201..b921b10b201 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Int64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.yqls
index 6dc9e5769cf..6dc9e5769cf 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.yqls
index df99564b89e..df99564b89e 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt32-Uint64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.yqls
index cbfb7cad03b..cbfb7cad03b 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Double.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.yqls
index b94c11aecc9..b94c11aecc9 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Float.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.yqls
index e3a5b10cbb5..e3a5b10cbb5 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Int32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.yqls
index 6dc9e5769cf..6dc9e5769cf 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.yqls
index eb43b461300..eb43b461300 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvInt64-Uint64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.yqls
index d74c89079da..d74c89079da 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Double.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.yqls
index 119a06c083b..119a06c083b 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Float.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.yqls
index 0ef31b3b213..0ef31b3b213 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.yqls
index 029097b6fd6..029097b6fd6 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Int64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.yqls
index 5350dcda71f..5350dcda71f 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint32-Uint64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.yqls
index d7caabfc19c..d7caabfc19c 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Double.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.yqls
index 119a06c083b..119a06c083b 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Float.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.yqls
index 638bf6954a5..638bf6954a5 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.yqls
index 7e29e229f3b..7e29e229f3b 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Int64.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.yql b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.yqls
index 9cf0b972e22..9cf0b972e22 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/ImplicitConvUint64-Uint32.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.yql b/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.yqls
index d6e6d8fe10c..d6e6d8fe10c 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/LMapCombineWithFilter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.yql b/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.yqls
index f5981f92ac4..f5981f92ac4 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/LMapWithFilter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.yql b/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.yqls
index 8d737e225fa..8d737e225fa 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/MixedTypeRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.yql b/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.yqls
index 702b00544b2..702b00544b2 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/NullBoundary.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/OpenRange.yql b/yql/essentials/tests/s-expressions/suites/Filter/OpenRange.yqls
index dcc95c73532..dcc95c73532 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/OpenRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/OpenRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/OpenRangeOnSortedInput.yql b/yql/essentials/tests/s-expressions/suites/Filter/OpenRangeOnSortedInput.yqls
index 83df5958d94..83df5958d94 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/OpenRangeOnSortedInput.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/OpenRangeOnSortedInput.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.yql b/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.yqls
index 7f4a8281fb3..7f4a8281fb3 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/OptionalBoundary.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.yql b/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.yqls
index 0d5342fa93f..0d5342fa93f 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/PartialKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersection.yql b/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersection.yqls
index 35aec35fb1e..35aec35fb1e 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersection.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersection.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersectionOnSortedInput.yql b/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersectionOnSortedInput.yqls
index 59803168e16..59803168e16 100644
--- a/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersectionOnSortedInput.yql
+++ b/yql/essentials/tests/s-expressions/suites/Filter/RangeIntersectionOnSortedInput.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yql b/yql/essentials/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yqls
index da309347a4b..da309347a4b 100644
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yql
+++ b/yql/essentials/tests/s-expressions/suites/GraceJoin/GraceJoinCore_Flow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yql b/yql/essentials/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yqls
index e184b34935d..e184b34935d 100644
--- a/yql/essentials/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yql
+++ b/yql/essentials/tests/s-expressions/suites/GraceJoin/SelfJoinCore_Flow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yqls
index dfc37d30de9..dfc37d30de9 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Arithmetic.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yqls
index 9e4f52e93da..9e4f52e93da 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AsListInferCommonTypeOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yqls
index a326656deb5..a326656deb5 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvert.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yqls
index d3a2fa7c5a9..d3a2fa7c5a9 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByBinContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yqls
index 478ba0b492c..478ba0b492c 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yqls
index 1008cf6499f..1008cf6499f 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByIf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yqls
index afe7c047356..afe7c047356 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByMinusContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yqls
index 27ac41dba13..27ac41dba13 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertByPlusContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yqls
index 9977eefc305..9977eefc305 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yqls
index 4ea96cadabc..4ea96cadabc 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoConvertCoalesceSrtucts.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yqls
index ce67a47d551..ce67a47d551 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJust.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yqls
index 88c2e397a74..88c2e397a74 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/AutoJustByIf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yqls
index 3f2fa9519d5..3f2fa9519d5 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Compare.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yqls
index 20547b0aaa9..20547b0aaa9 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Enumerate.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yqls
index 4da23532181..4da23532181 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverData.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yqls
index bab448cfa01..bab448cfa01 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDataIntegralTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yqls
index 17dbdd3de45..17dbdd3de45 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yqls
index 9622fabe4be..9622fabe4be 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yqls
index 468cab9df7d..468cab9df7d 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yqls
index ae8830e61f4..ae8830e61f4 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yqls
index 3461a8d2392..3461a8d2392 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yqls
index a6de9098512..a6de9098512 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yqls
index 28dd639e69d..28dd639e69d 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/ImplicitEqualsOverVariantTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yqls
index f7393666cc6..f7393666cc6 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideDictLiteral.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yqls
index b2259327f1e..b2259327f1e 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yqls
index bd0adcd4544..bd0adcd4544 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideListLiteral.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yqls
index ddf3ad70b0a..ddf3ad70b0a 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yqls
index 52b4d2872a0..52b4d2872a0 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideOptLiteral.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yqls
index 4bf5f79adb6..4bf5f79adb6 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yqls
index 69051e7c19c..69051e7c19c 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideStructLiteral.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yqls
index a06b03fe9dd..a06b03fe9dd 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yqls
index 28da7c86172..28da7c86172 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideTupleLiteral.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yqls
index 2acee2f12b1..2acee2f12b1 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariant.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yqls
index bbc1bfa584f..bbc1bfa584f 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/InsideVariantLiteral.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yqls
index 8c5bc625958..8c5bc625958 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NarrowStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yqls
index cf59f2bb0c9..cf59f2bb0c9 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/NullAsOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yqls
index 718fabeac3e..718fabeac3e 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Shift.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yqls
index e906d237e56..e906d237e56 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Skip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yqls
index 2de7c5efe9a..2de7c5efe9a 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Substring.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yqls
index b91a23e1def..b91a23e1def 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/Take.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yqls
index a2d9759568f..a2d9759568f 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructExtraItemsFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yqls
index ac57358f036..ac57358f036 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructNameMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yqls
index a4e5f7dd40c..a4e5f7dd40c 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetNameMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yqls
index a7bfc3ca2aa..a7bfc3ca2aa 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTargetTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yqls
index cc6a372e445..cc6a372e445 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverStructTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yqls
index d6e73eab293..d6e73eab293 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleExtraItemsFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yqls
index e0419e94da7..e0419e94da7 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleNotEnoughItemsFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yqls
index 615950d5861..615950d5861 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTargetTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yqls
index b9d74083836..b9d74083836 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralOverTupleTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yqls
index d58f23fe270..d58f23fe270 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantLiteralUnderlyingTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yqls
index 80492a709e2..80492a709e2 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructExtraItemsFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yqls
index b71b50dff70..b71b50dff70 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructNameMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yqls
index bd91e105e0e..bd91e105e0e 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetNameMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yqls
index f40ab1d5d8f..f40ab1d5d8f 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTargetTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yqls
index aa0ab07e67c..aa0ab07e67c 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverStructTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yqls
index 5c9d9479813..5c9d9479813 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleExtraItemsFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yqls
index 2ececbce275..2ececbce275 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleNotEnoughItemsFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yqls
index 21c992bea55..21c992bea55 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTargetTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yqls
index be762d24219..be762d24219 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantOverTupleTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yql b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yqls
index 01a658c16e0..01a658c16e0 100644
--- a/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/ImplictCasts/VariantUnderlyingTypeMismatchFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yqls
index e41c01a7b40..e41c01a7b40 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/AccessDictOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yql b/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yqls
index c84047a2952..c84047a2952 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/AggrMinMaxTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yql b/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yqls
index 9cf4e539631..9cf4e539631 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/BitCore.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yql b/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yqls
index 6be3f9bffc7..6be3f9bffc7 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ByteAt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Collect.yql b/yql/essentials/tests/s-expressions/suites/InMem/Collect.yqls
index e62000f1ee9..e62000f1ee9 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Collect.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Collect.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yql b/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yqls
index 1e399b48ccb..1e399b48ccb 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareNulls.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yql b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yqls
index 112fc7f5341..112fc7f5341 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yql b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yqls
index 5d9ca773812..5d9ca773812 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareStruct2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yql b/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yqls
index b51f8645739..b51f8645739 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CompareTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.yqls
index a20d1188dca..a20d1188dca 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ConcatOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/CountBits.yql b/yql/essentials/tests/s-expressions/suites/InMem/CountBits.yqls
index 5f688a50751..5f688a50751 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/CountBits.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/CountBits.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Default.yql b/yql/essentials/tests/s-expressions/suites/InMem/Default.yqls
index a7f86670674..a7f86670674 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Default.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Default.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Demux.yql b/yql/essentials/tests/s-expressions/suites/InMem/Demux.yqls
index 6fd4b3f3cd8..6fd4b3f3cd8 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Demux.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Demux.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yqls
index b12be636c86..b12be636c86 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DictOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yql b/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yqls
index 4c9e5b46d55..4c9e5b46d55 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DictOptTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yql b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yqls
index 25e92e7eff1..25e92e7eff1 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeContains.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yql b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yqls
index d7c81831cbf..d7c81831cbf 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/DiffKeyTypeLookup.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yql b/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yqls
index ed1ea538689..ed1ea538689 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ExtractMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yql b/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yqls
index 6d14f0d268b..6d14f0d268b 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FilterNullMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yql b/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yqls
index ee25f707f1b..ee25f707f1b 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FilterWithLimit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yql b/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yqls
index 306f0738036..306f0738036 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FlatMapFiltersSortedList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yql b/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yqls
index 02b70ad22bb..02b70ad22bb 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FloatsIncDec.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yql b/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yqls
index efa89ba44cf..efa89ba44cf 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FloatsMod.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold.yql b/yql/essentials/tests/s-expressions/suites/InMem/Fold.yqls
index 9f4ce156f31..9f4ce156f31 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yql b/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yqls
index 751de45375a..751de45375a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold1Map.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yql b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yqls
index 1a3aad97c97..1a3aad97c97 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverPreservedStream.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yql b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yqls
index c555c6df02c..c555c6df02c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Fold1MapOverUnboundedPreservedStream.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yql b/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yqls
index fde736a37c7..fde736a37c7 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/FoldMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yql b/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yqls
index dfec8da682a..dfec8da682a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ForwardList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yqls
index 30fcbac0b5b..30fcbac0b5b 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/GroupOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yql b/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yqls
index c21c6b07d37..c21c6b07d37 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/GroupOptTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Guess.yql b/yql/essentials/tests/s-expressions/suites/InMem/Guess.yqls
index 256b5de592e..256b5de592e 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Guess.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Guess.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yql b/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yqls
index 0ae29c35940..0ae29c35940 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Hopping.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yqls
index b551ccbad05..b551ccbad05 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/IndexDictOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yql b/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yqls
index 0cba17d6ea7..0cba17d6ea7 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Iterator.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/LMap.yql b/yql/essentials/tests/s-expressions/suites/InMem/LMap.yqls
index 12ad41b0a73..12ad41b0a73 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/LMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/LMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yql b/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yqls
index 6c3403e7d48..6c3403e7d48 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ListExtendMany.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yql b/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yqls
index 7bf690187b4..7bf690187b4 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ListFromRangeForDates.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yqls
index fafe8bee402..fafe8bee402 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/MemberOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Merge.yql b/yql/essentials/tests/s-expressions/suites/InMem/Merge.yqls
index 3e91e821c64..3e91e821c64 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Merge.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Merge.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yql b/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yqls
index 7a39c20b0a3..7a39c20b0a3 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/MultiMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Mux.yql b/yql/essentials/tests/s-expressions/suites/InMem/Mux.yqls
index 2a226541f34..2a226541f34 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Mux.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Mux.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yqls
index 428da2f45f8..428da2f45f8 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/NthOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yql b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yqls
index af112ea3609..af112ea3609 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yql b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yqls
index a5c99fd3eef..a5c99fd3eef 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionByKeySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yql b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yqls
index 81326641f1f..81326641f1f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeys.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yql b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yqls
index 73f3a3f9701..73f3a3f9701 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/PartitionsByKeysSorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Queue.yql b/yql/essentials/tests/s-expressions/suites/InMem/Queue.yqls
index 2589942a60f..2589942a60f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Queue.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Queue.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yql b/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yqls
index 5bf3868fcc5..5bf3868fcc5 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueCheckDependent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yql b/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yqls
index 55e36075f5b..55e36075f5b 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueMixedTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yql b/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yqls
index 3a0c673d27e..3a0c673d27e 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueRangeWithPreservedStream.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yql b/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yqls
index e7c8c1d0297..e7c8c1d0297 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/QueueSimpleStrings.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yql b/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yqls
index bb7203c5021..bb7203c5021 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ReplaceMember.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Seq.yql b/yql/essentials/tests/s-expressions/suites/InMem/Seq.yqls
index ea9eec4131a..ea9eec4131a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Seq.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Seq.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yql b/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yqls
index 8da7e768fd3..8da7e768fd3 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SkipNullMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yqls
index 3ef2f4081b4..3ef2f4081b4 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SortOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yql b/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yqls
index ddfb0a7e16f..ddfb0a7e16f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SortOptTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yql b/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yqls
index 9ad041b1159..9ad041b1159 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/SqlAccess.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yql b/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yqls
index c4c247d6759..c4c247d6759 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StaticMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yqls
index adf904774d1..adf904774d1 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamDiscard.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yqls
index 0e04475199d..0e04475199d 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yqls
index ce40b9f8a93..ce40b9f8a93 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFilter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yqls
index 9a23a4d5918..9a23a4d5918 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFlatMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yqls
index 5acfe5d46d8..5acfe5d46d8 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFold1Map.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yqls
index 78557d82b83..78557d82b83 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamFoldMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yqls
index e58ebc251e5..e58ebc251e5 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamInCombineByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yqls
index 5eae4467ff4..5eae4467ff4 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamInGroupByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yqls
index cb48729c8f4..cb48729c8f4 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yqls
index 3d553a2b36f..3d553a2b36f 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamSkip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yql b/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yqls
index 0870b1aac3c..0870b1aac3c 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StreamTake.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yql b/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yqls
index 9d5e42e3cf9..9d5e42e3cf9 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StringContains.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yql b/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yqls
index c6b3b3de2d6..c6b3b3de2d6 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/StringWith.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Switch.yql b/yql/essentials/tests/s-expressions/suites/InMem/Switch.yqls
index 9c17ddd66e5..9c17ddd66e5 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Switch.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Switch.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yql b/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yqls
index 4ad7ec02d12..4ad7ec02d12 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/TimezoneIdName.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yql b/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yqls
index aa9ed74d8fd..aa9ed74d8fd 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToBytes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yql b/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yqls
index c66f952fa6a..c66f952fa6a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yql b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yqls
index 0a2fab711ec..0a2fab711ec 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yql b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yqls
index a76f4833304..a76f4833304 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOptTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yql b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yqls
index bbb90c5408a..bbb90c5408a 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToDictOverOptList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yql b/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yqls
index b9e3d077aef..b9e3d077aef 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/ToOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Top.yql b/yql/essentials/tests/s-expressions/suites/InMem/Top.yqls
index 0e8ab78955d..0e8ab78955d 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Top.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Top.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yql b/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yqls
index 5b2d4c39302..5b2d4c39302 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/VariantItem.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Visit.yql b/yql/essentials/tests/s-expressions/suites/InMem/Visit.yqls
index 0616a5100cb..0616a5100cb 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Visit.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Visit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/InMem/Way.yql b/yql/essentials/tests/s-expressions/suites/InMem/Way.yqls
index a1e2043ec37..a1e2043ec37 100644
--- a/yql/essentials/tests/s-expressions/suites/InMem/Way.yql
+++ b/yql/essentials/tests/s-expressions/suites/InMem/Way.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore.yql b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore.yqls
index 8bf51c75d56..8bf51c75d56 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft.yql b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft.yqls
index 3d7aacb4dca..3d7aacb4dca 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft_Flow.yql b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft_Flow.yqls
index 5d4048a4ab9..5d4048a4ab9 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft_Flow.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedLeft_Flow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight.yql b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight.yqls
index 64425dd37bf..64425dd37bf 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight_Flow.yql b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight_Flow.yqls
index a3d9b47ecf6..a3d9b47ecf6 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight_Flow.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCoreSortedRight_Flow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_Flow.yql b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_Flow.yqls
index 10b5abc6e7d..10b5abc6e7d 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_Flow.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_Flow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_FlowOfTuples.yql b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_FlowOfTuples.yqls
index bb15c6f634d..bb15c6f634d 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_FlowOfTuples.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/CommonJoinCore_FlowOfTuples.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/EmptyLeftJoin.yql b/yql/essentials/tests/s-expressions/suites/Join/EmptyLeftJoin.yqls
index 78c4cbd20f2..78c4cbd20f2 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/EmptyLeftJoin.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/EmptyLeftJoin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yql b/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yqls
index aecec9aba2f..aecec9aba2f 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/JoinInMem.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/JoinTypes.yql b/yql/essentials/tests/s-expressions/suites/Join/JoinTypes.yqls
index dff7b4a5f8a..dff7b4a5f8a 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/JoinTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/JoinTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore.yql b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore.yqls
index 31113280248..31113280248 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yql b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yqls
index 663bde49553..663bde49553 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yql b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yqls
index 9c1ef15dfec..9c1ef15dfec 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCoreOnStrings_Flow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_Flow.yql b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_Flow.yqls
index 61b150f5f85..61b150f5f85 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_Flow.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_Flow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yql b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yqls
index dbd0d1712d9..dbd0d1712d9 100644
--- a/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yql
+++ b/yql/essentials/tests/s-expressions/suites/Join/MapJoinCore_FlowOfTuples.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yqls
index 3a918b3c818..3a918b3c818 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yqls
index 3b90e993915..3b90e993915 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yqls
index 830f163e5f5..830f163e5f5 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_If_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yqls
index 1862c9703d3..1862c9703d3 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Avg_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yqls
index 75cbff27311..75cbff27311 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_And.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yqls
index 37cd22a4ed9..37cd22a4ed9 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Or.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yqls
index b4cb8e8f5af..b4cb8e8f5af 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bit_Xor.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yqls
index 3f57941811a..3f57941811a 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_And_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yqls
index 32ab9bdf8ed..32ab9bdf8ed 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Or_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yqls
index 7463add10f9..7463add10f9 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Bool_Xor_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yqls
index f00b6365aab..f00b6365aab 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Compare_By_Opts.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yqls
index 70c1586820a..70c1586820a 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yqls
index 4e21b049d62..4e21b049d62 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yqls
index 2bbd4d8aeef..2bbd4d8aeef 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_All_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yqls
index 05fc3411eeb..05fc3411eeb 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yqls
index 562b296e54d..562b296e54d 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_If_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yqls
index 1c622b7dc42..1c622b7dc42 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Count_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yqls
index 4164df0baf5..4164df0baf5 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yqls
index f0aa5592692..f0aa5592692 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yqls
index 35b9f5ff52f..35b9f5ff52f 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_All_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yqls
index 2f803d033cb..2f803d033cb 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yqls
index 23fc8348fd5..23fc8348fd5 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_If_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yqls
index b8d6f537a65..b8d6f537a65 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Count_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yqls
index 5ecf5b1435e..5ecf5b1435e 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yqls
index 9eeab953817..9eeab953817 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Max_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yqls
index b31163c9ede..b31163c9ede 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yqls
index 2f6803c9ce7..2f6803c9ce7 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Min_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yqls
index f765ed07b9d..f765ed07b9d 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yqls
index 7194f87bdcf..7194f87bdcf 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Some_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yqls
index 6aaa8a231ae..6aaa8a231ae 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yqls
index 4c19ad9f298..4c19ad9f298 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Distinct_Sum_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yqls
index 61ed0f21793..61ed0f21793 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yqls
index 6fc71776620..6fc71776620 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Compare_By_Opts.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yqls
index ab1302c752f..ab1302c752f 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Limit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yqls
index 0572dfb448d..0572dfb448d 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yqls
index d2ec207c91d..d2ec207c91d 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Max_By_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yqls
index e29fb2715c2..e29fb2715c2 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yqls
index 96e85e97c40..96e85e97c40 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Min_By_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yqls
index a22f743db37..a22f743db37 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_List_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yqls
index 8bf97f958c8..8bf97f958c8 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yqls
index e28d35900c9..e28d35900c9 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yqls
index 95168e3143e..95168e3143e 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_By_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yqls
index 6e412416255..6e412416255 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Max_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yqls
index 35ecccd09e1..35ecccd09e1 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yqls
index 3ad67c8e7f3..3ad67c8e7f3 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yqls
index 7e485916091..7e485916091 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_By_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yqls
index 648369b4d39..648369b4d39 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Min_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yqls
index 629a3cea335..629a3cea335 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yqls
index 34ec224a58b..34ec224a58b 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Some_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yqls
index 2a943f12340..2a943f12340 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yqls
index c229026827f..c229026827f 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yqls
index 51e667e8d30..51e667e8d30 100755
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_If_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yql b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yqls
index a50b4f93a93..a50b4f93a93 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Agg_Sum_Opt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Decode.yql b/yql/essentials/tests/s-expressions/suites/Lib/Decode.yqls
index 25d3e102c61..25d3e102c61 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Decode.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Decode.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yql b/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yqls
index 431c462e108..431c462e108 100644
--- a/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yql
+++ b/yql/essentials/tests/s-expressions/suites/Lib/Sqr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldProject.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldProject.yqls
index 55b38fb1b9b..55b38fb1b9b 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldProject.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldProject.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldRead.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldRead.yqls
index 67becd3ffb9..67becd3ffb9 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldRead.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/BadUnionButUnusedFieldRead.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.yqls
index 89b7fd5a763..89b7fd5a763 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/CompactPlan.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ConcatSortedAndNonSorted.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ConcatSortedAndNonSorted.yqls
index a16749b54fa..a16749b54fa 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ConcatSortedAndNonSorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ConcatSortedAndNonSorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupAndSort.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupAndSort.yqls
index 08089395f75..08089395f75 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupAndSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupAndSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupByExtend.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupByExtend.yqls
index 0089378d22a..0089378d22a 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupByExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/DupByExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ExtendBetweenSorts.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ExtendBetweenSorts.yqls
index 110b0a004a8..110b0a004a8 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ExtendBetweenSorts.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ExtendBetweenSorts.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterAfterExtend.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterAfterExtend.yqls
index 1c7045232cf..1c7045232cf 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterAfterExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterAfterExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterBeforeExtend.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterBeforeExtend.yqls
index 2f2f487eca9..2f2f487eca9 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterBeforeExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/FilterBeforeExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.yqls
index 1afa2e265e9..1afa2e265e9 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcat.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.yqls
index 2215cc24283..2215cc24283 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/GroupAfterWeakConcatOther.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableRange.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableRange.yqls
index 40cb4dc92c5..40cb4dc92c5 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableStrictRange.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableStrictRange.yqls
index b52191ad746..b52191ad746 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableStrictRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTableStrictRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTwoTables.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTwoTables.yqls
index 6855885d32a..6855885d32a 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTwoTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfTwoTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfWeakConcatTables.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfWeakConcatTables.yqls
index b103b4e66ec..b103b4e66ec 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfWeakConcatTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/LengthOfWeakConcatTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ManyTableRange.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ManyTableRange.yqls
index f5612e30a04..f5612e30a04 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/ManyTableRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/ManyTableRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapThreeTables.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapThreeTables.yqls
index 506868f4a8d..506868f4a8d 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapThreeTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapThreeTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapTwoTables.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapTwoTables.yqls
index aca48ae0c83..aca48ae0c83 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapTwoTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/MapTwoTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/Skip.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/Skip.yqls
index 1995fa124f3..1995fa124f3 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/Skip.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/Skip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SkipTakeThenMapTreeTables.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SkipTakeThenMapTreeTables.yqls
index a4b1c5f1c6b..a4b1c5f1c6b 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SkipTakeThenMapTreeTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SkipTakeThenMapTreeTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SortTwoTables.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SortTwoTables.yqls
index 799d9cb4881..799d9cb4881 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SortTwoTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SortTwoTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SplitTableRange.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SplitTableRange.yqls
index 8793b592e7e..8793b592e7e 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/SplitTableRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/SplitTableRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRange.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRange.yqls
index 5e16c9166dd..5e16c9166dd 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRangeStrict.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRangeStrict.yqls
index 80647dd6610..80647dd6610 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRangeStrict.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/TableRangeStrict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverStrictTableRange.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverStrictTableRange.yqls
index 3cca68b2ab1..3cca68b2ab1 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverStrictTableRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverStrictTableRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverTableRange.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverTableRange.yqls
index b43c3f66d40..b43c3f66d40 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverTableRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatOverTableRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.yqls
index a9ac514a995..a9ac514a995 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.yql b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.yqls
index da7c64aa5d9..da7c64aa5d9 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyInputTables/WeakConcatTablesBadUnusedColumn.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.yqls
index eaa0d95edbd..eaa0d95edbd 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1465.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.yqls
index a8908a0100c..a8908a0100c 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/Bug1941.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenGroup.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenGroup.yqls
index 5a39b908878..5a39b908878 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenGroup.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenGroup.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenSort.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenSort.yqls
index c9f35934d8c..c9f35934d8c 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/CombineThenSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapCombineMap.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapCombineMap.yqls
index fd5d2eb0e7a..fd5d2eb0e7a 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapCombineMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapCombineMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenExtend.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenExtend.yqls
index d8c639d0551..d8c639d0551 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenGroup.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenGroup.yqls
index 6248b7416ea..6248b7416ea 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenGroup.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenGroup.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenSort.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenSort.yqls
index fd736cacf27..fd736cacf27 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapThenSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapWithReadTable.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapWithReadTable.yqls
index c276a9e8358..c276a9e8358 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapWithReadTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/MapWithReadTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenMap.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenMap.yqls
index df91ac7aabe..df91ac7aabe 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenSort.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenSort.yqls
index 420d463be3b..420d463be3b 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/ReduceThenSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/TakeThenMap.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/TakeThenMap.yqls
index f1dfaf4ca48..f1dfaf4ca48 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/TakeThenMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/TakeThenMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_1.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_1.yqls
index 5e6aec09e8f..5e6aec09e8f 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_1.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_2.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_2.yqls
index 6c2634f9ad9..6c2634f9ad9 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_2.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrOperations/YQL-1733_2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.yql b/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.yqls
index 8ebe956e7c1..8ebe956e7c1 100644
--- a/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.yql
+++ b/yql/essentials/tests/s-expressions/suites/ManyYamrTransactions/program1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiIn.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiIn.yqls
index 261a85c9317..261a85c9317 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiIn.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiIn.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiOut.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiOut.yqls
index aeefafd75f6..aeefafd75f6 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiOut.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/LMapWithMultiOut.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MapOverDemux.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/MapOverDemux.yqls
index 4697cb40baf..4697cb40baf 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MapOverDemux.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/MapOverDemux.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMap.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMap.yqls
index bbceddd5da9..bbceddd5da9 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMixed.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMixed.yqls
index 77f51cfd2bf..77f51cfd2bf 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMixed.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverMixed.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverRead.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverRead.yqls
index 08c7c997bcc..08c7c997bcc 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverRead.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/MuxOverRead.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/OrderedPartitionByKeyWithMultiOut.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/OrderedPartitionByKeyWithMultiOut.yqls
index 56ef61571a4..56ef61571a4 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/OrderedPartitionByKeyWithMultiOut.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/OrderedPartitionByKeyWithMultiOut.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/PartitionByKeyWithMultiOut.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/PartitionByKeyWithMultiOut.yqls
index bcb27c7be3e..bcb27c7be3e 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/PartitionByKeyWithMultiOut.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/PartitionByKeyWithMultiOut.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts1.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts1.yqls
index 30fefdd2f46..30fefdd2f46 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts1.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts2.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts2.yqls
index 5d0c493a3d9..5d0c493a3d9 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts2.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts3.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts3.yqls
index 683fca64b4e..683fca64b4e 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts3.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/SuppressOuts3.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/MultiIO/WriteOverDemux.yql b/yql/essentials/tests/s-expressions/suites/MultiIO/WriteOverDemux.yqls
index ddf986949cf..ddf986949cf 100644
--- a/yql/essentials/tests/s-expressions/suites/MultiIO/WriteOverDemux.yql
+++ b/yql/essentials/tests/s-expressions/suites/MultiIO/WriteOverDemux.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.yqls
index f3d4e5db524..f3d4e5db524 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/AggregateAfterUnion.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.yqls
index 0886d5c7a95..0886d5c7a95 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidDuplicationOfJoinsBeforeAggr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.yqls
index 9918cc77704..9918cc77704 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/AvoidFuseOfSameJoins.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yqls
index fe707cfe079..fe707cfe079 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/BinaryDataLiterals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.yqls
index 7c3615fa7f7..7c3615fa7f7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ChopperUseOnlyKeyInHandler.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CloneStructure.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CloneStructure.yqls
index e2e95e299bc..e2e95e299bc 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CloneStructure.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CloneStructure.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yqls
index 5d034dfec2c..5d034dfec2c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverJust.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yqls
index efbc67ef1b7..efbc67ef1b7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceOverNothing.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yqls
index 1d290a7ef73..1d290a7ef73 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverAnd.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yqls
index 1d48368834b..1d48368834b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverNot.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yqls
index 9e382837fc5..9e382837fc5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CoalesceWithBoolOverOr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yqls
index ef949a7afb9..ef949a7afb9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yqls
index 10443671862..10443671862 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Condense1OneItemTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yqls
index 1d24deecd50..1d24deecd50 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yqls
index d638ca1fefa..d638ca1fefa 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CondenseOneItemTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yqls
index ca92c5573e6..ca92c5573e6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yqls
index 5d213f0f5ac..5d213f0f5ac 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenCondense1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yqls
index 06d8d1ee2e9..06d8d1ee2e9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yqls
index dbb25f37ee1..dbb25f37ee1 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConstMapThenFold1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yqls
index 37b6fe207ea..37b6fe207ea 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ConsumeOrMoveForwardList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.yqls
index 6d0405e5628..6d0405e5628 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.yqls
index ebd34f15ed8..ebd34f15ed8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/CountDistinctOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.yqls
index d1a2b6f1e21..d1a2b6f1e21 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupAndWithCommonPartsUnderOr.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.yqls
index 0271673f550..0271673f550 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/DedupOrWithCommonPartsUnderAnd.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DemuxOverExtend.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/DemuxOverExtend.yqls
index b8eba4c967d..b8eba4c967d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DemuxOverExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/DemuxOverExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yqls
index cd9fa2787f9..cd9fa2787f9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/DoubleSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yqls
index d78e05c61f5..d78e05c61f5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivInsideNestedLambdaOuterDiffLevel.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yqls
index 792976bc37e..792976bc37e 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivLambda.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yqls
index 2c5734f7039..2c5734f7039 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOneLevel.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yqls
index caa3cca7632..caa3cca7632 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterDiffLevel.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yqls
index 810324b0dd3..810324b0dd3 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNestedLambdaOuterSameLevel.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yqls
index 5da1b36ee1a..5da1b36ee1a 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodeInNestedLambda.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yqls
index 3f76dd440f1..3f76dd440f1 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/EquivNodesInLambdas.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yqls
index 69ede422715..69ede422715 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExpandAddRemoveMember.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapExchange.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapExchange.yqls
index 0ff086d5c75..0ff086d5c75 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapExchange.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapExchange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapOptimizeTablePath.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapOptimizeTablePath.yqls
index ac8743eecac..ac8743eecac 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapOptimizeTablePath.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendAndFlatmapOptimizeTablePath.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendTableWithLiteral.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendTableWithLiteral.yqls
index 296bdafd038..296bdafd038 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendTableWithLiteral.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendTableWithLiteral.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.yqls
index 2e266ddca25..2e266ddca25 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithFill.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.yqls
index a61e2d4d2f2..a61e2d4d2f2 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtendWithTablePath.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.yqls
index d775d388299..d775d388299 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOnMultiInput.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.yqls
index 08083fbc540..08083fbc540 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverEquiJoin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverRead.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverRead.yqls
index e5bccc409e0..e5bccc409e0 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverRead.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractMembersOverRead.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yqls
index 0a63ce0c2cd..0a63ce0c2cd 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ExtractPredicateFromFlatmapOverListIf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.yqls
index 4a52d5d4570..4a52d5d4570 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FalattenByColumns.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yqls
index abfdcb837a4..abfdcb837a4 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterCombineByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yqls
index 62ab06b3ec7..62ab06b3ec7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapAfterFilterNullMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yqls
index aa7b1d874ad..aa7b1d874ad 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapBeforeCombineByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapToExtractMembers.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapToExtractMembers.yqls
index b0dfbcde059..b0dfbcde059 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapToExtractMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapToExtractMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yqls
index 855ec4454f6..855ec4454f6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FlatMapWithVariantItemAfterSwitch.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yqls
index a32571a7722..a32571a7722 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMax.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yqls
index f173ae96ab1..f173ae96ab1 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1ConstMin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yqls
index a9b8d1e1ee7..a9b8d1e1ee7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yqls
index e6be656d484..e6be656d484 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1EmptyTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yqls
index 47cda00536f..47cda00536f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1IncrementAsLength.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yqls
index 5077ac27e43..5077ac27e43 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yqls
index 0f6615de39c..0f6615de39c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OneItemTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yqls
index c4ac775064a..c4ac775064a 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Fold1OverOptional.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yqls
index cc2d3f5d629..cc2d3f5d629 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMax.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yqls
index d7f3bc98b5b..d7f3bc98b5b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldConstMin.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yqls
index c170ea2fc03..c170ea2fc03 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yqls
index 73ac847631b..73ac847631b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldEmptyTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yqls
index 758cd43bf40..758cd43bf40 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldIncrementAsLength.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yqls
index 12014ead029..12014ead029 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yqls
index ccada97695d..ccada97695d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FoldOneItemTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yqls
index 8d267ce8905..8d267ce8905 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseExtractMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yqls
index 57c81db6220..57c81db6220 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithExtractMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithStreamLambda.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithStreamLambda.yqls
index c4585070bf4..c4585070bf4 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithStreamLambda.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapWithStreamLambda.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapsWithDependsOn.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapsWithDependsOn.yqls
index 0553caa8fd8..0553caa8fd8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapsWithDependsOn.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatMapsWithDependsOn.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yqls
index 9a0a42e1f3d..9a0a42e1f3d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithInnerVisit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yqls
index 3a7375371f6..3a7375371f6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseFlatmapsWithOptionalIf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yqls
index dc7c70cea68..dc7c70cea68 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterLReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yqls
index 2143f06bf27..2143f06bf27 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseLMapAfterReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yqls
index 5495292e2e2..5495292e2e2 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMapAfterLReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yqls
index 6241a465a7c..6241a465a7c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/FuseMultipliersFlatmaps.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yqls
index 877db04e8bf..877db04e8bf 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUnused.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yqls
index 40045830d09..40045830d09 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/GroupBySingleKeyListUsed.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yqls
index eb78e634afd..eb78e634afd 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/HasItemsAfterEnumerate.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yqls
index 798f4b58255..798f4b58255 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/IfOverNotPredicate.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yqls
index 2346c6fbe8c..2346c6fbe8c 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/InjectExtractMembersOverSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yqls
index cefbe8d8191..cefbe8d8191 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/InnerLambda.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.yqls
index 5395d3e9f86..5395d3e9f86 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LMapWithEmptyInput.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yqls
index 1e36b202601..1e36b202601 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterAsList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yqls
index 3926c6303f0..3926c6303f0 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterEnumerate.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yqls
index 89e18df9102..89e18df9102 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterMap.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterMap.yqls
index 90563d41a31..90563d41a31 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthAfterMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.yqls
index 1a1056aa004..1a1056aa004 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.yqls
index ce4c7827962..ce4c7827962 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/LengthOverMrTableContentInsideMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yqls
index 06f26563b33..06f26563b33 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MapNextWithUnusedNext.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.yqls
index 800f3c5a9ed..800f3c5a9ed 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MapThenSortWithLimit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yqls
index 6d4866a1695..6d4866a1695 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverFlattenMembers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yqls
index af913733b07..af913733b07 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MemberOverJustOrNothingWithNulls.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yqls
index 94385fb3830..94385fb3830 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverConstSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yqls
index 48bd5bd2768..48bd5bd2768 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverMapNext.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverMapNext.yqls
index 72a41ec35c2..72a41ec35c2 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverMapNext.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverMapNext.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yqls
index 5345f0b143e..5345f0b143e 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSkip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yqls
index 46aec084d26..46aec084d26 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yqls
index a7c9bb7e784..a7c9bb7e784 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yqls
index d3988b8ebbc..d3988b8ebbc 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverSort2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yqls
index 713a57a0fd6..713a57a0fd6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MoveExtractMembersOverTake.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.yqls
index c744fafa76d..c744fafa76d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/MultiExtractMembersOverReadTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yqls
index 61f9307f1a8..61f9307f1a8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/NonEquivNestedLambdaOuterSameLevel.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.yqls
index 7b776d078bc..7b776d078bc 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionByWithInnerSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.yqls
index dda6bd8d62b..dda6bd8d62b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/PartitionsByWithInnerSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilter.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilter.yqls
index 262c788d713..262c788d713 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilter.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilterRef.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilterRef.yqls
index a96ce7edcf7..a96ce7edcf7 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilterRef.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/PullLimitAfterFilterRef.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yqls
index cf614d25ca9..cf614d25ca9 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/PushDownToFlow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yqls
index f4ca8852702..f4ca8852702 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/ReverseAfterSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelectMembersOverOptStruct.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SelectMembersOverOptStruct.yqls
index b9e3b2373c1..b9e3b2373c1 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelectMembersOverOptStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SelectMembersOverOptStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.yqls
index 3770df6de5d..3770df6de5d 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersect.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.yqls
index 45e75bf7d75..45e75bf7d75 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SelfJoinIntersectTab1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipAfterMap.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipAfterMap.yqls
index fbc9dc1ba42..fbc9dc1ba42 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipAfterMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipAfterMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yqls
index 3ec439ddde5..3ec439ddde5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipOverExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.yqls
index d51db8e508f..d51db8e508f 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContent.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.yqls
index 5bfc63445ee..5bfc63445ee 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipTakeOverMrTableContentInsideMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yqls
index e661d70dde6..e661d70dde6 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SkipWhileOverLiterals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yqls
index 21570ead7b5..21570ead7b5 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SortAfterReverse.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SortOfSortedDesc.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SortOfSortedDesc.yqls
index 3fbb12f4468..3fbb12f4468 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SortOfSortedDesc.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SortOfSortedDesc.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SubsetOfFields.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SubsetOfFields.yqls
index f4d4e775d89..f4d4e775d89 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SubsetOfFields.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SubsetOfFields.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yqls
index b7034924355..b7034924355 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/SwitchToVisit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeAfterMap.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeAfterMap.yqls
index 41df996feea..41df996feea 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeAfterMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeAfterMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.yqls
index b263c720639..b263c720639 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterCombine.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterFilter.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterFilter.yqls
index e161a11ee53..e161a11ee53 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterFilter.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterFilter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.yqls
index d0fa6fb1ddd..d0fa6fb1ddd 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterGroup.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterSort.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterSort.yqls
index 107a53b5981..107a53b5981 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeLimitAfterSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverExtend.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverExtend.yqls
index e7b12fc1c15..e7b12fc1c15 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverExtend.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverExtend.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yqls
index ad245012d0b..ad245012d0b 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeOverTop.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yqls
index bc2bdb90377..bc2bdb90377 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/TakeWhileOverLiterals.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Top.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Top.yqls
index e0a2bab0366..e0a2bab0366 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Top.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Top.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedDesc.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedDesc.yqls
index b1de8fceb14..b1de8fceb14 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedDesc.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedDesc.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedMix.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedMix.yqls
index cbe8c2bb5ec..cbe8c2bb5ec 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedMix.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/UnionOfSortedMix.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UnusedColumnsAfterTake.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/UnusedColumnsAfterTake.yqls
index 65f43e76db8..65f43e76db8 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UnusedColumnsAfterTake.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/UnusedColumnsAfterTake.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yqls
index 6f5b78d34eb..6f5b78d34eb 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/UseEmptyDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yqls
index 76b605c2716..76b605c2716 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VariantItemOverVisit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yqls
index 8c8c4f77266..8c8c4f77266 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/Visit1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yqls
index 5f7b186e370..5f7b186e370 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAllEqualLambdas.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yqls
index 271b065f4a2..271b065f4a2 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitAsGuess.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yql b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yqls
index 8a0197dd5eb..8a0197dd5eb 100644
--- a/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Optimizers/VisitOverVisit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AfterTransform.yql b/yql/essentials/tests/s-expressions/suites/Result/AfterTransform.yqls
index f0514c97b12..f0514c97b12 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/AfterTransform.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/AfterTransform.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Apply.yql b/yql/essentials/tests/s-expressions/suites/Result/Apply.yqls
index ee940f6d938..ee940f6d938 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Apply.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/Apply.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AutoRefBig.yql b/yql/essentials/tests/s-expressions/suites/Result/AutoRefBig.yqls
index d54b9c6ce34..d54b9c6ce34 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/AutoRefBig.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/AutoRefBig.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AutoRefSmall.yql b/yql/essentials/tests/s-expressions/suites/Result/AutoRefSmall.yqls
index 6c7ca6eabde..6c7ca6eabde 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/AutoRefSmall.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/AutoRefSmall.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/AutoRefTwoTables.yql b/yql/essentials/tests/s-expressions/suites/Result/AutoRefTwoTables.yqls
index f4c7304639b..f4c7304639b 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/AutoRefTwoTables.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/AutoRefTwoTables.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Empty.yql b/yql/essentials/tests/s-expressions/suites/Result/Empty.yqls
index 3a0cc2e5e52..3a0cc2e5e52 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Empty.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/Empty.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/LastInTempTable.yql b/yql/essentials/tests/s-expressions/suites/Result/LastInTempTable.yqls
index 29dc7a94810..29dc7a94810 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/LastInTempTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/LastInTempTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTable.yql b/yql/essentials/tests/s-expressions/suites/Result/LengthOfTable.yqls
index c6c4df17725..c6c4df17725 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/LengthOfTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTempTable.yql b/yql/essentials/tests/s-expressions/suites/Result/LengthOfTempTable.yqls
index 34a926b1dcd..34a926b1dcd 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/LengthOfTempTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/LengthOfTempTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yql b/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yqls
index 215ec6bf791..215ec6bf791 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/ListTakeOption.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PagedTable.yql b/yql/essentials/tests/s-expressions/suites/Result/PagedTable.yqls
index 1a7772c21ff..1a7772c21ff 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PagedTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PagedTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ParseType.yql b/yql/essentials/tests/s-expressions/suites/Result/ParseType.yqls
index 13c3e97d5b3..13c3e97d5b3 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ParseType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/ParseType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Pickle.yql b/yql/essentials/tests/s-expressions/suites/Result/Pickle.yqls
index ff6b2d91595..ff6b2d91595 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Pickle.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/Pickle.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullColumns.yql b/yql/essentials/tests/s-expressions/suites/Result/PullColumns.yqls
index 110fdcc060c..110fdcc060c 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullColumns.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullColumns.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullColumnsFiltered.yql b/yql/essentials/tests/s-expressions/suites/Result/PullColumnsFiltered.yqls
index 01484b19aeb..01484b19aeb 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullColumnsFiltered.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullColumnsFiltered.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullDict.yql b/yql/essentials/tests/s-expressions/suites/Result/PullDict.yqls
index c3b00f17161..c3b00f17161 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.yql b/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.yqls
index b4e64a1d6d3..b4e64a1d6d3 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullDictAsStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullKeyOnly.yql b/yql/essentials/tests/s-expressions/suites/Result/PullKeyOnly.yqls
index a71800ecf9e..a71800ecf9e 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullKeyOnly.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullKeyOnly.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullNumbers.yql b/yql/essentials/tests/s-expressions/suites/Result/PullNumbers.yqls
index 86847541496..86847541496 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullNumbers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullNumbers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullOverExactLimit.yql b/yql/essentials/tests/s-expressions/suites/Result/PullOverExactLimit.yqls
index 353d36313c7..353d36313c7 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullOverExactLimit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullOverExactLimit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullOverLimit.yql b/yql/essentials/tests/s-expressions/suites/Result/PullOverLimit.yqls
index 4b7f4fc30c6..4b7f4fc30c6 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullOverLimit.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullOverLimit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.yql b/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.yqls
index 69f204a7076..69f204a7076 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullWithDefValues.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithDirectRead.yql b/yql/essentials/tests/s-expressions/suites/Result/PullWithDirectRead.yqls
index 6c4b1851e0f..6c4b1851e0f 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithDirectRead.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullWithDirectRead.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.yql b/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.yqls
index 69f204a7076..69f204a7076 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullWithInferScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PullYson.yql b/yql/essentials/tests/s-expressions/suites/Result/PullYson.yqls
index c3b00f17161..c3b00f17161 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PullYson.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PullYson.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Pure.yql b/yql/essentials/tests/s-expressions/suites/Result/Pure.yqls
index 9ad249ecf2c..9ad249ecf2c 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Pure.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/Pure.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yql b/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yqls
index 9fdf74cfdfa..9fdf74cfdfa 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/PureWithType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ReadAllFields.yql b/yql/essentials/tests/s-expressions/suites/Result/ReadAllFields.yqls
index 77573dbc127..77573dbc127 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ReadAllFields.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/ReadAllFields.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Resource.yql b/yql/essentials/tests/s-expressions/suites/Result/Resource.yqls
index 97aa87cca3f..97aa87cca3f 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Resource.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/Resource.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yql b/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yqls
index cf2253c9bc3..cf2253c9bc3 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/ResultColumns.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yql b/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yqls
index 5be6c090455..5be6c090455 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/ResultColumnsPrefixes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yql b/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yqls
index 4780768ff4e..4780768ff4e 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/SeveralWritesAndCommits.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SimpleWrite.yql b/yql/essentials/tests/s-expressions/suites/Result/SimpleWrite.yqls
index d91538e365e..d91538e365e 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/SimpleWrite.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/SimpleWrite.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SimpleWriteByRef.yql b/yql/essentials/tests/s-expressions/suites/Result/SimpleWriteByRef.yqls
index b8fd35ae40f..b8fd35ae40f 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/SimpleWriteByRef.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/SimpleWriteByRef.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/SkipTableByTempTableLength.yql b/yql/essentials/tests/s-expressions/suites/Result/SkipTableByTempTableLength.yqls
index 2924cf4e002..2924cf4e002 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/SkipTableByTempTableLength.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/SkipTableByTempTableLength.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TableScheme.yql b/yql/essentials/tests/s-expressions/suites/Result/TableScheme.yqls
index e4180b783f5..e4180b783f5 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TableScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/TableScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TableSchemeNotFail.yql b/yql/essentials/tests/s-expressions/suites/Result/TableSchemeNotFail.yqls
index 729098839bd..729098839bd 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TableSchemeNotFail.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/TableSchemeNotFail.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yql b/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yqls
index 66bf82a11d4..66bf82a11d4 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/TypeOf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yql b/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yqls
index c5def78d58c..c5def78d58c 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/TypeReflection.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yql b/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yqls
index 5b80134b732..5b80134b732 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/TypeStructs.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/WorldIf.yql b/yql/essentials/tests/s-expressions/suites/Result/WorldIf.yqls
index a634dbecb25..a634dbecb25 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/WorldIf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/WorldIf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Result/Yson.yql b/yql/essentials/tests/s-expressions/suites/Result/Yson.yqls
index f978241cfc4..f978241cfc4 100644
--- a/yql/essentials/tests/s-expressions/suites/Result/Yson.yql
+++ b/yql/essentials/tests/s-expressions/suites/Result/Yson.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/Bug635.yql b/yql/essentials/tests/s-expressions/suites/Scheme/Bug635.yqls
index d2aee30dd8c..d2aee30dd8c 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/Bug635.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/Bug635.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.yql b/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.yqls
index 6c9fb4ca135..6c9fb4ca135 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/DropEmpty.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.yql b/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.yqls
index 2080bede74e..2080bede74e 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/FailInferEmptyRow.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.yql b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.yqls
index 921334c2cbd..921334c2cbd 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadEmpty.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.yql b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.yqls
index 921334c2cbd..921334c2cbd 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/FailReadWithoutScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNames.yql b/yql/essentials/tests/s-expressions/suites/Scheme/FieldNames.yqls
index ab951ab11bc..ab951ab11bc 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNames.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/FieldNames.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNamesAndTypes.yql b/yql/essentials/tests/s-expressions/suites/Scheme/FieldNamesAndTypes.yqls
index 9db3af4c99f..9db3af4c99f 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/FieldNamesAndTypes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/FieldNamesAndTypes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.yql b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.yqls
index 33f40d279af..33f40d279af 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferPragma.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.yql b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.yqls
index 3ef24c07f75..3ef24c07f75 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.yql b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.yqls
index 3ef24c07f75..3ef24c07f75 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullPrefix.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.yql b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.yqls
index 3ef24c07f75..3ef24c07f75 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/ForceInferSchemaSortNullSuffix.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.yql b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.yqls
index aaf61a91630..aaf61a91630 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaForceInfer.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.yql b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.yqls
index 85f37756762..85f37756762 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaInfer.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.yql b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.yqls
index 40addc79c31..40addc79c31 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnStrong.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.yql b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.yqls
index 40addc79c31..40addc79c31 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/IgnoreWeakSchemaOnWeak.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.yql b/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.yqls
index cd6fe7c84ce..cd6fe7c84ce 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/InferPragma.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.yql b/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.yqls
index c04cb6b397c..c04cb6b397c 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/MapDict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.yql b/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.yqls
index cc664b337a7..cc664b337a7 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/NonKsvSortByKeyDesc.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.yql b/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.yqls
index ad8e17ad01b..ad8e17ad01b 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/OverrideEmpty.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.yql b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.yqls
index 5b0236af0c8..5b0236af0c8 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.yql b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.yqls
index b6bb8638915..b6bb8638915 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValue.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValueAndMap.yql b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValueAndMap.yqls
index bc7222e7e16..bc7222e7e16 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValueAndMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionByValueAndMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.yql b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.yqls
index acd5dca2d22..acd5dca2d22 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByTuple.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.yql b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.yqls
index 227eeaa709e..227eeaa709e 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/PartitionsByValue.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.yql b/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.yqls
index 954ed3d61fc..954ed3d61fc 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/RangeFailEmpty.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.yqls
index 6c106597e17..6c106597e17 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortAndTake.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.yqls
index 01624bc5277..01624bc5277 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortByDouble.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.yqls
index 6b98c467139..6b98c467139 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortByKeyDesc.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.yqls
index 3d74c7388ac..3d74c7388ac 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortByValue.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.yqls
index 6508146c9e7..6508146c9e7 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortDoubles.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortInts.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortInts.yqls
index a2266c98deb..a2266c98deb 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortInts.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortInts.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuples.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortTuples.yqls
index 0275b2d11d1..0275b2d11d1 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuples.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortTuples.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.yql b/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.yqls
index 05e9777d03f..05e9777d03f 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/SortTuplesAndWrite.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.yql b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.yqls
index c65fa8f8ace..c65fa8f8ace 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeys.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.yql b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.yqls
index c65fa8f8ace..c65fa8f8ace 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/UniqueKeysStrip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.yql b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.yqls
index b27b58aa036..b27b58aa036 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeOnlyEmpty.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.yql b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.yqls
index b27b58aa036..b27b58aa036 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/WeakRangeSkipEmpty.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WriteNumbers.yql b/yql/essentials/tests/s-expressions/suites/Scheme/WriteNumbers.yqls
index d9bfcea0775..d9bfcea0775 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WriteNumbers.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/WriteNumbers.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.yql b/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.yqls
index 7af6edc4ca1..7af6edc4ca1 100644
--- a/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.yql
+++ b/yql/essentials/tests/s-expressions/suites/Scheme/WriteStructThenCopyOneField.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.yqls
index 2e63d28e6a7..2e63d28e6a7 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.yqls
index 4957a8671d7..4957a8671d7 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/CombineByKeyStream.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Drop.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Drop.yqls
index 72c7873e910..72c7873e910 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Drop.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Drop.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.yqls
index fbe31a1f8f5..fbe31a1f8f5 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EmptyCopy.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.yqls
index c28ef4d0352..c28ef4d0352 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/EnumerateInsideReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Fill.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Fill.yqls
index e48c1f7a2f8..e48c1f7a2f8 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Fill.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Fill.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FillWithCount.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FillWithCount.yqls
index 20f0cd1ac22..20f0cd1ac22 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FillWithCount.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FillWithCount.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.yqls
index a5be6f207c1..a5be6f207c1 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/FilterThenCombineByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/IteratorInMap.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/IteratorInMap.yqls
index fcc89eb21c0..fcc89eb21c0 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/IteratorInMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/IteratorInMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LMapOverTable.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LMapOverTable.yqls
index f86f4c0c215..f86f4c0c215 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LMapOverTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LMapOverTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTableInsideMap.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTableInsideMap.yqls
index ccbd5bbbb42..ccbd5bbbb42 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTableInsideMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTableInsideMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTempTableInsideMap.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTempTableInsideMap.yqls
index d2e6fd6aec2..d2e6fd6aec2 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTempTableInsideMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/LengthOfTempTableInsideMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.yqls
index e8caad830b1..e8caad830b1 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOther.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.yqls
index 772527f2f6b..772527f2f6b 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherMixed.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.yqls
index e8caad830b1..e8caad830b1 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapOtherStrict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapStream.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapStream.yqls
index e9fe1806e87..e9fe1806e87 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapStream.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MapStream.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MissingColumn.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MissingColumn.yqls
index 73e0d903b4c..73e0d903b4c 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MissingColumn.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/MissingColumn.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.yqls
index cb740182a1e..cb740182a1e 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/OrderedLMapOverTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.yqls
index 2645b699e48..2645b699e48 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKey.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.yqls
index 88c71a6f9dd..88c71a6f9dd 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeySorted.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.yqls
index 938bb3e8598..938bb3e8598 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/PartitionByKeyStream.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Skip.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Skip.yqls
index f7d625e18f4..f7d625e18f4 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Skip.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Skip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SkipTakeThenMap.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SkipTakeThenMap.yqls
index 5af618e78fc..5af618e78fc 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SkipTakeThenMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/SkipTakeThenMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/TableInsertCastList.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/TableInsertCastList.yqls
index ce2f6fa8eb5..ce2f6fa8eb5 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/TableInsertCastList.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/TableInsertCastList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Take.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Take.yqls
index 6a8c55c92da..6a8c55c92da 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Take.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/Take.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.yqls
index 80371ba5281..80371ba5281 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/ZipInsideReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program1.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program1.yqls
index 47e3d28b9e4..47e3d28b9e4 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program1.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program1.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program10.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program10.yqls
index 8abd57a84b9..8abd57a84b9 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program10.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program10.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program11.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program11.yqls
index 746ca7e40bd..746ca7e40bd 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program11.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program11.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program12.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program12.yqls
index 56a3ae69313..56a3ae69313 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program12.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program12.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program13.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program13.yqls
index 1b3276e796a..1b3276e796a 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program13.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program13.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program14.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program14.yqls
index 218e366ef94..218e366ef94 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program14.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program14.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program15.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program15.yqls
index de5a1d5a47d..de5a1d5a47d 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program15.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program15.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program16.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program16.yqls
index 0347e8bef36..0347e8bef36 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program16.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program16.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program17.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program17.yqls
index de6ff0054ba..de6ff0054ba 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program17.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program17.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program18.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program18.yqls
index 60ab38e5e00..60ab38e5e00 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program18.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program18.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program19.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program19.yqls
index 0bd4afc8262..0bd4afc8262 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program19.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program19.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.yqls
index 697af6afa24..697af6afa24 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program20.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program20.yqls
index 237d4babc1f..237d4babc1f 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program20.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program20.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program21.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program21.yqls
index 8492d10a4d1..8492d10a4d1 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program21.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program21.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program22.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program22.yqls
index 76674f13dae..76674f13dae 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program22.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program22.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program23.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program23.yqls
index 378711e378b..378711e378b 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program23.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program23.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program24.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program24.yqls
index 1c3c39d3ead..1c3c39d3ead 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program24.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program24.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.yqls
index 11dcbbbe570..11dcbbbe570 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program26.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.yqls
index 2663ed1bb02..2663ed1bb02 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program27.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.yqls
index 8ad311cd3c6..8ad311cd3c6 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program28.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.yqls
index 40a2407e1f6..40a2407e1f6 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program29.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program8.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program8.yqls
index 894e1a15a1e..894e1a15a1e 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program8.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program8.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program9.yql b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program9.yqls
index 894e1a15a1e..894e1a15a1e 100644
--- a/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program9.yql
+++ b/yql/essentials/tests/s-expressions/suites/SingleYamrOperation/program9.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterTable.yql b/yql/essentials/tests/s-expressions/suites/TableContent/FilterTable.yqls
index 47e6d9a5176..47e6d9a5176 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterTable.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/FilterTable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.yql b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.yqls
index 3d7eadd8dfa..3d7eadd8dfa 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithComplexSkip.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithFields.yql b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithFields.yqls
index e5293e0a573..e5293e0a573 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithFields.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithFields.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithTake.yql b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithTake.yqls
index e0d516738d2..e0d516738d2 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithTake.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/FilterWithTake.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/InsideCombine.yql b/yql/essentials/tests/s-expressions/suites/TableContent/InsideCombine.yqls
index 529cd9be35f..529cd9be35f 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/InsideCombine.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/InsideCombine.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/InsideMap.yql b/yql/essentials/tests/s-expressions/suites/TableContent/InsideMap.yqls
index 1c9999ee3ac..1c9999ee3ac 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/InsideMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/InsideMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/InsideReduce.yql b/yql/essentials/tests/s-expressions/suites/TableContent/InsideReduce.yqls
index 71d61c2a0ce..71d61c2a0ce 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/InsideReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/InsideReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.yql b/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.yqls
index adde05c66d8..adde05c66d8 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/MixedOther.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.yql b/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.yqls
index 5ef7216f81a..5ef7216f81a 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/NonStrict.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.yql b/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.yqls
index 5ef7216f81a..5ef7216f81a 100644
--- a/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.yql
+++ b/yql/essentials/tests/s-expressions/suites/TableContent/StrictOther.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ahead.yql b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ahead.yqls
index b555f9f06ce..b555f9f06ce 100644
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ahead.yql
+++ b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ahead.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/delayed.yql b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/delayed.yqls
index e72c6ab87e7..e72c6ab87e7 100644
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/delayed.yql
+++ b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/delayed.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path.yql b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path.yqls
index 6e247b28bd7..6e247b28bd7 100644
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path.yql
+++ b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path_tighter.yql b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path_tighter.yqls
index 3844a8e2843..3844a8e2843 100644
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path_tighter.yql
+++ b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/happy_path_tighter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.yql b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.yqls
index 840af032400..840af032400 100644
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.yql
+++ b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/ordering.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/row_limit.yql b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/row_limit.yqls
index 1eec5d62363..1eec5d62363 100644
--- a/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/row_limit.yql
+++ b/yql/essentials/tests/s-expressions/suites/TimeOrderRecover/row_limit.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.yql b/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.yqls
index 77573dbc127..77573dbc127 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/AllFieldsAfterRemap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMap.yql b/yql/essentials/tests/s-expressions/suites/Udf/AutoMap.yqls
index cd809a58810..cd809a58810 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/AutoMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.yql b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.yqls
index 6e29b890b98..6e29b890b98 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapMany.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.yql b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.yqls
index 64c30fb1428..64c30fb1428 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/AutoMapManyNamed.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yql b/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yqls
index 178b280ad61..178b280ad61 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CachedUdfType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yql b/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yqls
index 5d5a0989e00..5d5a0989e00 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CallOtherCallable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yql b/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yqls
index aebf755663b..aebf755663b 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CallableAsLambda.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yql b/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yqls
index 817a7443850..817a7443850 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CallableType.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.yql b/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.yqls
index a683757f682..a683757f682 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/CustomPython.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.yql b/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.yqls
index e9da004a744..e9da004a744 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/ImportUdfs.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yql b/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yqls
index 082da79b045..082da79b045 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/LambdaAsCallable.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yql b/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yqls
index adfa44066a4..adfa44066a4 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/NamedApply.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedArgUdf.yql b/yql/essentials/tests/s-expressions/suites/Udf/NamedArgUdf.yqls
index b32401ac2c8..b32401ac2c8 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedArgUdf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/NamedArgUdf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapName.yql b/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapName.yqls
index 719a56a72df..719a56a72df 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapName.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapName.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapPos.yql b/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapPos.yqls
index 37c86747114..37c86747114 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapPos.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/NamedAutoMapPos.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.yql b/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.yqls
index affd7f4d555..affd7f4d555 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/OptionalReduceWithResource.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.yql b/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.yqls
index 8703e76e494..8703e76e494 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/OptionalRunConfig.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.yql b/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.yqls
index ce81c3df0d5..ce81c3df0d5 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PartialCall.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.yql b/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.yqls
index 4e5766f779c..4e5766f779c 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PartialFieldsAfterRemap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.yql b/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.yqls
index 0a15c6095a7..0a15c6095a7 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/Percentiles.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.yql b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.yqls
index 54c06596ad8..54c06596ad8 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchInMap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.yql b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.yqls
index 90391c22642..90391c22642 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PireMatchRes.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.yql b/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.yqls
index c3b00f17161..c3b00f17161 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/ProtoField.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.yql b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.yqls
index c3b00f17161..c3b00f17161 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldOpt.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.yql b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.yqls
index 89ab89671f2..89ab89671f2 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/ProtoFieldScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yqls
index 9029469690f..9029469690f 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonAvg.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yqls
index 29a7d26a0a7..29a7d26a0a7 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsArg.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yqls
index 887526632b8..887526632b8 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonCallableAsResult.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yqls
index b6e6a001716..b6e6a001716 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonGenerator.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yqls
index 164f870ec8b..164f870ec8b 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorExprWithClosure.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yqls
index 2c9a022caec..2c9a022caec 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonGeneratorWithClosure.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yqls
index 1a7f7f9dbd2..1a7f7f9dbd2 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonPartialCall.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yqls
index 89e0bd435d2..89e0bd435d2 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonStruct.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yql b/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yqls
index ef5f4e15493..ef5f4e15493 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/PythonSum.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.yqls
index 894e1a15a1e..894e1a15a1e 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapCopy.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.yqls
index c3752b674ef..c3752b674ef 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.yqls
index 58c57253c12..58c57253c12 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapFilter2.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.yqls
index fad593cd983..fad593cd983 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.yqls
index d86392d08a8..d86392d08a8 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeDiffUdfPartial.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.yqls
index fad593cd983..fad593cd983 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapRangeSameUdf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.yqls
index df1bf89415a..df1bf89415a 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapReduce.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.yqls
index 01df591aa88..01df591aa88 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapSort.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.yqls
index 09a346ac6da..09a346ac6da 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWeakRange.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.yqls
index ffc63f7bb55..ffc63f7bb55 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigCopy.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.yql b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.yqls
index b39a63ed362..b39a63ed362 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/RecordRemapWithConfigResult.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.yql b/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.yqls
index 2f14a897090..2f14a897090 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/ResultWithRemapConfig.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/Sleep.yql b/yql/essentials/tests/s-expressions/suites/Udf/Sleep.yqls
index 86d036c80ff..86d036c80ff 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/Sleep.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/Sleep.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.yql b/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.yqls
index 6085f8d6204..6085f8d6204 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/StringJoinFromList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.yql b/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.yqls
index dd7da1dfb05..dd7da1dfb05 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/TableSchemeWithRemap.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.yql b/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.yqls
index ff322d1a1ec..ff322d1a1ec 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/TopFreq.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/Udf/TypeInspection.yql b/yql/essentials/tests/s-expressions/suites/Udf/TypeInspection.yqls
index eecfa7e41df..eecfa7e41df 100644
--- a/yql/essentials/tests/s-expressions/suites/Udf/TypeInspection.yql
+++ b/yql/essentials/tests/s-expressions/suites/Udf/TypeInspection.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.yql b/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.yqls
index 5a2597e5cca..5a2597e5cca 100644
--- a/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/DoubleGlobViewRead.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/DsvCount.yql b/yql/essentials/tests/s-expressions/suites/View/DsvCount.yqls
index 3fa0a24d9b8..3fa0a24d9b8 100644
--- a/yql/essentials/tests/s-expressions/suites/View/DsvCount.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/DsvCount.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.yql b/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.yqls
index f186cb7101f..f186cb7101f 100644
--- a/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/DsvCountPartitionBy.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.yql b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.yqls
index 3574c04daf5..3574c04daf5 100644
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfData.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.yql b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.yqls
index 7e579328e64..7e579328e64 100644
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfRawData.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.yql b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.yqls
index 5d429021c39..5d429021c39 100644
--- a/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/Key1AfterUdfScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1Data.yql b/yql/essentials/tests/s-expressions/suites/View/Key1Data.yqls
index 85a3398e416..85a3398e416 100644
--- a/yql/essentials/tests/s-expressions/suites/View/Key1Data.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/Key1Data.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/Key1Scheme.yql b/yql/essentials/tests/s-expressions/suites/View/Key1Scheme.yqls
index 5d429021c39..5d429021c39 100644
--- a/yql/essentials/tests/s-expressions/suites/View/Key1Scheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/Key1Scheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/MasterScheme.yql b/yql/essentials/tests/s-expressions/suites/View/MasterScheme.yqls
index 0a9e55e5a5c..0a9e55e5a5c 100644
--- a/yql/essentials/tests/s-expressions/suites/View/MasterScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/MasterScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/NoReadData.yql b/yql/essentials/tests/s-expressions/suites/View/NoReadData.yqls
index 7e27b9b42ae..7e27b9b42ae 100644
--- a/yql/essentials/tests/s-expressions/suites/View/NoReadData.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/NoReadData.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/NoReadScheme.yql b/yql/essentials/tests/s-expressions/suites/View/NoReadScheme.yqls
index b231e968345..b231e968345 100644
--- a/yql/essentials/tests/s-expressions/suites/View/NoReadScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/NoReadScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/RawView.yql b/yql/essentials/tests/s-expressions/suites/View/RawView.yqls
index d23c50d85c5..d23c50d85c5 100644
--- a/yql/essentials/tests/s-expressions/suites/View/RawView.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/RawView.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.yql b/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.yqls
index 8588e4df392..8588e4df392 100644
--- a/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/ReadGlobView.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.yql b/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.yqls
index c90fdf788ae..c90fdf788ae 100644
--- a/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/SchemeGlobView.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.yql b/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.yqls
index f5eb0c356b1..f5eb0c356b1 100644
--- a/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/TrivialDataCopy.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/TrivialScheme.yql b/yql/essentials/tests/s-expressions/suites/View/TrivialScheme.yqls
index 8062a7feb8c..8062a7feb8c 100644
--- a/yql/essentials/tests/s-expressions/suites/View/TrivialScheme.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/TrivialScheme.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.yql b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.yqls
index 4d2b6066adb..4d2b6066adb 100644
--- a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.yql b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.yqls
index e5dc7a8838d..e5dc7a8838d 100644
--- a/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.yql
+++ b/yql/essentials/tests/s-expressions/suites/View/ViewWithUdfProcess.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.yql b/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.yqls
index 92abfcd35cf..92abfcd35cf 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureImportUdf.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureList.yql b/yql/essentials/tests/s-expressions/suites/YtNative/PureList.yqls
index 224d23514f7..224d23514f7 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureList.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureLongList.yql b/yql/essentials/tests/s-expressions/suites/YtNative/PureLongList.yqls
index 94a8922948d..94a8922948d 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureLongList.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureLongList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureNonList.yql b/yql/essentials/tests/s-expressions/suites/YtNative/PureNonList.yqls
index eb00aa902ef..eb00aa902ef 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureNonList.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureNonList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructList.yql b/yql/essentials/tests/s-expressions/suites/YtNative/PureStructList.yqls
index 0c6513f8c77..0c6513f8c77 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructList.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureStructList.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructListWithFields.yql b/yql/essentials/tests/s-expressions/suites/YtNative/PureStructListWithFields.yqls
index 623ed4b8b08..623ed4b8b08 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureStructListWithFields.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureStructListWithFields.yqls
diff --git a/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yql b/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yqls
index 0f09553c83f..0f09553c83f 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yqls
author	robot-piglet <robot-piglet@yandex-team.com>	2024-12-13 15:14:50 +0300
committer	robot-piglet <robot-piglet@yandex-team.com>	2024-12-13 16:07:36 +0300
commit	5cbdc6f2bc811da3e6104da774a30b25a54a8708 (patch)
tree	68f3ddb0d928332e5ea73853f40f4670f4babb65
parent	1402a032649d20ffb80a541f706afcd31cd897fa (diff)
download	ydb-5cbdc6f2bc811da3e6104da774a30b25a54a8708.tar.gz