Intermediate changes

commit_hash:27af5f8a0a7836d78ffdc205213f07f79dd9f7ad

1146 files changed, 0 insertions, 0 deletions

diff --git a/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yql b/yql/essentials/tests/s-expressions/suites/Aggregation/AggrAdd.yqls
index ae95d15a68..ae95d15a68 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 f0a27ab8d5..f0a27ab8d5 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 ab948dc649..ab948dc649 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 e9565555ef..e9565555ef 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 502366d6d5..502366d6d5 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 b309a99b1c..b309a99b1c 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 bb96925785..bb96925785 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 70d8879fc0..70d8879fc0 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 94034d32af..94034d32af 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 d4f0adca76..d4f0adca76 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 27c4faf647..27c4faf647 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 b0b2f6a084..b0b2f6a084 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 9f4fb01757..9f4fb01757 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 472d0234d1..472d0234d1 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 59dd4cabc3..59dd4cabc3 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 0a2a83b345..0a2a83b345 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 1558d5a3a9..1558d5a3a9 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 61e56c5a0f..61e56c5a0f 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 312c757886..312c757886 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 b25953f460..b25953f460 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 d3c8358342..d3c8358342 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 4357fcf5c7..4357fcf5c7 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 73069b7061..73069b7061 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 857859cc2c..857859cc2c 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 f18d8573a4..f18d8573a4 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 18d89027da..18d89027da 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 64ee248ed9..64ee248ed9 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 7a8c8845dc..7a8c8845dc 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 4b878ab6d0..4b878ab6d0 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 ac50a50ada..ac50a50ada 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 fa25eff9ff..fa25eff9ff 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 2df7e940fe..2df7e940fe 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 76a39cde33..76a39cde33 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 801f98c809..801f98c809 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 bad75321c1..bad75321c1 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 d38c5df0c2..d38c5df0c2 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 d2dd9c92b4..d2dd9c92b4 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 edf5b44792..edf5b44792 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 ff4a01823d..ff4a01823d 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 b03717e014..b03717e014 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 5fa1b5c037..5fa1b5c037 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 bd5b02bfc8..bd5b02bfc8 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 4e7c2ed97f..4e7c2ed97f 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 d423bbd1a2..d423bbd1a2 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 d601958e3e..d601958e3e 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 1899624162..1899624162 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 1dbafaba7d..1dbafaba7d 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 74e0bf07e5..74e0bf07e5 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 95277fbb51..95277fbb51 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 d7d096c666..d7d096c666 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 aabfde5009..aabfde5009 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 245bccb5a7..245bccb5a7 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 a45adbeeeb..a45adbeeeb 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 97637f6e25..97637f6e25 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 db9c86ab6d..db9c86ab6d 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 7bb2ee9823..7bb2ee9823 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 4a2d27f7ce..4a2d27f7ce 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 42b30ea242..42b30ea242 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 08f9f64797..08f9f64797 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 34544fa51e..34544fa51e 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 d360f24111..d360f24111 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 9d15c7ceb8..9d15c7ceb8 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 ba534b346d..ba534b346d 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 931c95d7b6..931c95d7b6 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 2500618f6f..2500618f6f 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 f0cd523350..f0cd523350 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 9503f0ed59..9503f0ed59 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 56b74c715c..56b74c715c 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 eac651c347..eac651c347 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 f308062a08..f308062a08 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 a28b93a7a7..a28b93a7a7 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 c58fcc163d..c58fcc163d 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 100c3df83b..100c3df83b 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 2eb0e2ff1f..2eb0e2ff1f 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 5eb3cb79d7..5eb3cb79d7 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 71a972e7e9..71a972e7e9 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 87b210c725..87b210c725 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 899ddf853d..899ddf853d 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 6a4f6f8e19..6a4f6f8e19 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 f187eeef74..f187eeef74 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 0e3fc4acf6..0e3fc4acf6 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 08758ca2b4..08758ca2b4 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 f53f027cbe..f53f027cbe 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 8a1440b4a0..8a1440b4a0 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 2e6b0f7236..2e6b0f7236 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 d9d5058791..d9d5058791 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 3691a0bc21..3691a0bc21 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 75ce137d75..75ce137d75 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 7333ac3a14..7333ac3a14 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 8d61d0d81b..8d61d0d81b 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 db65afbd99..db65afbd99 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 7a43121bdc..7a43121bdc 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 16e5ff7c87..16e5ff7c87 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 8fb8659c08..8fb8659c08 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 866fd55415..866fd55415 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 2c8d57527e..2c8d57527e 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 453205bc66..453205bc66 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 abd4639a4c..abd4639a4c 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 50527bf4fd..50527bf4fd 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 e332263266..e332263266 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 2180970236..2180970236 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 3d605c38b6..3d605c38b6 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 0455714f00..0455714f00 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 554544466a..554544466a 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 95a0ec2555..95a0ec2555 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 157a109a64..157a109a64 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 746f8f987d..746f8f987d 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 fd605370d2..fd605370d2 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 95377162e7..95377162e7 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 6330d3262a..6330d3262a 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 6039cd0719..6039cd0719 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 9141b62154..9141b62154 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 6654166a27..6654166a27 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 3ad49c4744..3ad49c4744 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 020cf59904..020cf59904 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 8f253ab7a0..8f253ab7a0 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 a26295ffad..a26295ffad 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 6dc4b237c5..6dc4b237c5 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 8f00b970d1..8f00b970d1 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 6044a39e4e..6044a39e4e 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 c10d1243e9..c10d1243e9 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 11fd9ebc30..11fd9ebc30 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 1ac4fd613e..1ac4fd613e 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 94bc8b7842..94bc8b7842 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 33421380cb..33421380cb 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 ea34cbd481..ea34cbd481 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 ee7aa8e401..ee7aa8e401 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 146ed0dbe9..146ed0dbe9 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 d7c66842b0..d7c66842b0 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 28cf793e44..28cf793e44 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 afa021dd11..afa021dd11 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 4f2319f1ea..4f2319f1ea 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 b533e16780..b533e16780 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 1bc57c71bf..1bc57c71bf 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 0649383205..0649383205 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 b1a80a5660..b1a80a5660 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 0621a7e016..0621a7e016 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 8578faff3c..8578faff3c 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 606e06e0e4..606e06e0e4 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 9b7882d255..9b7882d255 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 c7190c8f88..c7190c8f88 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 4ba424cb1e..4ba424cb1e 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 b10df583ba..b10df583ba 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 00d991912a..00d991912a 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 65db044c0d..65db044c0d 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 b51c4e8418..b51c4e8418 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 46099b0328..46099b0328 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 587bc78b08..587bc78b08 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 e9a055f5d1..e9a055f5d1 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 6b7ac4b175..6b7ac4b175 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 4aa7916884..4aa7916884 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 65db044c0d..65db044c0d 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 37fb7a1e86..37fb7a1e86 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 1b314c3f2e..1b314c3f2e 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 5734271142..5734271142 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 110b23d6ed..110b23d6ed 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 c834415dd1..c834415dd1 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 5803f92df9..5803f92df9 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 ab423f96a3..ab423f96a3 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 513c160992..513c160992 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 27a8f34398..27a8f34398 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 914cff8c91..914cff8c91 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 f2047207e7..f2047207e7 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 f27a896172..f27a896172 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 c08723a840..c08723a840 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 383a70fad1..383a70fad1 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 a29f76402f..a29f76402f 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 b43deb2cd9..b43deb2cd9 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 71c6b7ef4f..71c6b7ef4f 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 f27a896172..f27a896172 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 643a22242b..643a22242b 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 f9b513d556..f9b513d556 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 946c9f2d68..946c9f2d68 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 b3f57179c3..b3f57179c3 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 f2266e36a6..f2266e36a6 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 ecb64cf46c..ecb64cf46c 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 f3c7e35b7d..f3c7e35b7d 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 7980440ada..7980440ada 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 89a1e02765..89a1e02765 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 7f37ba29ab..7f37ba29ab 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 2247aa8e0b..2247aa8e0b 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 09a8847b4a..09a8847b4a 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 655f2a8207..655f2a8207 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 944bb5f6de..944bb5f6de 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 0b94fa907f..0b94fa907f 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 dc7718c806..dc7718c806 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 894e36e1b9..894e36e1b9 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 b115bd6907..b115bd6907 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 0683a16ba8..0683a16ba8 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 db3690c50a..db3690c50a 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 2339478283..2339478283 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 786062ec45..786062ec45 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 4f4a0eda4d..4f4a0eda4d 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 293639aa22..293639aa22 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 5d7c766dc5..5d7c766dc5 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 0ed5172d92..0ed5172d92 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 bb8bb2e523..bb8bb2e523 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 c5382a89c2..c5382a89c2 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 0afd1f691e..0afd1f691e 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 89ca16a047..89ca16a047 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 b5016c4e11..b5016c4e11 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 d6e1605074..d6e1605074 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 97a13fa2b9..97a13fa2b9 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 a64f8a6705..a64f8a6705 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 951e1d462b..951e1d462b 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 1d50eb5959..1d50eb5959 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 af309a36eb..af309a36eb 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 536807ec3d..536807ec3d 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 cae4788bf3..cae4788bf3 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 08748168f6..08748168f6 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 8f7d2e40d2..8f7d2e40d2 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 9f014d1580..9f014d1580 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 b9c69bf087..b9c69bf087 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 6d7b8198a6..6d7b8198a6 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 7f144be37f..7f144be37f 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 769cfb1657..769cfb1657 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 5b0febe8af..5b0febe8af 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 b2436aff7f..b2436aff7f 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 0c12e21175..0c12e21175 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 598c2ef4ec..598c2ef4ec 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 a3258f553c..a3258f553c 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 be7f6267c8..be7f6267c8 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 03aa454da5..03aa454da5 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 5ec5cd9a3f..5ec5cd9a3f 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 a081fd1505..a081fd1505 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 eebaf0acbd..eebaf0acbd 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 4b40b0c009..4b40b0c009 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 8a259534c3..8a259534c3 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 9abc122fd9..9abc122fd9 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 b4b825991e..b4b825991e 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 4e11a1b8c0..4e11a1b8c0 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 2bf637ce0d..2bf637ce0d 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 f1f3eec7ac..f1f3eec7ac 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 6e5d4d95d0..6e5d4d95d0 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 808c44795b..808c44795b 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 de061d0050..de061d0050 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 479d476017..479d476017 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 9de2396e4d..9de2396e4d 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 932539b39a..932539b39a 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 d02d26aafb..d02d26aafb 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 168fab831b..168fab831b 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 110a3b617b..110a3b617b 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 5a9f9ca659..5a9f9ca659 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 0d5b7d1601..0d5b7d1601 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 5d15a2bab8..5d15a2bab8 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 4c2225f7c5..4c2225f7c5 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 c6d7543ed3..c6d7543ed3 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 7444baa207..7444baa207 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 c07a92aa2a..c07a92aa2a 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 8fdfeda61a..8fdfeda61a 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 f24772569c..f24772569c 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 54c482a624..54c482a624 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 a7593fde40..a7593fde40 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 d589fcda91..d589fcda91 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 78921fa69b..78921fa69b 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 09a21c9a81..09a21c9a81 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 8f36e81eb5..8f36e81eb5 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 25e1eb9240..25e1eb9240 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 c644c56a26..c644c56a26 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 e9aaf3442f..e9aaf3442f 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 5409c45d54..5409c45d54 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 64ba1df974..64ba1df974 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 ed5b9c6896..ed5b9c6896 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 9ed83ad59e..9ed83ad59e 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 4896831f5a..4896831f5a 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 c7d3ee062d..c7d3ee062d 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 69e10681b2..69e10681b2 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 64ba1df974..64ba1df974 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 e664996232..e664996232 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 24de4a45d8..24de4a45d8 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 c2340bb816..c2340bb816 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 9fe63d8ec2..9fe63d8ec2 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 4cfb26b64e..4cfb26b64e 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 5fa76d8942..5fa76d8942 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 fed99eefc5..fed99eefc5 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 24de4a45d8..24de4a45d8 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 02b042ac3a..02b042ac3a 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 ba2798678f..ba2798678f 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 435fdc1a9c..435fdc1a9c 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 d61db9da69..d61db9da69 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 924287c0f9..924287c0f9 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 3d1c3605fc..3d1c3605fc 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 a2a085a722..a2a085a722 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 ba2798678f..ba2798678f 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 b528c14467..b528c14467 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 76b372e52f..76b372e52f 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 155db305bc..155db305bc 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 dc0928a52c..dc0928a52c 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 0d550e7db3..0d550e7db3 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 9d539854bd..9d539854bd 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 5a6ff8cd0f..5a6ff8cd0f 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 71c2d26461..71c2d26461 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 33f059a964..33f059a964 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 dee596e70a..dee596e70a 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 ded633225d..ded633225d 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 4cbe3482ed..4cbe3482ed 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 9533ee9fb8..9533ee9fb8 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 2b3166643e..2b3166643e 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 4572699337..4572699337 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 d0c8c821b6..d0c8c821b6 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 94718f84d1..94718f84d1 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 d77b848dc7..d77b848dc7 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 6e842ae76b..6e842ae76b 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 c9e4a7e0f6..c9e4a7e0f6 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 16a90e3314..16a90e3314 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 a3e4e456ea..a3e4e456ea 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 c726a4c417..c726a4c417 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 707b389f4b..707b389f4b 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 59f07eb137..59f07eb137 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 6245dd77bd..6245dd77bd 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 0063b7b7ef..0063b7b7ef 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 7807ba6e08..7807ba6e08 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 549fa2d302..549fa2d302 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 50ee09cda0..50ee09cda0 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 374fafce96..374fafce96 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 e9c47c9c76..e9c47c9c76 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 ef2ce92878..ef2ce92878 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 7e0a5a7fc2..7e0a5a7fc2 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 759d3983ac..759d3983ac 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 861a63112f..861a63112f 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 14636284d2..14636284d2 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 0b21ecc24d..0b21ecc24d 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 66060097b8..66060097b8 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 15834403dd..15834403dd 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 0ddee9815b..0ddee9815b 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 f142bfd3d6..f142bfd3d6 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 e5a08be9c9..e5a08be9c9 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 46ad794a8b..46ad794a8b 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 6d784c12f1..6d784c12f1 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 b3e903ce7b..b3e903ce7b 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 cf1497bcef..cf1497bcef 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 a682416eff..a682416eff 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 28be4deee9..28be4deee9 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 005fca072a..005fca072a 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 676843a418..676843a418 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 ecfc4263ec..ecfc4263ec 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 633de6fcae..633de6fcae 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 793ee81306..793ee81306 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 867c048f8b..867c048f8b 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 1fc31dc350..1fc31dc350 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 15fa410fc6..15fa410fc6 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 b305596d20..b305596d20 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 2bb5d8dfc5..2bb5d8dfc5 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 d37d7f696b..d37d7f696b 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 74edcb9ae2..74edcb9ae2 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 47f1a8923a..47f1a8923a 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 0a0a502ca6..0a0a502ca6 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 9fe527324c..9fe527324c 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 4e69796c1f..4e69796c1f 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 d5145b4dec..d5145b4dec 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 283fccceff..283fccceff 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 af7dbd189d..af7dbd189d 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 e8016a1260..e8016a1260 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 0db96ff654..0db96ff654 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 42b1a60840..42b1a60840 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 53b2d9eaae..53b2d9eaae 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 cca73e9d75..cca73e9d75 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 e9547bfd31..e9547bfd31 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 e5bc5906b3..e5bc5906b3 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 ad84352890..ad84352890 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 037e8aafc0..037e8aafc0 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 f1ce069c3e..f1ce069c3e 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 5845432182..5845432182 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 5f12b8e34e..5f12b8e34e 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 eaad119c21..eaad119c21 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 fd0cd3266b..fd0cd3266b 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 04d4ac8e78..04d4ac8e78 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 c2925077b4..c2925077b4 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 4f530fd62f..4f530fd62f 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 430c926921..430c926921 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 da741bd831..da741bd831 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 10ceca2c98..10ceca2c98 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 0cd36f7c36..0cd36f7c36 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 8739797e8f..8739797e8f 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 eef99f2886..eef99f2886 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 e50b5b2bf5..e50b5b2bf5 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 64367c4c33..64367c4c33 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 51af3fa6f0..51af3fa6f0 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 3a089710e9..3a089710e9 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 678ed1b9ea..678ed1b9ea 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 2e36542a53..2e36542a53 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 58a877a388..58a877a388 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 f6b50489a6..f6b50489a6 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 9b331b9f82..9b331b9f82 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 3518a4c5d4..3518a4c5d4 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 90b210133a..90b210133a 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 65f4e896c0..65f4e896c0 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 a6f66f231e..a6f66f231e 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 ebb11c9560..ebb11c9560 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 9047dae5cb..9047dae5cb 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 4f3b39aead..4f3b39aead 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 cce29bdeba..cce29bdeba 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 b2025d9f13..b2025d9f13 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 e73d11378c..e73d11378c 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 02fe6bd9b7..02fe6bd9b7 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 6a0eca2a30..6a0eca2a30 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 4aa5328146..4aa5328146 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 e114fdd320..e114fdd320 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 dfef6fe6c8..dfef6fe6c8 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 28175bd604..28175bd604 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 981d1a26d3..981d1a26d3 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 f217a74ac3..f217a74ac3 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 c397a2f86c..c397a2f86c 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 5f4c36f6e0..5f4c36f6e0 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 959778c020..959778c020 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 af7186040d..af7186040d 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 f1e98e1303..f1e98e1303 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 46c35ef2a9..46c35ef2a9 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 0cd1abd0e9..0cd1abd0e9 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 203d420f05..203d420f05 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 1cc15375b5..1cc15375b5 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 f376fd59f5..f376fd59f5 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 ecbcf52649..ecbcf52649 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 7ad7499a36..7ad7499a36 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 eee4c48726..eee4c48726 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 7983fd5c84..7983fd5c84 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 72d92bae07..72d92bae07 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 b9b78b1e30..b9b78b1e30 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 cbfc95831d..cbfc95831d 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 fb3e649ac7..fb3e649ac7 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 c97954aec4..c97954aec4 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 c0cfeddbac..c0cfeddbac 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 0d9096f170..0d9096f170 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 d6e27227a0..d6e27227a0 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 26a9da603e..26a9da603e 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 ac557b7c39..ac557b7c39 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 818530c644..818530c644 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 57525fe5cd..57525fe5cd 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 d94a379a98..d94a379a98 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 2d97e5de4f..2d97e5de4f 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 78812b0504..78812b0504 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 614f56af07..614f56af07 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 36754914d3..36754914d3 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 d16765b530..d16765b530 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 86ddc7edea..86ddc7edea 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 dc6553ace8..dc6553ace8 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 52ec551031..52ec551031 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 c283681f65..c283681f65 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 c0fd196bb3..c0fd196bb3 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 cc2f36e4b9..cc2f36e4b9 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 06a7f9e790..06a7f9e790 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 16d3de6d28..16d3de6d28 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 7fc7ecf8ab..7fc7ecf8ab 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 a20d8aec9b..a20d8aec9b 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 d566b92b1c..d566b92b1c 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 b2027e278b..b2027e278b 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 5ab66d2fc5..5ab66d2fc5 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 96f210378d..96f210378d 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 e5f7c57d6d..e5f7c57d6d 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 b6d23e3c3e..b6d23e3c3e 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 6e65cc1e65..6e65cc1e65 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 6e65cc1e65..6e65cc1e65 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 3e34cb8a58..3e34cb8a58 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 1b036e6da4..1b036e6da4 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 fa4d5835ce..fa4d5835ce 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 203ac40254..203ac40254 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 e676a8a14d..e676a8a14d 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 78799b4126..78799b4126 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 d481de6809..d481de6809 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 fcd006e0aa..fcd006e0aa 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 a9bd5a3ada..a9bd5a3ada 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 cf275fb841..cf275fb841 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 0f811313c6..0f811313c6 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 8f8a2ebb28..8f8a2ebb28 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 67767e39c0..67767e39c0 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 5e3c989afa..5e3c989afa 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 4dca20b467..4dca20b467 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 77d9b0ea8a..77d9b0ea8a 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 f69dde24bf..f69dde24bf 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 25e70ab080..25e70ab080 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 7e51737f4f..7e51737f4f 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 9b61dfc633..9b61dfc633 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 bd121653b7..bd121653b7 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 91c443c6a8..91c443c6a8 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 dcd71898d4..dcd71898d4 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 f3e31ddd82..f3e31ddd82 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 01b53116ac..01b53116ac 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 9c6f02ce77..9c6f02ce77 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 c2e5812eaf..c2e5812eaf 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 ddf42e56cc..ddf42e56cc 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 f34acbcdba..f34acbcdba 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 ea85b0f4f8..ea85b0f4f8 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 9c6f02ce77..9c6f02ce77 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 c2e5812eaf..c2e5812eaf 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 ddf42e56cc..ddf42e56cc 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 f34acbcdba..f34acbcdba 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 7fd743bdee..7fd743bdee 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 520276f126..520276f126 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 b921b10b20..b921b10b20 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 6dc9e5769c..6dc9e5769c 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 df99564b89..df99564b89 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 cbfb7cad03..cbfb7cad03 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 b94c11aecc..b94c11aecc 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 e3a5b10cbb..e3a5b10cbb 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 6dc9e5769c..6dc9e5769c 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 eb43b46130..eb43b46130 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 d74c89079d..d74c89079d 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 119a06c083..119a06c083 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 0ef31b3b21..0ef31b3b21 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 029097b6fd..029097b6fd 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 5350dcda71..5350dcda71 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 d7caabfc19..d7caabfc19 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 119a06c083..119a06c083 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 638bf6954a..638bf6954a 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 7e29e229f3..7e29e229f3 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 9cf0b972e2..9cf0b972e2 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 d6e6d8fe10..d6e6d8fe10 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 f5981f92ac..f5981f92ac 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 8d737e225f..8d737e225f 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 702b00544b..702b00544b 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 dcc95c7353..dcc95c7353 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 83df5958d9..83df5958d9 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 7f4a8281fb..7f4a8281fb 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 0d5342fa93..0d5342fa93 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 35aec35fb1..35aec35fb1 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 59803168e1..59803168e1 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 da309347a4..da309347a4 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 e184b34935..e184b34935 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 dfc37d30de..dfc37d30de 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 9e4f52e93d..9e4f52e93d 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 a326656deb..a326656deb 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 d3a2fa7c5a..d3a2fa7c5a 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 478ba0b492..478ba0b492 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 1008cf6499..1008cf6499 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 afe7c04735..afe7c04735 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 27ac41dba1..27ac41dba1 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 9977eefc30..9977eefc30 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 4ea96cadab..4ea96cadab 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 ce67a47d55..ce67a47d55 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 88c2e397a7..88c2e397a7 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 3f2fa9519d..3f2fa9519d 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 20547b0aaa..20547b0aaa 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 4da2353218..4da2353218 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 bab448cfa0..bab448cfa0 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 17dbdd3de4..17dbdd3de4 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 9622fabe4b..9622fabe4b 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 468cab9df7..468cab9df7 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 ae8830e61f..ae8830e61f 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 3461a8d239..3461a8d239 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 a6de909851..a6de909851 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 28dd639e69..28dd639e69 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 f7393666cc..f7393666cc 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 b2259327f1..b2259327f1 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 bd0adcd454..bd0adcd454 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 ddf3ad70b0..ddf3ad70b0 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 52b4d2872a..52b4d2872a 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 4bf5f79adb..4bf5f79adb 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 69051e7c19..69051e7c19 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 a06b03fe9d..a06b03fe9d 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 28da7c8617..28da7c8617 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 2acee2f12b..2acee2f12b 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 bbc1bfa584..bbc1bfa584 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 8c5bc62595..8c5bc62595 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 cf59f2bb0c..cf59f2bb0c 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 718fabeac3..718fabeac3 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 e906d237e5..e906d237e5 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 2de7c5efe9..2de7c5efe9 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 b91a23e1de..b91a23e1de 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 a2d9759568..a2d9759568 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 ac57358f03..ac57358f03 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 a4e5f7dd40..a4e5f7dd40 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 a7bfc3ca2a..a7bfc3ca2a 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 cc6a372e44..cc6a372e44 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 d6e73eab29..d6e73eab29 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 e0419e94da..e0419e94da 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 615950d586..615950d586 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 b9d7408383..b9d7408383 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 d58f23fe27..d58f23fe27 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 80492a709e..80492a709e 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 b71b50dff7..b71b50dff7 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 bd91e105e0..bd91e105e0 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 f40ab1d5d8..f40ab1d5d8 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 aa0ab07e67..aa0ab07e67 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 5c9d947981..5c9d947981 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 2ececbce27..2ececbce27 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 21c992bea5..21c992bea5 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 be762d2421..be762d2421 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 01a658c16e..01a658c16e 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 e41c01a7b4..e41c01a7b4 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 c84047a295..c84047a295 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 9cf4e53963..9cf4e53963 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 6be3f9bffc..6be3f9bffc 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 e62000f1ee..e62000f1ee 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 1e399b48cc..1e399b48cc 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 112fc7f534..112fc7f534 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 5d9ca77381..5d9ca77381 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 b51f864573..b51f864573 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 a20d1188dc..a20d1188dc 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 5f688a5075..5f688a5075 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 a7f8667067..a7f8667067 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 6fd4b3f3cd..6fd4b3f3cd 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 b12be636c8..b12be636c8 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 4c9e5b46d5..4c9e5b46d5 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 25e92e7eff..25e92e7eff 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 d7c81831cb..d7c81831cb 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 ed1ea53868..ed1ea53868 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 6d14f0d268..6d14f0d268 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 ee25f707f1..ee25f707f1 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 306f073803..306f073803 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 02b70ad22b..02b70ad22b 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 efa89ba44c..efa89ba44c 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 9f4ce156f3..9f4ce156f3 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 751de45375..751de45375 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 1a3aad97c9..1a3aad97c9 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 c555c6df02..c555c6df02 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 fde736a37c..fde736a37c 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 dfec8da682..dfec8da682 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 30fcbac0b5..30fcbac0b5 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 c21c6b07d3..c21c6b07d3 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 256b5de592..256b5de592 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 0ae29c3594..0ae29c3594 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 b551ccbad0..b551ccbad0 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 0cba17d6ea..0cba17d6ea 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 12ad41b0a7..12ad41b0a7 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 6c3403e7d4..6c3403e7d4 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 7bf690187b..7bf690187b 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 fafe8bee40..fafe8bee40 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 3e91e821c6..3e91e821c6 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 7a39c20b0a..7a39c20b0a 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 2a226541f3..2a226541f3 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 428da2f45f..428da2f45f 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 af112ea360..af112ea360 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 a5c99fd3ee..a5c99fd3ee 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 81326641f1..81326641f1 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 73f3a3f970..73f3a3f970 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 2589942a60..2589942a60 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 5bf3868fcc..5bf3868fcc 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 55e36075f5..55e36075f5 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 3a0c673d27..3a0c673d27 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 e7c8c1d029..e7c8c1d029 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 bb7203c502..bb7203c502 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 ea9eec4131..ea9eec4131 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 8da7e768fd..8da7e768fd 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 3ef2f4081b..3ef2f4081b 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 ddfb0a7e16..ddfb0a7e16 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 9ad041b115..9ad041b115 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 c4c247d675..c4c247d675 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 adf904774d..adf904774d 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 0e04475199..0e04475199 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 ce40b9f8a9..ce40b9f8a9 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 9a23a4d591..9a23a4d591 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 5acfe5d46d..5acfe5d46d 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 78557d82b8..78557d82b8 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 e58ebc251e..e58ebc251e 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 5eae4467ff..5eae4467ff 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 cb48729c8f..cb48729c8f 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 3d553a2b36..3d553a2b36 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 0870b1aac3..0870b1aac3 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 9d5e42e3cf..9d5e42e3cf 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 c6b3b3de2d..c6b3b3de2d 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 9c17ddd66e..9c17ddd66e 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 4ad7ec02d1..4ad7ec02d1 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 aa9ed74d8f..aa9ed74d8f 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 c66f952fa6..c66f952fa6 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 0a2fab711e..0a2fab711e 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 a76f483330..a76f483330 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 bbb90c5408..bbb90c5408 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 b9e3d077ae..b9e3d077ae 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 0e8ab78955..0e8ab78955 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 5b2d4c3930..5b2d4c3930 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 0616a5100c..0616a5100c 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 a1e2043ec3..a1e2043ec3 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 8bf51c75d5..8bf51c75d5 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 3d7aacb4dc..3d7aacb4dc 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 5d4048a4ab..5d4048a4ab 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 64425dd37b..64425dd37b 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 a3d9b47ecf..a3d9b47ecf 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 10b5abc6e7..10b5abc6e7 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 bb15c6f634..bb15c6f634 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 78c4cbd20f..78c4cbd20f 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 aecec9aba2..aecec9aba2 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 dff7b4a5f8..dff7b4a5f8 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 3111328024..3111328024 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 663bde4955..663bde4955 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 9c1ef15dfe..9c1ef15dfe 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 61b150f5f8..61b150f5f8 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 dbd0d1712d..dbd0d1712d 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 3a918b3c81..3a918b3c81 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 3b90e99391..3b90e99391 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 830f163e5f..830f163e5f 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 1862c9703d..1862c9703d 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 75cbff2731..75cbff2731 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 37cd22a4ed..37cd22a4ed 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 b4cb8e8f5a..b4cb8e8f5a 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 3f57941811..3f57941811 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 32ab9bdf8e..32ab9bdf8e 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 7463add10f..7463add10f 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 f00b6365aa..f00b6365aa 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 70c1586820..70c1586820 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 4e21b049d6..4e21b049d6 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 2bbd4d8aee..2bbd4d8aee 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 05fc3411ee..05fc3411ee 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 562b296e54..562b296e54 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 1c622b7dc4..1c622b7dc4 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 4164df0baf..4164df0baf 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 f0aa559269..f0aa559269 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 35b9f5ff52..35b9f5ff52 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 2f803d033c..2f803d033c 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 23fc8348fd..23fc8348fd 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 b8d6f537a6..b8d6f537a6 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 5ecf5b1435..5ecf5b1435 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 9eeab95381..9eeab95381 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 b31163c9ed..b31163c9ed 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 2f6803c9ce..2f6803c9ce 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 f765ed07b9..f765ed07b9 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 7194f87bdc..7194f87bdc 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 6aaa8a231a..6aaa8a231a 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 4c19ad9f29..4c19ad9f29 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 61ed0f2179..61ed0f2179 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 6fc7177662..6fc7177662 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 ab1302c752..ab1302c752 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 0572dfb448..0572dfb448 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 d2ec207c91..d2ec207c91 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 e29fb2715c..e29fb2715c 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 96e85e97c4..96e85e97c4 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 a22f743db3..a22f743db3 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 8bf97f958c..8bf97f958c 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 e28d35900c..e28d35900c 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 95168e3143..95168e3143 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 6e41241625..6e41241625 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 35ecccd09e..35ecccd09e 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 3ad67c8e7f..3ad67c8e7f 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 7e48591609..7e48591609 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 648369b4d3..648369b4d3 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 629a3cea33..629a3cea33 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 34ec224a58..34ec224a58 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 2a943f1234..2a943f1234 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 c229026827..c229026827 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 51e667e8d3..51e667e8d3 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 a50b4f93a9..a50b4f93a9 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 25d3e102c6..25d3e102c6 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 431c462e10..431c462e10 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 55b38fb1b9..55b38fb1b9 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 67becd3ffb..67becd3ffb 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 89b7fd5a76..89b7fd5a76 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 a16749b54f..a16749b54f 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 08089395f7..08089395f7 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 0089378d22..0089378d22 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 110b0a004a..110b0a004a 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 1c7045232c..1c7045232c 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 2f2f487eca..2f2f487eca 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 1afa2e265e..1afa2e265e 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 2215cc2428..2215cc2428 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 40cb4dc92c..40cb4dc92c 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 b52191ad74..b52191ad74 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 6855885d32..6855885d32 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 b103b4e66e..b103b4e66e 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 f5612e30a0..f5612e30a0 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 506868f4a8..506868f4a8 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 aca48ae0c8..aca48ae0c8 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 1995fa124f..1995fa124f 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 a4b1c5f1c6..a4b1c5f1c6 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 799d9cb488..799d9cb488 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 8793b592e7..8793b592e7 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 5e16c9166d..5e16c9166d 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 80647dd661..80647dd661 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 3cca68b2ab..3cca68b2ab 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 b43c3f66d4..b43c3f66d4 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 a9ac514a99..a9ac514a99 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 da7c64aa5d..da7c64aa5d 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 eaa0d95edb..eaa0d95edb 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 a8908a0100..a8908a0100 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 5a39b90887..5a39b90887 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 c9f35934d8..c9f35934d8 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 fd5d2eb0e7..fd5d2eb0e7 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 d8c639d055..d8c639d055 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 6248b7416e..6248b7416e 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 fd736cacf2..fd736cacf2 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 c276a9e835..c276a9e835 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 df91ac7aab..df91ac7aab 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 420d463be3..420d463be3 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 f1dfaf4ca4..f1dfaf4ca4 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 5e6aec09e8..5e6aec09e8 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 6c2634f9ad..6c2634f9ad 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 8ebe956e7c..8ebe956e7c 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 261a85c931..261a85c931 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 aeefafd75f..aeefafd75f 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 4697cb40ba..4697cb40ba 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 bbceddd5da..bbceddd5da 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 77f51cfd2b..77f51cfd2b 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 08c7c997bc..08c7c997bc 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 56ef61571a..56ef61571a 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 bcb27c7be3..bcb27c7be3 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 30fefdd2f4..30fefdd2f4 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 5d0c493a3d..5d0c493a3d 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 683fca64b4..683fca64b4 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 ddf986949c..ddf986949c 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 f3d4e5db52..f3d4e5db52 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 0886d5c7a9..0886d5c7a9 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 9918cc7770..9918cc7770 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 fe707cfe07..fe707cfe07 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 7c3615fa7f..7c3615fa7f 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 e2e95e299b..e2e95e299b 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 5d034dfec2..5d034dfec2 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 efbc67ef1b..efbc67ef1b 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 1d290a7ef7..1d290a7ef7 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 1d48368834..1d48368834 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 9e382837fc..9e382837fc 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 ef949a7afb..ef949a7afb 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 1044367186..1044367186 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 1d24deecd5..1d24deecd5 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 d638ca1fef..d638ca1fef 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 ca92c5573e..ca92c5573e 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 5d213f0f5a..5d213f0f5a 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 06d8d1ee2e..06d8d1ee2e 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 dbb25f37ee..dbb25f37ee 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 37b6fe207e..37b6fe207e 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 6d0405e562..6d0405e562 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 ebd34f15ed..ebd34f15ed 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 d1a2b6f1e2..d1a2b6f1e2 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 0271673f55..0271673f55 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 b8eba4c967..b8eba4c967 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 cd9fa2787f..cd9fa2787f 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 d78e05c61f..d78e05c61f 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 792976bc37..792976bc37 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 2c5734f703..2c5734f703 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 caa3cca763..caa3cca763 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 810324b0dd..810324b0dd 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 5da1b36ee1..5da1b36ee1 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 3f76dd440f..3f76dd440f 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 69ede42271..69ede42271 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 0ff086d5c7..0ff086d5c7 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 ac8743eeca..ac8743eeca 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 296bdafd03..296bdafd03 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 2e266ddca2..2e266ddca2 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 a61e2d4d2f..a61e2d4d2f 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 d775d38829..d775d38829 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 08083fbc54..08083fbc54 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 e5bccc409e..e5bccc409e 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 0a63ce0c2c..0a63ce0c2c 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 4a52d5d457..4a52d5d457 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 abfdcb837a..abfdcb837a 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 62ab06b3ec..62ab06b3ec 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 aa7b1d874a..aa7b1d874a 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 b0dfbcde05..b0dfbcde05 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 855ec4454f..855ec4454f 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 a32571a772..a32571a772 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 f173ae96ab..f173ae96ab 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 a9b8d1e1ee..a9b8d1e1ee 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 e6be656d48..e6be656d48 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 47cda00536..47cda00536 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 5077ac27e4..5077ac27e4 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 0f6615de39..0f6615de39 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 c4ac775064..c4ac775064 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 cc2d3f5d62..cc2d3f5d62 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 d7f3bc98b5..d7f3bc98b5 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 c170ea2fc0..c170ea2fc0 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 73ac847631..73ac847631 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 758cd43bf4..758cd43bf4 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 12014ead02..12014ead02 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 ccada97695..ccada97695 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 8d267ce890..8d267ce890 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 57c81db622..57c81db622 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 c4585070bf..c4585070bf 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 0553caa8fd..0553caa8fd 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 9a0a42e1f3..9a0a42e1f3 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 3a7375371f..3a7375371f 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 dc7c70cea6..dc7c70cea6 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 2143f06bf2..2143f06bf2 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 5495292e2e..5495292e2e 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 6241a465a7..6241a465a7 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 877db04e8b..877db04e8b 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 40045830d0..40045830d0 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 eb78e634af..eb78e634af 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 798f4b5825..798f4b5825 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 2346c6fbe8..2346c6fbe8 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 cefbe8d819..cefbe8d819 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 5395d3e9f8..5395d3e9f8 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 1e36b20260..1e36b20260 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 3926c6303f..3926c6303f 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 89e18df910..89e18df910 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 90563d41a3..90563d41a3 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 1a1056aa00..1a1056aa00 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 ce4c782796..ce4c782796 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 06f26563b3..06f26563b3 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 800f3c5a9e..800f3c5a9e 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 6d4866a169..6d4866a169 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 af913733b0..af913733b0 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 94385fb383..94385fb383 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 48bd5bd276..48bd5bd276 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 72a41ec35c..72a41ec35c 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 5345f0b143..5345f0b143 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 46aec084d2..46aec084d2 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 a7c9bb7e78..a7c9bb7e78 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 d3988b8ebb..d3988b8ebb 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 713a57a0fd..713a57a0fd 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 c744fafa76..c744fafa76 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 61f9307f1a..61f9307f1a 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 7b776d078b..7b776d078b 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 dda6bd8d62..dda6bd8d62 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 262c788d71..262c788d71 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 a96ce7edcf..a96ce7edcf 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 cf614d25ca..cf614d25ca 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 f4ca885270..f4ca885270 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 b9e3b2373c..b9e3b2373c 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 3770df6de5..3770df6de5 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 45e75bf7d7..45e75bf7d7 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 fbc9dc1ba4..fbc9dc1ba4 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 3ec439ddde..3ec439ddde 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 d51db8e508..d51db8e508 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 5bfc63445e..5bfc63445e 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 e661d70dde..e661d70dde 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 21570ead7b..21570ead7b 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 3fbb12f446..3fbb12f446 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 f4d4e775d8..f4d4e775d8 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 b703492435..b703492435 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 41df996fee..41df996fee 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 b263c72063..b263c72063 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 e161a11ee5..e161a11ee5 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 d0fa6fb1dd..d0fa6fb1dd 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 107a53b598..107a53b598 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 e7b12fc1c1..e7b12fc1c1 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 ad245012d0..ad245012d0 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 bc2bdb9037..bc2bdb9037 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 e0a2bab036..e0a2bab036 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 b1de8fceb1..b1de8fceb1 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 cbe8c2bb5e..cbe8c2bb5e 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 65f43e76db..65f43e76db 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 6f5b78d34e..6f5b78d34e 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 76b605c271..76b605c271 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 8c8c4f7726..8c8c4f7726 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 5f7b186e37..5f7b186e37 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 271b065f4a..271b065f4a 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 8a0197dd5e..8a0197dd5e 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 f0514c97b1..f0514c97b1 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 ee940f6d93..ee940f6d93 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 d54b9c6ce3..d54b9c6ce3 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 6c7ca6eabd..6c7ca6eabd 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 f4c7304639..f4c7304639 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 3a0cc2e5e5..3a0cc2e5e5 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 29dc7a9481..29dc7a9481 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 c6c4df1772..c6c4df1772 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 34a926b1dc..34a926b1dc 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 215ec6bf79..215ec6bf79 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 1a7772c21f..1a7772c21f 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 13c3e97d5b..13c3e97d5b 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 ff6b2d9159..ff6b2d9159 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 110fdcc060..110fdcc060 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 01484b19ae..01484b19ae 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 c3b00f1716..c3b00f1716 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 b4e64a1d6d..b4e64a1d6d 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 a71800ecf9..a71800ecf9 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 8684754149..8684754149 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 353d36313c..353d36313c 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 4b7f4fc30c..4b7f4fc30c 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 69f204a707..69f204a707 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 6c4b1851e0..6c4b1851e0 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 69f204a707..69f204a707 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 c3b00f1716..c3b00f1716 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 9ad249ecf2..9ad249ecf2 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 9fdf74cfdf..9fdf74cfdf 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 77573dbc12..77573dbc12 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 97aa87cca3..97aa87cca3 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 cf2253c9bc..cf2253c9bc 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 5be6c09045..5be6c09045 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 4780768ff4..4780768ff4 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 d91538e365..d91538e365 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 b8fd35ae40..b8fd35ae40 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 2924cf4e00..2924cf4e00 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 e4180b783f..e4180b783f 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 729098839b..729098839b 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 66bf82a11d..66bf82a11d 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 c5def78d58..c5def78d58 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 5b80134b73..5b80134b73 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 a634dbecb2..a634dbecb2 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 f978241cfc..f978241cfc 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 d2aee30dd8..d2aee30dd8 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 6c9fb4ca13..6c9fb4ca13 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 2080bede74..2080bede74 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 921334c2cb..921334c2cb 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 921334c2cb..921334c2cb 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 ab951ab11b..ab951ab11b 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 9db3af4c99..9db3af4c99 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 33f40d279a..33f40d279a 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 3ef24c07f7..3ef24c07f7 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 3ef24c07f7..3ef24c07f7 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 3ef24c07f7..3ef24c07f7 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 aaf61a9163..aaf61a9163 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 85f3775676..85f3775676 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 40addc79c3..40addc79c3 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 40addc79c3..40addc79c3 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 cd6fe7c84c..cd6fe7c84c 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 c04cb6b397..c04cb6b397 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 cc664b337a..cc664b337a 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 ad8e17ad01..ad8e17ad01 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 5b0236af0c..5b0236af0c 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 b6bb863891..b6bb863891 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 bc7222e7e1..bc7222e7e1 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 acd5dca2d2..acd5dca2d2 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 227eeaa709..227eeaa709 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 954ed3d61f..954ed3d61f 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 6c106597e1..6c106597e1 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 01624bc527..01624bc527 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 6b98c46713..6b98c46713 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 3d74c7388a..3d74c7388a 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 6508146c9e..6508146c9e 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 a2266c98de..a2266c98de 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 0275b2d11d..0275b2d11d 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 05e9777d03..05e9777d03 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 c65fa8f8ac..c65fa8f8ac 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 c65fa8f8ac..c65fa8f8ac 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 b27b58aa03..b27b58aa03 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 b27b58aa03..b27b58aa03 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 d9bfcea077..d9bfcea077 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 7af6edc4ca..7af6edc4ca 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 2e63d28e6a..2e63d28e6a 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 4957a8671d..4957a8671d 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 72c7873e91..72c7873e91 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 fbe31a1f8f..fbe31a1f8f 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 c28ef4d035..c28ef4d035 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 e48c1f7a2f..e48c1f7a2f 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 20f0cd1ac2..20f0cd1ac2 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 a5be6f207c..a5be6f207c 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 fcc89eb21c..fcc89eb21c 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 f86f4c0c21..f86f4c0c21 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 ccbd5bbbb4..ccbd5bbbb4 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 d2e6fd6aec..d2e6fd6aec 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 e8caad830b..e8caad830b 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 772527f2f6..772527f2f6 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 e8caad830b..e8caad830b 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 e9fe1806e8..e9fe1806e8 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 73e0d903b4..73e0d903b4 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 cb740182a1..cb740182a1 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 2645b699e4..2645b699e4 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 88c71a6f9d..88c71a6f9d 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 938bb3e859..938bb3e859 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 f7d625e18f..f7d625e18f 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 5af618e78f..5af618e78f 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 ce2f6fa8eb..ce2f6fa8eb 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 6a8c55c92d..6a8c55c92d 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 80371ba528..80371ba528 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 47e3d28b9e..47e3d28b9e 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 8abd57a84b..8abd57a84b 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 746ca7e40b..746ca7e40b 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 56a3ae6931..56a3ae6931 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 1b3276e796..1b3276e796 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 218e366ef9..218e366ef9 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 de5a1d5a47..de5a1d5a47 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 0347e8bef3..0347e8bef3 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 de6ff0054b..de6ff0054b 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 60ab38e5e0..60ab38e5e0 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 0bd4afc826..0bd4afc826 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 697af6afa2..697af6afa2 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 237d4babc1..237d4babc1 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 8492d10a4d..8492d10a4d 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 76674f13da..76674f13da 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 378711e378..378711e378 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 1c3c39d3ea..1c3c39d3ea 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 11dcbbbe57..11dcbbbe57 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 2663ed1bb0..2663ed1bb0 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 8ad311cd3c..8ad311cd3c 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 40a2407e1f..40a2407e1f 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 894e1a15a1..894e1a15a1 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 894e1a15a1..894e1a15a1 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 47e6d9a517..47e6d9a517 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 3d7eadd8df..3d7eadd8df 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 e5293e0a57..e5293e0a57 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 e0d516738d..e0d516738d 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 529cd9be35..529cd9be35 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 1c9999ee3a..1c9999ee3a 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 71d61c2a0c..71d61c2a0c 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 adde05c66d..adde05c66d 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 5ef7216f81..5ef7216f81 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 5ef7216f81..5ef7216f81 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 b555f9f06c..b555f9f06c 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 e72c6ab87e..e72c6ab87e 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 6e247b28bd..6e247b28bd 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 3844a8e284..3844a8e284 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 840af03240..840af03240 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 1eec5d6236..1eec5d6236 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 77573dbc12..77573dbc12 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 cd809a5881..cd809a5881 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 6e29b890b9..6e29b890b9 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 64c30fb142..64c30fb142 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 178b280ad6..178b280ad6 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 5d5a0989e0..5d5a0989e0 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 aebf755663..aebf755663 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 817a744385..817a744385 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 a683757f68..a683757f68 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 e9da004a74..e9da004a74 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 082da79b04..082da79b04 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 adfa44066a..adfa44066a 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 b32401ac2c..b32401ac2c 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 719a56a72d..719a56a72d 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 37c8674711..37c8674711 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 affd7f4d55..affd7f4d55 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 8703e76e49..8703e76e49 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 ce81c3df0d..ce81c3df0d 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 4e5766f779..4e5766f779 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 0a15c6095a..0a15c6095a 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 54c06596ad..54c06596ad 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 90391c2264..90391c2264 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 c3b00f1716..c3b00f1716 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 c3b00f1716..c3b00f1716 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 89ab89671f..89ab89671f 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 9029469690..9029469690 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 29a7d26a0a..29a7d26a0a 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 887526632b..887526632b 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 b6e6a00171..b6e6a00171 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 164f870ec8..164f870ec8 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 2c9a022cae..2c9a022cae 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 1a7f7f9dbd..1a7f7f9dbd 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 89e0bd435d..89e0bd435d 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 ef5f4e1549..ef5f4e1549 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 894e1a15a1..894e1a15a1 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 c3752b674e..c3752b674e 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 58c57253c1..58c57253c1 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 fad593cd98..fad593cd98 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 d86392d08a..d86392d08a 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 fad593cd98..fad593cd98 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 df1bf89415..df1bf89415 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 01df591aa8..01df591aa8 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 09a346ac6d..09a346ac6d 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 ffc63f7bb5..ffc63f7bb5 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 b39a63ed36..b39a63ed36 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 2f14a89709..2f14a89709 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 86d036c80f..86d036c80f 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 6085f8d620..6085f8d620 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 dd7da1dfb0..dd7da1dfb0 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 ff322d1a1e..ff322d1a1e 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 eecfa7e41d..eecfa7e41d 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 5a2597e5cc..5a2597e5cc 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 3fa0a24d9b..3fa0a24d9b 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 f186cb7101..f186cb7101 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 3574c04daf..3574c04daf 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 7e579328e6..7e579328e6 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 5d429021c3..5d429021c3 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 85a3398e41..85a3398e41 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 5d429021c3..5d429021c3 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 0a9e55e5a5..0a9e55e5a5 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 7e27b9b42a..7e27b9b42a 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 b231e96834..b231e96834 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 d23c50d85c..d23c50d85c 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 8588e4df39..8588e4df39 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 c90fdf788a..c90fdf788a 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 f5eb0c356b..f5eb0c356b 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 8062a7feb8..8062a7feb8 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 4d2b6066ad..4d2b6066ad 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 e5dc7a8838..e5dc7a8838 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 92abfcd35c..92abfcd35c 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 224d23514f..224d23514f 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 94a8922948..94a8922948 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 eb00aa902e..eb00aa902e 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 0c6513f8c7..0c6513f8c7 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 623ed4b8b0..623ed4b8b0 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 0f09553c83..0f09553c83 100644
--- a/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yql
+++ b/yql/essentials/tests/s-expressions/suites/YtNative/PureUdf.yqls