From 31fccdaa7fe98b01e0c390f1a935ba4f45d44b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20Akg=C3=BCn?= <ozgurakgun@gmail.com>
Date: Mon, 26 Feb 2024 13:29:47 +0000
Subject: [PATCH] post-merge-test-update 2

---
 .../expected/model-solution000001.solution    |   28 +
 .../issues/102/expected/model.eprime.orig     |   88 --
 .../model_1_1-solution000001.solution         |    6 +
 .../issues/166/expected/model_1_1.eprime.orig |   46 -
 .../model_1_2-solution000001.solution         |    6 +
 .../issues/166/expected/model_1_2.eprime.orig |   83 --
 .../model_1_3-solution000001.solution         |    6 +
 .../issues/166/expected/model_1_3.eprime.orig |   88 --
 .../model_1_4-solution000001.solution         |    6 +
 .../issues/166/expected/model_1_4.eprime.orig |   92 --
 .../model_2_1-solution000001.solution         |    6 +
 .../issues/166/expected/model_2_1.eprime.orig |  139 --
 .../model_2_2-solution000001.solution         |    6 +
 .../issues/166/expected/model_2_2.eprime.orig |  111 --
 .../model_2_3-solution000001.solution         |    6 +
 .../issues/166/expected/model_2_3.eprime.orig |  159 ---
 .../model_2_4-solution000001.solution         |    6 +
 .../issues/166/expected/model_2_4.eprime.orig |  163 ---
 .../model_3_1-solution000001.solution         |    6 +
 .../issues/166/expected/model_3_1.eprime.orig |  148 --
 .../model_3_2-solution000001.solution         |    6 +
 .../issues/166/expected/model_3_2.eprime.orig |  166 ---
 .../model_3_3-solution000001.solution         |    6 +
 .../issues/166/expected/model_3_3.eprime.orig |  118 --
 .../model_3_4-solution000001.solution         |    6 +
 .../issues/166/expected/model_3_4.eprime.orig |  173 ---
 .../model_4_1-solution000001.solution         |    6 +
 .../issues/166/expected/model_4_1.eprime.orig |  154 ---
 .../model_4_2-solution000001.solution         |    6 +
 .../issues/166/expected/model_4_2.eprime.orig |  169 ---
 .../model_4_3-solution000001.solution         |    6 +
 .../issues/166/expected/model_4_3.eprime.orig |  172 ---
 .../model_4_4-solution000001.solution         |    6 +
 .../issues/166/expected/model_4_4.eprime.orig |  121 --
 .../issues/200/expected/model_1_2.eprime      |    9 -
 .../issues/200/expected/model_2_1.eprime      |   10 -
 .../issues/200/expected/model_2_2.eprime      |    7 -
 .../model_1_1-1-solution000001.solution       |    3 +
 .../212/expected/model_1_1-1.eprime-param     |    6 +
 .../issues/212/expected/model_1_1.eprime      |   14 +
 .../model_1_2-1-solution000001.solution       |    3 +
 .../212/expected/model_1_2-1.eprime-param     |    6 +
 .../issues/212/expected/model_1_2.eprime      |   23 +
 .../model_1_3-1-solution000001.solution       |    3 +
 .../212/expected/model_1_3-1.eprime-param     |    6 +
 .../issues/212/expected/model_1_3.eprime      |   26 +
 .../model_1_4-1-solution000001.solution       |    3 +
 .../212/expected/model_1_4-1.eprime-param     |    6 +
 .../issues/212/expected/model_1_4.eprime      |   26 +
 .../model_2_1-1-solution000001.solution       |    3 +
 .../212/expected/model_2_1-1.eprime-param     |    6 +
 .../issues/212/expected/model_2_1.eprime      |   25 +
 .../model_2_2-1-solution000001.solution       |    3 +
 .../212/expected/model_2_2-1.eprime-param     |    6 +
 .../issues/212/expected/model_2_2.eprime      |   20 +
 .../model_2_3-1-solution000001.solution       |    3 +
 .../212/expected/model_2_3-1.eprime-param     |    6 +
 .../issues/212/expected/model_2_3.eprime      |   36 +
 .../model_2_4-1-solution000001.solution       |    3 +
 .../212/expected/model_2_4-1.eprime-param     |    6 +
 .../issues/212/expected/model_2_4.eprime      |   37 +
 .../model_3_1-1-solution000001.solution       |    3 +
 .../212/expected/model_3_1-1.eprime-param     |    6 +
 .../issues/212/expected/model_3_1.eprime      |   29 +
 .../model_3_2-1-solution000001.solution       |    3 +
 .../212/expected/model_3_2-1.eprime-param     |    6 +
 .../issues/212/expected/model_3_2.eprime      |   36 +
 .../model_3_3-1-solution000001.solution       |    3 +
 .../212/expected/model_3_3-1.eprime-param     |    6 +
 .../issues/212/expected/model_3_3.eprime      |   22 +
 .../model_3_4-1-solution000001.solution       |    3 +
 .../212/expected/model_3_4-1.eprime-param     |    6 +
 .../issues/212/expected/model_3_4.eprime      |   41 +
 .../model_4_1-1-solution000001.solution       |    3 +
 .../212/expected/model_4_1-1.eprime-param     |    6 +
 .../issues/212/expected/model_4_1.eprime      |   29 +
 .../model_4_2-1-solution000001.solution       |    3 +
 .../212/expected/model_4_2-1.eprime-param     |    6 +
 .../issues/212/expected/model_4_2.eprime      |   37 +
 .../model_4_3-1-solution000001.solution       |    3 +
 .../212/expected/model_4_3-1.eprime-param     |    6 +
 .../issues/212/expected/model_4_3.eprime      |   41 +
 .../model_4_4-1-solution000001.solution       |    3 +
 .../212/expected/model_4_4-1.eprime-param     |    6 +
 .../issues/212/expected/model_4_4.eprime      |   23 +
 .../issues/261/expected/model_1.eprime        |    2 +-
 .../model_1_1-p1-solution000001.solution      |    6 +
 .../model_1_1-p1-solution000002.solution      |    7 +
 .../model_1_1-p1-solution000003.solution      |    7 +
 .../model_1_1-p1-solution000004.solution      |    7 +
 .../model_1_1-p1-solution000005.solution      |    7 +
 .../model_1_1-p1-solution000006.solution      |    7 +
 .../model_1_1-p1-solution000007.solution      |    7 +
 .../model_1_1-p1-solution000008.solution      |    7 +
 .../286/expected/model_1_1-p1.eprime-param    |    3 +
 .../issues/286/expected/model_1_1.eprime      |   43 +
 .../model_1_2-p1-solution000001.solution      |    6 +
 .../model_1_2-p1-solution000002.solution      |    7 +
 .../model_1_2-p1-solution000003.solution      |    7 +
 .../model_1_2-p1-solution000004.solution      |    7 +
 .../model_1_2-p1-solution000005.solution      |    7 +
 .../model_1_2-p1-solution000006.solution      |    7 +
 .../model_1_2-p1-solution000007.solution      |    7 +
 .../model_1_2-p1-solution000008.solution      |    7 +
 .../286/expected/model_1_2-p1.eprime-param    |    3 +
 .../issues/286/expected/model_1_2.eprime      |  122 ++
 .../model_1_3-p1-solution000001.solution      |    6 +
 .../model_1_3-p1-solution000002.solution      |    7 +
 .../model_1_3-p1-solution000003.solution      |    7 +
 .../model_1_3-p1-solution000004.solution      |    7 +
 .../model_1_3-p1-solution000005.solution      |    7 +
 .../model_1_3-p1-solution000006.solution      |    7 +
 .../model_1_3-p1-solution000007.solution      |    7 +
 .../model_1_3-p1-solution000008.solution      |    7 +
 .../286/expected/model_1_3-p1.eprime-param    |    3 +
 .../issues/286/expected/model_1_3.eprime.orig |  132 --
 .../model_1_4-p1-solution000001.solution      |    6 +
 .../model_1_4-p1-solution000002.solution      |    7 +
 .../model_1_4-p1-solution000003.solution      |    7 +
 .../model_1_4-p1-solution000004.solution      |    7 +
 .../model_1_4-p1-solution000005.solution      |    7 +
 .../model_1_4-p1-solution000006.solution      |    7 +
 .../model_1_4-p1-solution000007.solution      |    7 +
 .../model_1_4-p1-solution000008.solution      |    7 +
 .../286/expected/model_1_4-p1.eprime-param    |    3 +
 .../issues/286/expected/model_1_4.eprime      |   91 ++
 .../model_2_1-p1-solution000001.solution      |    6 +
 .../model_2_1-p1-solution000002.solution      |    7 +
 .../model_2_1-p1-solution000003.solution      |    7 +
 .../model_2_1-p1-solution000004.solution      |    7 +
 .../model_2_1-p1-solution000005.solution      |    7 +
 .../model_2_1-p1-solution000006.solution      |    7 +
 .../model_2_1-p1-solution000007.solution      |    7 +
 .../model_2_1-p1-solution000008.solution      |    7 +
 .../286/expected/model_2_1-p1.eprime-param    |    3 +
 .../issues/286/expected/model_2_1.eprime      |  122 ++
 .../model_2_2-p1-solution000001.solution      |    6 +
 .../model_2_2-p1-solution000002.solution      |    7 +
 .../model_2_2-p1-solution000003.solution      |    7 +
 .../model_2_2-p1-solution000004.solution      |    7 +
 .../model_2_2-p1-solution000005.solution      |    7 +
 .../model_2_2-p1-solution000006.solution      |    7 +
 .../model_2_2-p1-solution000007.solution      |    7 +
 .../model_2_2-p1-solution000008.solution      |    7 +
 .../286/expected/model_2_2-p1.eprime-param    |    3 +
 .../issues/286/expected/model_2_2.eprime      |   65 +
 .../model_2_3-p1-solution000001.solution      |    6 +
 .../model_2_3-p1-solution000002.solution      |    7 +
 .../model_2_3-p1-solution000003.solution      |    7 +
 .../model_2_3-p1-solution000004.solution      |    7 +
 .../model_2_3-p1-solution000005.solution      |    7 +
 .../model_2_3-p1-solution000006.solution      |    7 +
 .../model_2_3-p1-solution000007.solution      |    7 +
 .../model_2_3-p1-solution000008.solution      |    7 +
 .../286/expected/model_2_3-p1.eprime-param    |    3 +
 .../issues/286/expected/model_2_3.eprime.orig |  160 ---
 .../model_2_4-p1-solution000001.solution      |    6 +
 .../model_2_4-p1-solution000002.solution      |    7 +
 .../model_2_4-p1-solution000003.solution      |    7 +
 .../model_2_4-p1-solution000004.solution      |    7 +
 .../model_2_4-p1-solution000005.solution      |    7 +
 .../model_2_4-p1-solution000006.solution      |    7 +
 .../model_2_4-p1-solution000007.solution      |    7 +
 .../model_2_4-p1-solution000008.solution      |    7 +
 .../286/expected/model_2_4-p1.eprime-param    |    3 +
 .../issues/286/expected/model_2_4.eprime      |  121 ++
 .../model_3_1-p1-solution000001.solution      |    6 +
 .../model_3_1-p1-solution000002.solution      |    7 +
 .../model_3_1-p1-solution000003.solution      |    7 +
 .../model_3_1-p1-solution000004.solution      |    7 +
 .../model_3_1-p1-solution000005.solution      |    7 +
 .../model_3_1-p1-solution000006.solution      |    7 +
 .../model_3_1-p1-solution000007.solution      |    7 +
 .../model_3_1-p1-solution000008.solution      |    7 +
 .../286/expected/model_3_1-p1.eprime-param    |    3 +
 .../issues/286/expected/model_3_1.eprime.orig |  132 --
 .../model_3_2-p1-solution000001.solution      |    6 +
 .../model_3_2-p1-solution000002.solution      |    7 +
 .../model_3_2-p1-solution000003.solution      |    7 +
 .../model_3_2-p1-solution000004.solution      |    7 +
 .../model_3_2-p1-solution000005.solution      |    7 +
 .../model_3_2-p1-solution000006.solution      |    7 +
 .../model_3_2-p1-solution000007.solution      |    7 +
 .../model_3_2-p1-solution000008.solution      |    7 +
 .../286/expected/model_3_2-p1.eprime-param    |    3 +
 .../issues/286/expected/model_3_2.eprime.orig |  160 ---
 .../model_3_3-p1-solution000001.solution      |    6 +
 .../model_3_3-p1-solution000002.solution      |    7 +
 .../model_3_3-p1-solution000003.solution      |    7 +
 .../model_3_3-p1-solution000004.solution      |    7 +
 .../model_3_3-p1-solution000005.solution      |    7 +
 .../model_3_3-p1-solution000006.solution      |    7 +
 .../model_3_3-p1-solution000007.solution      |    7 +
 .../model_3_3-p1-solution000008.solution      |    7 +
 .../286/expected/model_3_3-p1.eprime-param    |    3 +
 .../issues/286/expected/model_3_3.eprime.orig |   71 -
 .../model_3_4-p1-solution000001.solution      |    6 +
 .../model_3_4-p1-solution000002.solution      |    7 +
 .../model_3_4-p1-solution000003.solution      |    7 +
 .../model_3_4-p1-solution000004.solution      |    7 +
 .../model_3_4-p1-solution000005.solution      |    7 +
 .../model_3_4-p1-solution000006.solution      |    7 +
 .../model_3_4-p1-solution000007.solution      |    7 +
 .../model_3_4-p1-solution000008.solution      |    7 +
 .../286/expected/model_3_4-p1.eprime-param    |    3 +
 .../issues/286/expected/model_3_4.eprime.orig |  131 --
 .../model_4_1-p1-solution000001.solution      |    6 +
 .../model_4_1-p1-solution000002.solution      |    7 +
 .../model_4_1-p1-solution000003.solution      |    7 +
 .../model_4_1-p1-solution000004.solution      |    7 +
 .../model_4_1-p1-solution000005.solution      |    7 +
 .../model_4_1-p1-solution000006.solution      |    7 +
 .../model_4_1-p1-solution000007.solution      |    7 +
 .../model_4_1-p1-solution000008.solution      |    7 +
 .../286/expected/model_4_1-p1.eprime-param    |    3 +
 .../issues/286/expected/model_4_1.eprime      |   88 ++
 .../model_4_2-p1-solution000001.solution      |    6 +
 .../model_4_2-p1-solution000002.solution      |    7 +
 .../model_4_2-p1-solution000003.solution      |    7 +
 .../model_4_2-p1-solution000004.solution      |    7 +
 .../model_4_2-p1-solution000005.solution      |    7 +
 .../model_4_2-p1-solution000006.solution      |    7 +
 .../model_4_2-p1-solution000007.solution      |    7 +
 .../model_4_2-p1-solution000008.solution      |    7 +
 .../286/expected/model_4_2-p1.eprime-param    |    3 +
 .../issues/286/expected/model_4_2.eprime      |  118 ++
 .../model_4_3-p1-solution000001.solution      |    6 +
 .../model_4_3-p1-solution000002.solution      |    7 +
 .../model_4_3-p1-solution000003.solution      |    7 +
 .../model_4_3-p1-solution000004.solution      |    7 +
 .../model_4_3-p1-solution000005.solution      |    7 +
 .../model_4_3-p1-solution000006.solution      |    7 +
 .../model_4_3-p1-solution000007.solution      |    7 +
 .../model_4_3-p1-solution000008.solution      |    7 +
 .../286/expected/model_4_3-p1.eprime-param    |    3 +
 .../issues/286/expected/model_4_3.eprime.orig |  129 --
 .../model_4_4-p1-solution000001.solution      |    6 +
 .../model_4_4-p1-solution000002.solution      |    7 +
 .../model_4_4-p1-solution000003.solution      |    7 +
 .../model_4_4-p1-solution000004.solution      |    7 +
 .../model_4_4-p1-solution000005.solution      |    7 +
 .../model_4_4-p1-solution000006.solution      |    7 +
 .../model_4_4-p1-solution000007.solution      |    7 +
 .../model_4_4-p1-solution000008.solution      |    7 +
 .../286/expected/model_4_4-p1.eprime-param    |    3 +
 .../issues/286/expected/model_4_4.eprime      |   38 +
 .../model-cyc1-solution000001.solution        |    3 +
 .../expected/model-cyc1.eprime-param          |    6 +
 .../model-cyc2-solution000001.solution        |    3 +
 .../expected/model-cyc2.eprime-param          |    6 +
 .../model-non-solution000001.solution         |    3 +
 .../expected/model-non.eprime-param           |    6 +
 .../model-inst-solution000001.solution        |  182 +++
 .../expected/model-inst.eprime-param          |   98 ++
 .../gchq_2016/expected/model.eprime           |  127 ++
 .../model_1_1_1-p1-solution000001.solution    |    3 +
 .../expected/model_1_1_1-p1.eprime-param      |    7 +
 .../model_1_1_1-p2-solution000001.solution    |    3 +
 .../model_1_1_1-p2-solution000002.solution    |    3 +
 .../expected/model_1_1_1-p2.eprime-param      |    7 +
 .../subsetSum/expected/model_1_1_1.eprime     |   27 +
 .../model_1_1_2-p1-solution000001.solution    |    3 +
 .../expected/model_1_1_2-p1.eprime-param      |    7 +
 .../model_1_1_2-p2-solution000001.solution    |    3 +
 .../model_1_1_2-p2-solution000002.solution    |    3 +
 .../expected/model_1_1_2-p2.eprime-param      |    7 +
 .../subsetSum/expected/model_1_1_2.eprime     |   49 +
 .../model_1_2_1-p1-solution000001.solution    |    3 +
 .../expected/model_1_2_1-p1.eprime-param      |    7 +
 .../model_1_2_1-p2-solution000001.solution    |    3 +
 .../model_1_2_1-p2-solution000002.solution    |    3 +
 .../expected/model_1_2_1-p2.eprime-param      |    7 +
 .../subsetSum/expected/model_1_2_1.eprime     |   49 +
 .../model_2_1_1-p1-solution000001.solution    |    3 +
 .../expected/model_2_1_1-p1.eprime-param      |    7 +
 .../model_2_1_1-p2-solution000001.solution    |    3 +
 .../model_2_1_1-p2-solution000002.solution    |    3 +
 .../expected/model_2_1_1-p2.eprime-param      |    7 +
 .../subsetSum/expected/model_2_1_1.eprime     |   49 +
 .../model_2_2_1-p1-solution000001.solution    |    3 +
 .../expected/model_2_2_1-p1.eprime-param      |    7 +
 .../model_2_2_1-p2-solution000001.solution    |    3 +
 .../model_2_2_1-p2-solution000002.solution    |    3 +
 .../expected/model_2_2_1-p2.eprime-param      |    7 +
 .../subsetSum/expected/model_2_2_1.eprime     |   49 +
 .../model_2_2_2-p1-solution000001.solution    |    3 +
 .../expected/model_2_2_2-p1.eprime-param      |    7 +
 .../model_2_2_2-p2-solution000001.solution    |    3 +
 .../model_2_2_2-p2-solution000002.solution    |    3 +
 .../expected/model_2_2_2-p2.eprime-param      |    7 +
 .../subsetSum/expected/model_2_2_2.eprime     |   28 +
 .../expected/model-solution000001.solution    |    4 +
 .../expected/model-solution000002.solution    |    4 +
 .../expected/model-solution000003.solution    |    4 +
 .../expected/model-solution000004.solution    |    4 +
 .../expected/model-solution000005.solution    |    4 +
 .../expected/model-solution000006.solution    |    4 +
 .../expected/model-solution000007.solution    |    4 +
 .../expected/model-solution000008.solution    |    4 +
 .../expected/model-solution000009.solution    |    4 +
 .../expected/model-solution000010.solution    |    4 +
 .../expected/model-solution000011.solution    |    4 +
 .../expected/model-solution000012.solution    |    4 +
 .../expected/model-solution000013.solution    |    4 +
 .../expected/model-solution000014.solution    |    4 +
 .../expected/model-solution000015.solution    |    4 +
 .../expected/model-solution000016.solution    |    4 +
 .../expected/model-solution000017.solution    |    4 +
 .../expected/model-solution000018.solution    |    4 +
 .../expected/model-solution000019.solution    |    4 +
 .../expected/model-solution000020.solution    |    4 +
 .../expected/model-solution000021.solution    |    4 +
 .../expected/model-solution000022.solution    |    4 +
 .../expected/model-solution000023.solution    |    4 +
 .../expected/model-solution000024.solution    |    4 +
 .../expected/model-solution000025.solution    |    4 +
 .../expected/model-solution000026.solution    |    4 +
 .../expected/model-solution000027.solution    |    4 +
 .../expected/model-solution000028.solution    |    4 +
 .../expected/model-solution000029.solution    |    4 +
 .../expected/model-solution000030.solution    |    4 +
 .../expected/model-solution000031.solution    |    4 +
 .../expected/model-solution000032.solution    |    4 +
 .../expected/model-solution000033.solution    |    4 +
 .../expected/model-solution000034.solution    |    4 +
 .../expected/model-solution000035.solution    |    4 +
 .../expected/model-solution000036.solution    |    4 +
 .../expected/model.eprime                     |   91 ++
 .../model_1_1_1_1-solution000001.solution     |    4 +
 .../model_1_1_1_1-solution000002.solution     |    4 +
 .../model_1_1_1_1-solution000003.solution     |    4 +
 .../model_1_1_1_1-solution000004.solution     |    4 +
 .../model_1_1_1_1-solution000005.solution     |    4 +
 .../model_1_1_1_1-solution000006.solution     |    4 +
 .../model_1_1_1_2-solution000001.solution     |    4 +
 .../model_1_1_1_2-solution000002.solution     |    4 +
 .../model_1_1_1_2-solution000003.solution     |    4 +
 .../model_1_1_1_2-solution000004.solution     |    4 +
 .../model_1_1_1_2-solution000005.solution     |    4 +
 .../model_1_1_1_2-solution000006.solution     |    4 +
 .../model_1_1_1_3-solution000001.solution     |    4 +
 .../model_1_1_1_3-solution000002.solution     |    4 +
 .../model_1_1_1_3-solution000003.solution     |    4 +
 .../model_1_1_1_3-solution000004.solution     |    4 +
 .../model_1_1_1_3-solution000005.solution     |    4 +
 .../model_1_1_1_3-solution000006.solution     |    4 +
 .../model_1_1_2_1-solution000001.solution     |    4 +
 .../model_1_1_2_1-solution000002.solution     |    4 +
 .../model_1_1_2_1-solution000003.solution     |    4 +
 .../model_1_1_2_1-solution000004.solution     |    4 +
 .../model_1_1_2_1-solution000005.solution     |    4 +
 .../model_1_1_2_1-solution000006.solution     |    4 +
 .../model_1_1_2_2-solution000001.solution     |    4 +
 .../model_1_1_2_2-solution000002.solution     |    4 +
 .../model_1_1_2_2-solution000003.solution     |    4 +
 .../model_1_1_2_2-solution000004.solution     |    4 +
 .../model_1_1_2_2-solution000005.solution     |    4 +
 .../model_1_1_2_2-solution000006.solution     |    4 +
 .../model_1_1_2_3-solution000001.solution     |    4 +
 .../model_1_1_2_3-solution000002.solution     |    4 +
 .../model_1_1_2_3-solution000003.solution     |    4 +
 .../model_1_1_2_3-solution000004.solution     |    4 +
 .../model_1_1_2_3-solution000005.solution     |    4 +
 .../model_1_1_2_3-solution000006.solution     |    4 +
 .../model_1_1_3_1-solution000001.solution     |    4 +
 .../model_1_1_3_1-solution000002.solution     |    4 +
 .../model_1_1_3_1-solution000003.solution     |    4 +
 .../model_1_1_3_1-solution000004.solution     |    4 +
 .../model_1_1_3_1-solution000005.solution     |    4 +
 .../model_1_1_3_1-solution000006.solution     |    4 +
 .../model_1_1_3_2-solution000001.solution     |    4 +
 .../model_1_1_3_2-solution000002.solution     |    4 +
 .../model_1_1_3_2-solution000003.solution     |    4 +
 .../model_1_1_3_2-solution000004.solution     |    4 +
 .../model_1_1_3_2-solution000005.solution     |    4 +
 .../model_1_1_3_2-solution000006.solution     |    4 +
 .../model_1_1_3_3-solution000001.solution     |    4 +
 .../model_1_1_3_3-solution000002.solution     |    4 +
 .../model_1_1_3_3-solution000003.solution     |    4 +
 .../model_1_1_3_3-solution000004.solution     |    4 +
 .../model_1_1_3_3-solution000005.solution     |    4 +
 .../model_1_1_3_3-solution000006.solution     |    4 +
 .../model_1_2_1_1-solution000001.solution     |    4 +
 .../model_1_2_1_1-solution000002.solution     |    4 +
 .../model_1_2_1_1-solution000003.solution     |    4 +
 .../model_1_2_1_1-solution000004.solution     |    4 +
 .../model_1_2_1_1-solution000005.solution     |    4 +
 .../model_1_2_1_1-solution000006.solution     |    4 +
 .../model_1_2_1_2-solution000001.solution     |    4 +
 .../model_1_2_1_2-solution000002.solution     |    4 +
 .../model_1_2_1_2-solution000003.solution     |    4 +
 .../model_1_2_1_2-solution000004.solution     |    4 +
 .../model_1_2_1_2-solution000005.solution     |    4 +
 .../model_1_2_1_2-solution000006.solution     |    4 +
 .../model_1_2_1_3-solution000001.solution     |    4 +
 .../model_1_2_1_3-solution000002.solution     |    4 +
 .../model_1_2_1_3-solution000003.solution     |    4 +
 .../model_1_2_1_3-solution000004.solution     |    4 +
 .../model_1_2_1_3-solution000005.solution     |    4 +
 .../model_1_2_1_3-solution000006.solution     |    4 +
 .../model_1_2_2_1-solution000001.solution     |    4 +
 .../model_1_2_2_1-solution000002.solution     |    4 +
 .../model_1_2_2_1-solution000003.solution     |    4 +
 .../model_1_2_2_1-solution000004.solution     |    4 +
 .../model_1_2_2_1-solution000005.solution     |    4 +
 .../model_1_2_2_1-solution000006.solution     |    4 +
 .../model_1_2_2_2-solution000001.solution     |    4 +
 .../model_1_2_2_2-solution000002.solution     |    4 +
 .../model_1_2_2_2-solution000003.solution     |    4 +
 .../model_1_2_2_2-solution000004.solution     |    4 +
 .../model_1_2_2_2-solution000005.solution     |    4 +
 .../model_1_2_2_2-solution000006.solution     |    4 +
 .../model_1_2_2_3-solution000001.solution     |    4 +
 .../model_1_2_2_3-solution000002.solution     |    4 +
 .../model_1_2_2_3-solution000003.solution     |    4 +
 .../model_1_2_2_3-solution000004.solution     |    4 +
 .../model_1_2_2_3-solution000005.solution     |    4 +
 .../model_1_2_2_3-solution000006.solution     |    4 +
 .../model_1_2_3_1-solution000001.solution     |    4 +
 .../model_1_2_3_1-solution000002.solution     |    4 +
 .../model_1_2_3_1-solution000003.solution     |    4 +
 .../model_1_2_3_1-solution000004.solution     |    4 +
 .../model_1_2_3_1-solution000005.solution     |    4 +
 .../model_1_2_3_1-solution000006.solution     |    4 +
 .../model_1_2_3_2-solution000001.solution     |    4 +
 .../model_1_2_3_2-solution000002.solution     |    4 +
 .../model_1_2_3_2-solution000003.solution     |    4 +
 .../model_1_2_3_2-solution000004.solution     |    4 +
 .../model_1_2_3_2-solution000005.solution     |    4 +
 .../model_1_2_3_2-solution000006.solution     |    4 +
 .../model_1_2_3_3-solution000001.solution     |    4 +
 .../model_1_2_3_3-solution000002.solution     |    4 +
 .../model_1_2_3_3-solution000003.solution     |    4 +
 .../model_1_2_3_3-solution000004.solution     |    4 +
 .../model_1_2_3_3-solution000005.solution     |    4 +
 .../model_1_2_3_3-solution000006.solution     |    4 +
 .../model_1_3_1_1-solution000001.solution     |    4 +
 .../model_1_3_1_1-solution000002.solution     |    4 +
 .../model_1_3_1_1-solution000003.solution     |    4 +
 .../model_1_3_1_1-solution000004.solution     |    4 +
 .../model_1_3_1_1-solution000005.solution     |    4 +
 .../model_1_3_1_1-solution000006.solution     |    4 +
 .../model_1_3_1_2-solution000001.solution     |    4 +
 .../model_1_3_1_2-solution000002.solution     |    4 +
 .../model_1_3_1_2-solution000003.solution     |    4 +
 .../model_1_3_1_2-solution000004.solution     |    4 +
 .../model_1_3_1_2-solution000005.solution     |    4 +
 .../model_1_3_1_2-solution000006.solution     |    4 +
 .../model_1_3_1_3-solution000001.solution     |    4 +
 .../model_1_3_1_3-solution000002.solution     |    4 +
 .../model_1_3_1_3-solution000003.solution     |    4 +
 .../model_1_3_1_3-solution000004.solution     |    4 +
 .../model_1_3_1_3-solution000005.solution     |    4 +
 .../model_1_3_1_3-solution000006.solution     |    4 +
 .../model_1_3_2_1-solution000001.solution     |    4 +
 .../model_1_3_2_1-solution000002.solution     |    4 +
 .../model_1_3_2_1-solution000003.solution     |    4 +
 .../model_1_3_2_1-solution000004.solution     |    4 +
 .../model_1_3_2_1-solution000005.solution     |    4 +
 .../model_1_3_2_1-solution000006.solution     |    4 +
 .../model_1_3_2_2-solution000001.solution     |    4 +
 .../model_1_3_2_2-solution000002.solution     |    4 +
 .../model_1_3_2_2-solution000003.solution     |    4 +
 .../model_1_3_2_2-solution000004.solution     |    4 +
 .../model_1_3_2_2-solution000005.solution     |    4 +
 .../model_1_3_2_2-solution000006.solution     |    4 +
 .../model_1_3_2_3-solution000001.solution     |    4 +
 .../model_1_3_2_3-solution000002.solution     |    4 +
 .../model_1_3_2_3-solution000003.solution     |    4 +
 .../model_1_3_2_3-solution000004.solution     |    4 +
 .../model_1_3_2_3-solution000005.solution     |    4 +
 .../model_1_3_2_3-solution000006.solution     |    4 +
 .../model_1_3_3_1-solution000001.solution     |    4 +
 .../model_1_3_3_1-solution000002.solution     |    4 +
 .../model_1_3_3_1-solution000003.solution     |    4 +
 .../model_1_3_3_1-solution000004.solution     |    4 +
 .../model_1_3_3_1-solution000005.solution     |    4 +
 .../model_1_3_3_1-solution000006.solution     |    4 +
 .../model_1_3_3_2-solution000001.solution     |    4 +
 .../model_1_3_3_2-solution000002.solution     |    4 +
 .../model_1_3_3_2-solution000003.solution     |    4 +
 .../model_1_3_3_2-solution000004.solution     |    4 +
 .../model_1_3_3_2-solution000005.solution     |    4 +
 .../model_1_3_3_2-solution000006.solution     |    4 +
 .../model_1_3_3_3-solution000001.solution     |    4 +
 .../model_1_3_3_3-solution000002.solution     |    4 +
 .../model_1_3_3_3-solution000003.solution     |    4 +
 .../model_1_3_3_3-solution000004.solution     |    4 +
 .../model_1_3_3_3-solution000005.solution     |    4 +
 .../model_1_3_3_3-solution000006.solution     |    4 +
 .../model_2_1_1_1-solution000001.solution     |    4 +
 .../model_2_1_1_1-solution000002.solution     |    4 +
 .../model_2_1_1_1-solution000003.solution     |    4 +
 .../model_2_1_1_1-solution000004.solution     |    4 +
 .../model_2_1_1_1-solution000005.solution     |    4 +
 .../model_2_1_1_1-solution000006.solution     |    4 +
 .../model_2_1_1_2-solution000001.solution     |    4 +
 .../model_2_1_1_2-solution000002.solution     |    4 +
 .../model_2_1_1_2-solution000003.solution     |    4 +
 .../model_2_1_1_2-solution000004.solution     |    4 +
 .../model_2_1_1_2-solution000005.solution     |    4 +
 .../model_2_1_1_2-solution000006.solution     |    4 +
 .../model_2_1_1_3-solution000001.solution     |    4 +
 .../model_2_1_1_3-solution000002.solution     |    4 +
 .../model_2_1_1_3-solution000003.solution     |    4 +
 .../model_2_1_1_3-solution000004.solution     |    4 +
 .../model_2_1_1_3-solution000005.solution     |    4 +
 .../model_2_1_1_3-solution000006.solution     |    4 +
 .../model_2_1_2_1-solution000001.solution     |    4 +
 .../model_2_1_2_1-solution000002.solution     |    4 +
 .../model_2_1_2_1-solution000003.solution     |    4 +
 .../model_2_1_2_1-solution000004.solution     |    4 +
 .../model_2_1_2_1-solution000005.solution     |    4 +
 .../model_2_1_2_1-solution000006.solution     |    4 +
 .../model_2_1_2_2-solution000001.solution     |    4 +
 .../model_2_1_2_2-solution000002.solution     |    4 +
 .../model_2_1_2_2-solution000003.solution     |    4 +
 .../model_2_1_2_2-solution000004.solution     |    4 +
 .../model_2_1_2_2-solution000005.solution     |    4 +
 .../model_2_1_2_2-solution000006.solution     |    4 +
 .../model_2_1_2_3-solution000001.solution     |    4 +
 .../model_2_1_2_3-solution000002.solution     |    4 +
 .../model_2_1_2_3-solution000003.solution     |    4 +
 .../model_2_1_2_3-solution000004.solution     |    4 +
 .../model_2_1_2_3-solution000005.solution     |    4 +
 .../model_2_1_2_3-solution000006.solution     |    4 +
 .../model_2_1_3_1-solution000001.solution     |    4 +
 .../model_2_1_3_1-solution000002.solution     |    4 +
 .../model_2_1_3_1-solution000003.solution     |    4 +
 .../model_2_1_3_1-solution000004.solution     |    4 +
 .../model_2_1_3_1-solution000005.solution     |    4 +
 .../model_2_1_3_1-solution000006.solution     |    4 +
 .../model_2_1_3_2-solution000001.solution     |    4 +
 .../model_2_1_3_2-solution000002.solution     |    4 +
 .../model_2_1_3_2-solution000003.solution     |    4 +
 .../model_2_1_3_2-solution000004.solution     |    4 +
 .../model_2_1_3_2-solution000005.solution     |    4 +
 .../model_2_1_3_2-solution000006.solution     |    4 +
 .../model_2_1_3_3-solution000001.solution     |    4 +
 .../model_2_1_3_3-solution000002.solution     |    4 +
 .../model_2_1_3_3-solution000003.solution     |    4 +
 .../model_2_1_3_3-solution000004.solution     |    4 +
 .../model_2_1_3_3-solution000005.solution     |    4 +
 .../model_2_1_3_3-solution000006.solution     |    4 +
 .../model_2_2_1_1-solution000001.solution     |    4 +
 .../model_2_2_1_1-solution000002.solution     |    4 +
 .../model_2_2_1_1-solution000003.solution     |    4 +
 .../model_2_2_1_1-solution000004.solution     |    4 +
 .../model_2_2_1_1-solution000005.solution     |    4 +
 .../model_2_2_1_1-solution000006.solution     |    4 +
 .../model_2_2_1_2-solution000001.solution     |    4 +
 .../model_2_2_1_2-solution000002.solution     |    4 +
 .../model_2_2_1_2-solution000003.solution     |    4 +
 .../model_2_2_1_2-solution000004.solution     |    4 +
 .../model_2_2_1_2-solution000005.solution     |    4 +
 .../model_2_2_1_2-solution000006.solution     |    4 +
 .../model_2_2_1_3-solution000001.solution     |    4 +
 .../model_2_2_1_3-solution000002.solution     |    4 +
 .../model_2_2_1_3-solution000003.solution     |    4 +
 .../model_2_2_1_3-solution000004.solution     |    4 +
 .../model_2_2_1_3-solution000005.solution     |    4 +
 .../model_2_2_1_3-solution000006.solution     |    4 +
 .../model_2_2_2_1-solution000001.solution     |    4 +
 .../model_2_2_2_1-solution000002.solution     |    4 +
 .../model_2_2_2_1-solution000003.solution     |    4 +
 .../model_2_2_2_1-solution000004.solution     |    4 +
 .../model_2_2_2_1-solution000005.solution     |    4 +
 .../model_2_2_2_1-solution000006.solution     |    4 +
 .../model_2_2_2_2-solution000001.solution     |    4 +
 .../model_2_2_2_2-solution000002.solution     |    4 +
 .../model_2_2_2_2-solution000003.solution     |    4 +
 .../model_2_2_2_2-solution000004.solution     |    4 +
 .../model_2_2_2_2-solution000005.solution     |    4 +
 .../model_2_2_2_2-solution000006.solution     |    4 +
 .../expected/model_2_2_2_2.eprime             |   66 +
 .../model_2_2_2_3-solution000001.solution     |    4 +
 .../model_2_2_2_3-solution000002.solution     |    4 +
 .../model_2_2_2_3-solution000003.solution     |    4 +
 .../model_2_2_2_3-solution000004.solution     |    4 +
 .../model_2_2_2_3-solution000005.solution     |    4 +
 .../model_2_2_2_3-solution000006.solution     |    4 +
 .../expected/model_2_2_2_3.eprime             |   75 +
 .../model_2_2_3_1-solution000001.solution     |    4 +
 .../model_2_2_3_1-solution000002.solution     |    4 +
 .../model_2_2_3_1-solution000003.solution     |    4 +
 .../model_2_2_3_1-solution000004.solution     |    4 +
 .../model_2_2_3_1-solution000005.solution     |    4 +
 .../model_2_2_3_1-solution000006.solution     |    4 +
 .../model_2_2_3_2-solution000001.solution     |    4 +
 .../model_2_2_3_2-solution000002.solution     |    4 +
 .../model_2_2_3_2-solution000003.solution     |    4 +
 .../model_2_2_3_2-solution000004.solution     |    4 +
 .../model_2_2_3_2-solution000005.solution     |    4 +
 .../model_2_2_3_2-solution000006.solution     |    4 +
 .../expected/model_2_2_3_2.eprime             |   75 +
 .../model_2_2_3_3-solution000001.solution     |    4 +
 .../model_2_2_3_3-solution000002.solution     |    4 +
 .../model_2_2_3_3-solution000003.solution     |    4 +
 .../model_2_2_3_3-solution000004.solution     |    4 +
 .../model_2_2_3_3-solution000005.solution     |    4 +
 .../model_2_2_3_3-solution000006.solution     |    4 +
 .../expected/model_2_2_3_3.eprime             |   84 ++
 .../model_2_3_1_1-solution000001.solution     |    4 +
 .../model_2_3_1_1-solution000002.solution     |    4 +
 .../model_2_3_1_1-solution000003.solution     |    4 +
 .../model_2_3_1_1-solution000004.solution     |    4 +
 .../model_2_3_1_1-solution000005.solution     |    4 +
 .../model_2_3_1_1-solution000006.solution     |    4 +
 .../model_2_3_1_2-solution000001.solution     |    4 +
 .../model_2_3_1_2-solution000002.solution     |    4 +
 .../model_2_3_1_2-solution000003.solution     |    4 +
 .../model_2_3_1_2-solution000004.solution     |    4 +
 .../model_2_3_1_2-solution000005.solution     |    4 +
 .../model_2_3_1_2-solution000006.solution     |    4 +
 .../model_2_3_1_3-solution000001.solution     |    4 +
 .../model_2_3_1_3-solution000002.solution     |    4 +
 .../model_2_3_1_3-solution000003.solution     |    4 +
 .../model_2_3_1_3-solution000004.solution     |    4 +
 .../model_2_3_1_3-solution000005.solution     |    4 +
 .../model_2_3_1_3-solution000006.solution     |    4 +
 .../model_2_3_2_1-solution000001.solution     |    4 +
 .../model_2_3_2_1-solution000002.solution     |    4 +
 .../model_2_3_2_1-solution000003.solution     |    4 +
 .../model_2_3_2_1-solution000004.solution     |    4 +
 .../model_2_3_2_1-solution000005.solution     |    4 +
 .../model_2_3_2_1-solution000006.solution     |    4 +
 .../model_2_3_2_2-solution000001.solution     |    4 +
 .../model_2_3_2_2-solution000002.solution     |    4 +
 .../model_2_3_2_2-solution000003.solution     |    4 +
 .../model_2_3_2_2-solution000004.solution     |    4 +
 .../model_2_3_2_2-solution000005.solution     |    4 +
 .../model_2_3_2_2-solution000006.solution     |    4 +
 .../expected/model_2_3_2_2.eprime             |   53 +
 .../model_2_3_2_3-solution000001.solution     |    4 +
 .../model_2_3_2_3-solution000002.solution     |    4 +
 .../model_2_3_2_3-solution000003.solution     |    4 +
 .../model_2_3_2_3-solution000004.solution     |    4 +
 .../model_2_3_2_3-solution000005.solution     |    4 +
 .../model_2_3_2_3-solution000006.solution     |    4 +
 .../expected/model_2_3_2_3.eprime             |   41 +
 .../model_2_3_3_1-solution000001.solution     |    4 +
 .../model_2_3_3_1-solution000002.solution     |    4 +
 .../model_2_3_3_1-solution000003.solution     |    4 +
 .../model_2_3_3_1-solution000004.solution     |    4 +
 .../model_2_3_3_1-solution000005.solution     |    4 +
 .../model_2_3_3_1-solution000006.solution     |    4 +
 .../model_2_3_3_2-solution000001.solution     |    4 +
 .../model_2_3_3_2-solution000002.solution     |    4 +
 .../model_2_3_3_2-solution000003.solution     |    4 +
 .../model_2_3_3_2-solution000004.solution     |    4 +
 .../model_2_3_3_2-solution000005.solution     |    4 +
 .../model_2_3_3_2-solution000006.solution     |    4 +
 .../expected/model_2_3_3_2.eprime             |   62 +
 .../model_2_3_3_3-solution000001.solution     |    4 +
 .../model_2_3_3_3-solution000002.solution     |    4 +
 .../model_2_3_3_3-solution000003.solution     |    4 +
 .../model_2_3_3_3-solution000004.solution     |    4 +
 .../model_2_3_3_3-solution000005.solution     |    4 +
 .../model_2_3_3_3-solution000006.solution     |    4 +
 .../expected/model_2_3_3_3.eprime             |   50 +
 .../model_3_1_1_1-solution000001.solution     |    4 +
 .../model_3_1_1_1-solution000002.solution     |    4 +
 .../model_3_1_1_1-solution000003.solution     |    4 +
 .../model_3_1_1_1-solution000004.solution     |    4 +
 .../model_3_1_1_1-solution000005.solution     |    4 +
 .../model_3_1_1_1-solution000006.solution     |    4 +
 .../model_3_1_1_2-solution000001.solution     |    4 +
 .../model_3_1_1_2-solution000002.solution     |    4 +
 .../model_3_1_1_2-solution000003.solution     |    4 +
 .../model_3_1_1_2-solution000004.solution     |    4 +
 .../model_3_1_1_2-solution000005.solution     |    4 +
 .../model_3_1_1_2-solution000006.solution     |    4 +
 .../model_3_1_1_3-solution000001.solution     |    4 +
 .../model_3_1_1_3-solution000002.solution     |    4 +
 .../model_3_1_1_3-solution000003.solution     |    4 +
 .../model_3_1_1_3-solution000004.solution     |    4 +
 .../model_3_1_1_3-solution000005.solution     |    4 +
 .../model_3_1_1_3-solution000006.solution     |    4 +
 .../model_3_1_2_1-solution000001.solution     |    4 +
 .../model_3_1_2_1-solution000002.solution     |    4 +
 .../model_3_1_2_1-solution000003.solution     |    4 +
 .../model_3_1_2_1-solution000004.solution     |    4 +
 .../model_3_1_2_1-solution000005.solution     |    4 +
 .../model_3_1_2_1-solution000006.solution     |    4 +
 .../model_3_1_2_2-solution000001.solution     |    4 +
 .../model_3_1_2_2-solution000002.solution     |    4 +
 .../model_3_1_2_2-solution000003.solution     |    4 +
 .../model_3_1_2_2-solution000004.solution     |    4 +
 .../model_3_1_2_2-solution000005.solution     |    4 +
 .../model_3_1_2_2-solution000006.solution     |    4 +
 .../model_3_1_2_3-solution000001.solution     |    4 +
 .../model_3_1_2_3-solution000002.solution     |    4 +
 .../model_3_1_2_3-solution000003.solution     |    4 +
 .../model_3_1_2_3-solution000004.solution     |    4 +
 .../model_3_1_2_3-solution000005.solution     |    4 +
 .../model_3_1_2_3-solution000006.solution     |    4 +
 .../model_3_1_3_1-solution000001.solution     |    4 +
 .../model_3_1_3_1-solution000002.solution     |    4 +
 .../model_3_1_3_1-solution000003.solution     |    4 +
 .../model_3_1_3_1-solution000004.solution     |    4 +
 .../model_3_1_3_1-solution000005.solution     |    4 +
 .../model_3_1_3_1-solution000006.solution     |    4 +
 .../model_3_1_3_2-solution000001.solution     |    4 +
 .../model_3_1_3_2-solution000002.solution     |    4 +
 .../model_3_1_3_2-solution000003.solution     |    4 +
 .../model_3_1_3_2-solution000004.solution     |    4 +
 .../model_3_1_3_2-solution000005.solution     |    4 +
 .../model_3_1_3_2-solution000006.solution     |    4 +
 .../model_3_1_3_3-solution000001.solution     |    4 +
 .../model_3_1_3_3-solution000002.solution     |    4 +
 .../model_3_1_3_3-solution000003.solution     |    4 +
 .../model_3_1_3_3-solution000004.solution     |    4 +
 .../model_3_1_3_3-solution000005.solution     |    4 +
 .../model_3_1_3_3-solution000006.solution     |    4 +
 .../model_3_2_1_1-solution000001.solution     |    4 +
 .../model_3_2_1_1-solution000002.solution     |    4 +
 .../model_3_2_1_1-solution000003.solution     |    4 +
 .../model_3_2_1_1-solution000004.solution     |    4 +
 .../model_3_2_1_1-solution000005.solution     |    4 +
 .../model_3_2_1_1-solution000006.solution     |    4 +
 .../model_3_2_1_2-solution000001.solution     |    4 +
 .../model_3_2_1_2-solution000002.solution     |    4 +
 .../model_3_2_1_2-solution000003.solution     |    4 +
 .../model_3_2_1_2-solution000004.solution     |    4 +
 .../model_3_2_1_2-solution000005.solution     |    4 +
 .../model_3_2_1_2-solution000006.solution     |    4 +
 .../model_3_2_1_3-solution000001.solution     |    4 +
 .../model_3_2_1_3-solution000002.solution     |    4 +
 .../model_3_2_1_3-solution000003.solution     |    4 +
 .../model_3_2_1_3-solution000004.solution     |    4 +
 .../model_3_2_1_3-solution000005.solution     |    4 +
 .../model_3_2_1_3-solution000006.solution     |    4 +
 .../model_3_2_2_1-solution000001.solution     |    4 +
 .../model_3_2_2_1-solution000002.solution     |    4 +
 .../model_3_2_2_1-solution000003.solution     |    4 +
 .../model_3_2_2_1-solution000004.solution     |    4 +
 .../model_3_2_2_1-solution000005.solution     |    4 +
 .../model_3_2_2_1-solution000006.solution     |    4 +
 .../model_3_2_2_2-solution000001.solution     |    4 +
 .../model_3_2_2_2-solution000002.solution     |    4 +
 .../model_3_2_2_2-solution000003.solution     |    4 +
 .../model_3_2_2_2-solution000004.solution     |    4 +
 .../model_3_2_2_2-solution000005.solution     |    4 +
 .../model_3_2_2_2-solution000006.solution     |    4 +
 .../expected/model_3_2_2_2.eprime             |   56 +
 .../model_3_2_2_3-solution000001.solution     |    4 +
 .../model_3_2_2_3-solution000002.solution     |    4 +
 .../model_3_2_2_3-solution000003.solution     |    4 +
 .../model_3_2_2_3-solution000004.solution     |    4 +
 .../model_3_2_2_3-solution000005.solution     |    4 +
 .../model_3_2_2_3-solution000006.solution     |    4 +
 .../expected/model_3_2_2_3.eprime             |   65 +
 .../model_3_2_3_1-solution000001.solution     |    4 +
 .../model_3_2_3_1-solution000002.solution     |    4 +
 .../model_3_2_3_1-solution000003.solution     |    4 +
 .../model_3_2_3_1-solution000004.solution     |    4 +
 .../model_3_2_3_1-solution000005.solution     |    4 +
 .../model_3_2_3_1-solution000006.solution     |    4 +
 .../model_3_2_3_2-solution000001.solution     |    4 +
 .../model_3_2_3_2-solution000002.solution     |    4 +
 .../model_3_2_3_2-solution000003.solution     |    4 +
 .../model_3_2_3_2-solution000004.solution     |    4 +
 .../model_3_2_3_2-solution000005.solution     |    4 +
 .../model_3_2_3_2-solution000006.solution     |    4 +
 .../expected/model_3_2_3_2.eprime             |   44 +
 .../model_3_2_3_3-solution000001.solution     |    4 +
 .../model_3_2_3_3-solution000002.solution     |    4 +
 .../model_3_2_3_3-solution000003.solution     |    4 +
 .../model_3_2_3_3-solution000004.solution     |    4 +
 .../model_3_2_3_3-solution000005.solution     |    4 +
 .../model_3_2_3_3-solution000006.solution     |    4 +
 .../expected/model_3_2_3_3.eprime             |   53 +
 .../model_3_3_1_1-solution000001.solution     |    4 +
 .../model_3_3_1_1-solution000002.solution     |    4 +
 .../model_3_3_1_1-solution000003.solution     |    4 +
 .../model_3_3_1_1-solution000004.solution     |    4 +
 .../model_3_3_1_1-solution000005.solution     |    4 +
 .../model_3_3_1_1-solution000006.solution     |    4 +
 .../model_3_3_1_2-solution000001.solution     |    4 +
 .../model_3_3_1_2-solution000002.solution     |    4 +
 .../model_3_3_1_2-solution000003.solution     |    4 +
 .../model_3_3_1_2-solution000004.solution     |    4 +
 .../model_3_3_1_2-solution000005.solution     |    4 +
 .../model_3_3_1_2-solution000006.solution     |    4 +
 .../model_3_3_1_3-solution000001.solution     |    4 +
 .../model_3_3_1_3-solution000002.solution     |    4 +
 .../model_3_3_1_3-solution000003.solution     |    4 +
 .../model_3_3_1_3-solution000004.solution     |    4 +
 .../model_3_3_1_3-solution000005.solution     |    4 +
 .../model_3_3_1_3-solution000006.solution     |    4 +
 .../model_3_3_2_1-solution000001.solution     |    4 +
 .../model_3_3_2_1-solution000002.solution     |    4 +
 .../model_3_3_2_1-solution000003.solution     |    4 +
 .../model_3_3_2_1-solution000004.solution     |    4 +
 .../model_3_3_2_1-solution000005.solution     |    4 +
 .../model_3_3_2_1-solution000006.solution     |    4 +
 .../model_3_3_2_2-solution000001.solution     |    4 +
 .../model_3_3_2_2-solution000002.solution     |    4 +
 .../model_3_3_2_2-solution000003.solution     |    4 +
 .../model_3_3_2_2-solution000004.solution     |    4 +
 .../model_3_3_2_2-solution000005.solution     |    4 +
 .../model_3_3_2_2-solution000006.solution     |    4 +
 .../expected/model_3_3_2_2.eprime             |   47 +
 .../model_3_3_2_3-solution000001.solution     |    4 +
 .../model_3_3_2_3-solution000002.solution     |    4 +
 .../model_3_3_2_3-solution000003.solution     |    4 +
 .../model_3_3_2_3-solution000004.solution     |    4 +
 .../model_3_3_2_3-solution000005.solution     |    4 +
 .../model_3_3_2_3-solution000006.solution     |    4 +
 .../expected/model_3_3_2_3.eprime             |   34 +
 .../model_3_3_3_1-solution000001.solution     |    4 +
 .../model_3_3_3_1-solution000002.solution     |    4 +
 .../model_3_3_3_1-solution000003.solution     |    4 +
 .../model_3_3_3_1-solution000004.solution     |    4 +
 .../model_3_3_3_1-solution000005.solution     |    4 +
 .../model_3_3_3_1-solution000006.solution     |    4 +
 .../model_3_3_3_2-solution000001.solution     |    4 +
 .../model_3_3_3_2-solution000002.solution     |    4 +
 .../model_3_3_3_2-solution000003.solution     |    4 +
 .../model_3_3_3_2-solution000004.solution     |    4 +
 .../model_3_3_3_2-solution000005.solution     |    4 +
 .../model_3_3_3_2-solution000006.solution     |    4 +
 .../expected/model_3_3_3_2.eprime             |   34 +
 .../model_3_3_3_3-solution000001.solution     |    4 +
 .../model_3_3_3_3-solution000002.solution     |    4 +
 .../model_3_3_3_3-solution000003.solution     |    4 +
 .../model_3_3_3_3-solution000004.solution     |    4 +
 .../model_3_3_3_3-solution000005.solution     |    4 +
 .../model_3_3_3_3-solution000006.solution     |    4 +
 .../expected/model_3_3_3_3.eprime             |   24 +
 .../model_1_1-solution000001.solution         |   11 +
 .../expected/model_1_1.eprime                 |  324 +++++
 .../model_1_2-solution000001.solution         |   11 +
 .../expected/model_1_2.eprime                 |  787 +++++++++++
 .../model_1_3-solution000001.solution         |   11 +
 .../expected/model_1_3.eprime.orig            |  856 ------------
 .../model_1_4-solution000001.solution         |   11 +
 .../expected/model_1_4.eprime                 |  382 +++++
 .../model_2_1-solution000001.solution         |   11 +
 .../expected/model_2_1.eprime                 |  761 ++++++++++
 .../model_2_2-solution000001.solution         |   11 +
 .../expected/model_2_2.eprime                 |  949 +++++++++++++
 .../model_2_3-solution000001.solution         |   11 +
 .../expected/model_2_3.eprime.orig            | 1208 ----------------
 .../model_2_4-solution000001.solution         |   11 +
 .../expected/model_2_4.eprime                 |  809 +++++++++++
 .../model_3_1-solution000001.solution         |   11 +
 .../expected/model_3_1.eprime.orig            |  852 ------------
 .../model_3_2-solution000001.solution         |   11 +
 .../expected/model_3_2.eprime.orig            | 1228 -----------------
 .../model_3_3-solution000001.solution         |   11 +
 .../expected/model_3_3.eprime.orig            | 1127 ---------------
 .../model_3_4-solution000001.solution         |   11 +
 .../expected/model_3_4.eprime.orig            |  906 ------------
 .../model_4_1-solution000001.solution         |   11 +
 .../expected/model_4_1.eprime                 |  373 +++++
 .../model_4_2-solution000001.solution         |   11 +
 .../expected/model_4_2.eprime                 |  827 +++++++++++
 .../model_4_3-solution000001.solution         |   11 +
 .../expected/model_4_3.eprime.orig            |  901 ------------
 .../model_4_4-solution000001.solution         |   11 +
 .../expected/model_4_4.eprime                 |  394 ++++++
 .../expected/model-solution000001.solution    |    7 +
 .../expected/model-solution000002.solution    |    7 +
 .../expected/model-solution000003.solution    |    8 +
 .../expected/model-solution000004.solution    |    7 +
 .../expected/model-solution000005.solution    |    8 +
 .../expected/model-solution000006.solution    |    8 +
 .../expected/model-solution000007.solution    |    9 +
 .../expected/model-solution000008.solution    |    7 +
 .../expected/model-solution000009.solution    |    8 +
 .../expected/model-solution000010.solution    |    8 +
 .../expected/model-solution000011.solution    |    9 +
 .../expected/model-solution000012.solution    |    8 +
 .../expected/model-solution000013.solution    |    9 +
 .../expected/model-solution000014.solution    |    9 +
 .../expected/model-solution000015.solution    |   10 +
 .../expected/model-solution000016.solution    |   10 +
 .../expected/model-solution000017.solution    |   11 +
 .../expected/model-solution000018.solution    |   10 +
 .../expected/model-solution000019.solution    |   11 +
 .../expected/model-solution000020.solution    |   11 +
 .../expected/model-solution000021.solution    |   12 +
 .../expected/model-solution000022.solution    |   10 +
 .../expected/model-solution000023.solution    |   11 +
 .../expected/model-solution000024.solution    |   11 +
 .../expected/model-solution000025.solution    |   12 +
 .../expected/model-solution000026.solution    |   11 +
 .../expected/model-solution000027.solution    |   12 +
 .../expected/model-solution000028.solution    |   12 +
 .../expected/model-solution000029.solution    |   13 +
 .../expected/model-solution000030.solution    |   11 +
 .../expected/model-solution000031.solution    |   10 +
 .../expected/model-solution000032.solution    |   11 +
 .../expected/model-solution000033.solution    |   11 +
 .../expected/model-solution000034.solution    |   12 +
 .../expected/model-solution000035.solution    |   10 +
 .../expected/model-solution000036.solution    |   11 +
 .../expected/model-solution000037.solution    |   11 +
 .../expected/model-solution000038.solution    |   12 +
 .../expected/model-solution000039.solution    |   11 +
 .../expected/model-solution000040.solution    |   12 +
 .../expected/model-solution000041.solution    |   12 +
 .../expected/model-solution000042.solution    |   13 +
 .../expected/model-solution000043.solution    |   11 +
 .../expected/model-solution000044.solution    |   12 +
 .../expected/model-solution000045.solution    |   12 +
 .../expected/model-solution000046.solution    |   13 +
 .../expected/model-solution000047.solution    |   11 +
 .../expected/model-solution000048.solution    |   12 +
 .../expected/model-solution000049.solution    |   12 +
 .../expected/model-solution000050.solution    |   13 +
 .../expected/model-solution000051.solution    |   12 +
 .../expected/model-solution000052.solution    |   13 +
 .../expected/model-solution000053.solution    |   13 +
 .../expected/model-solution000054.solution    |   14 +
 .../expected/model-solution000055.solution    |   11 +
 .../expected/model-solution000056.solution    |   11 +
 .../expected/model-solution000057.solution    |   12 +
 .../expected/model-solution000058.solution    |   10 +
 .../expected/model-solution000059.solution    |   11 +
 .../expected/model-solution000060.solution    |   11 +
 .../expected/model-solution000061.solution    |   12 +
 .../expected/model-solution000062.solution    |   11 +
 .../expected/model-solution000063.solution    |   12 +
 .../expected/model-solution000064.solution    |   12 +
 .../expected/model-solution000065.solution    |   13 +
 .../expected/model-solution000066.solution    |   12 +
 .../expected/model-solution000067.solution    |   13 +
 .../expected/model-solution000068.solution    |   11 +
 .../expected/model-solution000069.solution    |   12 +
 .../expected/model-solution000070.solution    |   12 +
 .../expected/model-solution000071.solution    |   13 +
 .../expected/model-solution000072.solution    |   12 +
 .../expected/model-solution000073.solution    |   13 +
 .../expected/model-solution000074.solution    |   13 +
 .../expected/model-solution000075.solution    |   14 +
 .../expected/model-solution000076.solution    |   13 +
 .../expected/model-solution000077.solution    |   11 +
 .../expected/model-solution000078.solution    |   12 +
 .../expected/model-solution000079.solution    |   12 +
 .../expected/model-solution000080.solution    |   13 +
 .../expected/model-solution000081.solution    |   12 +
 .../expected/model-solution000082.solution    |   13 +
 .../expected/model-solution000083.solution    |   13 +
 .../expected/model-solution000084.solution    |   14 +
 .../expected/model-solution000085.solution    |   12 +
 .../expected/model-solution000086.solution    |   13 +
 .../expected/model-solution000087.solution    |   13 +
 .../expected/model-solution000088.solution    |   14 +
 .../expected/model-solution000089.solution    |   13 +
 .../expected/model-solution000090.solution    |   14 +
 .../expected/model-solution000091.solution    |   14 +
 .../expected/model-solution000092.solution    |   15 +
 .../expected/model-solution000093.solution    |   11 +
 .../expected/model-solution000094.solution    |   11 +
 .../expected/model-solution000095.solution    |   12 +
 .../expected/model-solution000096.solution    |   11 +
 .../expected/model-solution000097.solution    |   12 +
 .../expected/model-solution000098.solution    |   12 +
 .../expected/model-solution000099.solution    |   13 +
 .../expected/model-solution000100.solution    |   12 +
 .../expected/model-solution000101.solution    |   13 +
 .../expected/model-solution000102.solution    |   12 +
 .../expected/model-solution000103.solution    |   13 +
 .../expected/model-solution000104.solution    |   13 +
 .../expected/model-solution000105.solution    |   14 +
 .../expected/model-solution000106.solution    |   13 +
 .../expected/model-solution000107.solution    |   12 +
 .../expected/model-solution000108.solution    |   13 +
 .../expected/model-solution000109.solution    |   13 +
 .../expected/model-solution000110.solution    |   14 +
 .../expected/model-solution000111.solution    |   13 +
 .../expected/model-solution000112.solution    |   14 +
 .../expected/model-solution000113.solution    |   14 +
 .../expected/model-solution000114.solution    |   15 +
 .../expected/model-solution000115.solution    |   13 +
 .../expected/model-solution000116.solution    |   13 +
 .../expected/model-solution000117.solution    |   14 +
 .../expected/model-solution000118.solution    |   14 +
 .../expected/model-solution000119.solution    |   15 +
 .../expected/model-solution000120.solution    |   15 +
 .../expected/model.eprime                     |   62 +
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    9 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    7 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |   14 +-
 .../stdout.expected                           |   14 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    5 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   11 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    3 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    7 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |   12 +-
 .../stdout.expected                           |   12 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |   14 +-
 .../stdout.expected                           |   14 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    7 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    9 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    6 +-
 .../stdout.expected                           |    6 +-
 .../model.expected.json                       |    4 +-
 .../stdout.expected                           |    4 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    8 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |    2 +-
 .../stdout.expected                           |    2 +-
 .../model.expected.json                       |   10 +-
 .../stdout.expected                           |   10 +-
 .../model.expected.json                       |    8 +-
 .../stdout.expected                           |    9 +-
 .../605~1436581770_45/model.expected.json     |    2 +-
 .../autogen/605~1436581770_45/stdout.expected |    2 +-
 1571 files changed, 15079 insertions(+), 11709 deletions(-)
 create mode 100644 tests/exhaustive/issues/102/expected/model-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/102/expected/model.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_1_1-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_1_1.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_1_2-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_1_2.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_1_3-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_1_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_1_4-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_1_4.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_2_1-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_2_1.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_2_2-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_2_2.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_2_3-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_2_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_2_4-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_2_4.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_3_1-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_3_1.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_3_2-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_3_2.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_3_3-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_3_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_3_4-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_3_4.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_4_1-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_4_1.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_4_2-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_4_2.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_4_3-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_4_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/166/expected/model_4_4-solution000001.solution
 delete mode 100644 tests/exhaustive/issues/166/expected/model_4_4.eprime.orig
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_1-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_1-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_1.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_2-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_2-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_2.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_3-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_3-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_3.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_4-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_4-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_1_4.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_1-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_1-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_1.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_2-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_2-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_2.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_3-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_3-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_3.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_4-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_4-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_2_4.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_1-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_1-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_1.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_2-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_2-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_2.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_3-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_3-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_3.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_4-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_4-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_3_4.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_1-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_1-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_1.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_2-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_2-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_2.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_3-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_3-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_3.eprime
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_4-1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_4-1.eprime-param
 create mode 100644 tests/exhaustive/issues/212/expected/model_4_4.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_1.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_2.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_3-p1.eprime-param
 delete mode 100644 tests/exhaustive/issues/286/expected/model_1_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_1_4.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_1.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_2.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_3-p1.eprime-param
 delete mode 100644 tests/exhaustive/issues/286/expected/model_2_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_2_4.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_1-p1.eprime-param
 delete mode 100644 tests/exhaustive/issues/286/expected/model_3_1.eprime.orig
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_2-p1.eprime-param
 delete mode 100644 tests/exhaustive/issues/286/expected/model_3_2.eprime.orig
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_3-p1.eprime-param
 delete mode 100644 tests/exhaustive/issues/286/expected/model_3_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_3_4-p1.eprime-param
 delete mode 100644 tests/exhaustive/issues/286/expected/model_3_4.eprime.orig
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_1.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_2.eprime
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_3-p1.eprime-param
 delete mode 100644 tests/exhaustive/issues/286/expected/model_4_3.eprime.orig
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000001.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000002.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000003.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000004.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000005.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000006.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000007.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1-solution000008.solution
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4-p1.eprime-param
 create mode 100644 tests/exhaustive/issues/286/expected/model_4_4.eprime
 create mode 100644 tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/gchq_2016/expected/model.eprime
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000002.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1.eprime
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000002.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2.eprime
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000002.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1.eprime
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000002.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1.eprime
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000002.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1.eprime
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000001.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000002.solution
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2.eprime-param
 create mode 100644 tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000007.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000008.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000009.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000010.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000011.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000012.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000013.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000014.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000015.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000016.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000017.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000018.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000019.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000020.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000021.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000022.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000023.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000024.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000025.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000026.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000027.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000028.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000029.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000030.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000031.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000032.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000033.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000034.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000035.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000036.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3-solution000001.solution
 delete mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3.eprime.orig
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3-solution000001.solution
 delete mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3.eprime.orig
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1-solution000001.solution
 delete mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1.eprime.orig
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2-solution000001.solution
 delete mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2.eprime.orig
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3-solution000001.solution
 delete mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3.eprime.orig
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4-solution000001.solution
 delete mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4.eprime.orig
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3-solution000001.solution
 delete mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3.eprime.orig
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4.eprime
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000001.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000002.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000003.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000004.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000005.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000006.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000007.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000008.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000009.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000010.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000011.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000012.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000013.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000014.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000015.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000016.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000017.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000018.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000019.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000020.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000021.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000022.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000023.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000024.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000025.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000026.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000027.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000028.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000029.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000030.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000031.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000032.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000033.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000034.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000035.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000036.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000037.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000038.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000039.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000040.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000041.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000042.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000043.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000044.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000045.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000046.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000047.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000048.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000049.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000050.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000051.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000052.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000053.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000054.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000055.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000056.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000057.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000058.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000059.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000060.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000061.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000062.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000063.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000064.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000065.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000066.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000067.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000068.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000069.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000070.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000071.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000072.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000073.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000074.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000075.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000076.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000077.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000078.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000079.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000080.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000081.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000082.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000083.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000084.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000085.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000086.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000087.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000088.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000089.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000090.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000091.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000092.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000093.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000094.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000095.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000096.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000097.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000098.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000099.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000100.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000101.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000102.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000103.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000104.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000105.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000106.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000107.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000108.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000109.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000110.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000111.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000112.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000113.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000114.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000115.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000116.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000117.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000118.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000119.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000120.solution
 create mode 100644 tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model.eprime

diff --git a/tests/exhaustive/issues/102/expected/model-solution000001.solution b/tests/exhaustive/issues/102/expected/model-solution000001.solution
new file mode 100644
index 0000000000..f632708ff2
--- /dev/null
+++ b/tests/exhaustive/issues/102/expected/model-solution000001.solution
@@ -0,0 +1,28 @@
+language Essence 1.3
+
+letting actions be sequence((8, 5, 5), (5, 3, 3), (3, 8, 3), (5, 3, 2), (8, 5, 5), (5, 3, 1), (3, 8, 3))
+$ Visualisation for actions
+$ 8 5 5
+$ 5 3 3
+$ 3 8 3
+$ 5 3 2
+$ 8 5 5
+$ 5 3 1
+$ 3 8 3
+
+letting nbActions be 7
+letting states be
+        sequence(function(3 --> 0, 5 --> 0, 8 --> 8), function(3 --> 0, 5 --> 5, 8 --> 3),
+                 function(3 --> 3, 5 --> 2, 8 --> 3), function(3 --> 0, 5 --> 2, 8 --> 6),
+                 function(3 --> 2, 5 --> 0, 8 --> 6), function(3 --> 2, 5 --> 5, 8 --> 1),
+                 function(3 --> 3, 5 --> 4, 8 --> 1), function(3 --> 0, 5 --> 4, 8 --> 4))
+$ Visualisation for states
+$ 0 0 8
+$ 0 5 3
+$ 3 2 3
+$ 0 2 6
+$ 2 0 6
+$ 2 5 1
+$ 3 4 1
+$ 0 4 4
+
diff --git a/tests/exhaustive/issues/102/expected/model.eprime.orig b/tests/exhaustive/issues/102/expected/model.eprime.orig
deleted file mode 100644
index 2fdb0966d5..0000000000
--- a/tests/exhaustive/issues/102/expected/model.eprime.orig
+++ /dev/null
@@ -1,88 +0,0 @@
-language ESSENCE' 1.0
-
-letting HORIZON be 10
-find actions_ExplicitBounded_Length: int(0..10)
-find actions_ExplicitBounded_Values_1: matrix indexed by [int(1..10)] of int(3, 5, 8)
-find actions_ExplicitBounded_Values_2: matrix indexed by [int(1..10)] of int(3, 5, 8)
-find actions_ExplicitBounded_Values_3: matrix indexed by [int(1..10)] of int(1..8)
-letting let1 be 8
-find states_ExplicitBoundedR10_Length: int(0..10)
-find states_ExplicitBoundedR10_Values_Function1D: matrix indexed by [int(1..10), int(3, 5, 8)] of int(0..8)
-find nbActions: int(7)
-branching on
-    [actions_ExplicitBounded_Length, actions_ExplicitBounded_Values_1, actions_ExplicitBounded_Values_2,
-     actions_ExplicitBounded_Values_3, states_ExplicitBoundedR10_Length, states_ExplicitBoundedR10_Values_Function1D,
-     nbActions]
-such that
-    actions_ExplicitBounded_Length = states_ExplicitBoundedR10_Length - 1,
-    and([q34 <= actions_ExplicitBounded_Length ->
-         actions_ExplicitBounded_Values_1[q34] != actions_ExplicitBounded_Values_2[q34]
-             | q34 : int(1..10)]),
-    and([q11 <= actions_ExplicitBounded_Length ->
-         actions_ExplicitBounded_Values_3[q11] <=
-         states_ExplicitBoundedR10_Values_Function1D[q11, actions_ExplicitBounded_Values_1[q11]]
-         /\ q11 <= states_ExplicitBoundedR10_Length
-             | q11 : int(1..10)]),
-    and([q36 <= states_ExplicitBoundedR10_Length ->
-         and([sum([states_ExplicitBoundedR10_Values_Function1D[q36, q37] | q37 : int(3, 5, 8), q37 = b]) <= b /\
-              or([q38 = b | q38 : int(3, 5, 8)])
-                  | b : int(3, 5, 8)])
-             | q36 : int(1..10)]),
-    and([q13 <= actions_ExplicitBounded_Length ->
-         and([states_ExplicitBoundedR10_Values_Function1D[q13, actions_ExplicitBounded_Values_1[q13]] -
-              actions_ExplicitBounded_Values_3[q13]
-              = states_ExplicitBoundedR10_Values_Function1D[q13 + 1, actions_ExplicitBounded_Values_1[q13]],
-              q13 <= states_ExplicitBoundedR10_Length, q13 + 1 <= states_ExplicitBoundedR10_Length;
-                  int(1..3)])
-             | q13 : int(1..10)]),
-    and([q15 <= actions_ExplicitBounded_Length ->
-         and([states_ExplicitBoundedR10_Values_Function1D[q15, actions_ExplicitBounded_Values_2[q15]] +
-              actions_ExplicitBounded_Values_3[q15]
-              = states_ExplicitBoundedR10_Values_Function1D[q15 + 1, actions_ExplicitBounded_Values_2[q15]],
-              q15 <= states_ExplicitBoundedR10_Length, q15 + 1 <= states_ExplicitBoundedR10_Length;
-                  int(1..3)])
-             | q15 : int(1..10)]),
-    and([q18 <= actions_ExplicitBounded_Length ->
-         and([!(actions_ExplicitBounded_Values_1[q18] = b \/ actions_ExplicitBounded_Values_2[q18] = b) ->
-              and([states_ExplicitBoundedR10_Values_Function1D[q18, b] =
-                   states_ExplicitBoundedR10_Values_Function1D[q18 + 1, b],
-                   q18 <= states_ExplicitBoundedR10_Length, q18 + 1 <= states_ExplicitBoundedR10_Length;
-                       int(1..3)])
-                  | b : int(3, 5, 8)])
-             | q18 : int(1..10)]),
-    and([q20 <= actions_ExplicitBounded_Length ->
-         states_ExplicitBoundedR10_Values_Function1D[q20 + 1, actions_ExplicitBounded_Values_1[q20]] = 0 /\
-         q20 + 1 <= states_ExplicitBoundedR10_Length
-         \/
-         states_ExplicitBoundedR10_Values_Function1D[q20 + 1, actions_ExplicitBounded_Values_2[q20]] =
-         actions_ExplicitBounded_Values_2[q20]
-         /\ q20 + 1 <= states_ExplicitBoundedR10_Length
-             | q20 : int(1..10)]),
-    and([sum([sum([0 | 3 = q22]), sum([0 | 5 = q22]), sum([8 | 8 = q22]); int(1..3)]) =
-         states_ExplicitBoundedR10_Values_Function1D[1, q22]
-         /\ or([3 = q22, 5 = q22, 8 = q22; int(1..3)])
-             | q22 : int(3, 5, 8)]),
-    states_ExplicitBoundedR10_Values_Function1D[1, 3] = 0,
-    states_ExplicitBoundedR10_Values_Function1D[1, 5] = 0,
-    states_ExplicitBoundedR10_Values_Function1D[1, 8] = 8,
-    1 <= states_ExplicitBoundedR10_Length,
-    and([sum([sum([0 | 3 = q28]), sum([4 | 5 = q28]), sum([4 | 8 = q28]); int(1..3)]) =
-         states_ExplicitBoundedR10_Values_Function1D[states_ExplicitBoundedR10_Length, q28]
-         /\ or([3 = q28, 5 = q28, 8 = q28; int(1..3)])
-             | q28 : int(3, 5, 8)]),
-    states_ExplicitBoundedR10_Values_Function1D[states_ExplicitBoundedR10_Length, 3] = 0,
-    states_ExplicitBoundedR10_Values_Function1D[states_ExplicitBoundedR10_Length, 5] = 4,
-    states_ExplicitBoundedR10_Values_Function1D[states_ExplicitBoundedR10_Length, 8] = 4,
-    states_ExplicitBoundedR10_Length <= states_ExplicitBoundedR10_Length,
-    7 = actions_ExplicitBounded_Length,
-    and([q1 > states_ExplicitBoundedR10_Length ->
-         and([states_ExplicitBoundedR10_Values_Function1D[q1, q4] = 0 | q4 : int(3, 5, 8)])
-             | q1 : int(1..10)]),
-    states_ExplicitBoundedR10_Length <= 10,
-    and([q5 > actions_ExplicitBounded_Length ->
-         and([actions_ExplicitBounded_Values_1[q5] = 3, actions_ExplicitBounded_Values_2[q5] = 3,
-              actions_ExplicitBounded_Values_3[q5] = 1;
-                  int(1..3)])
-             | q5 : int(1..10)]),
-    actions_ExplicitBounded_Length <= 10
-
diff --git a/tests/exhaustive/issues/166/expected/model_1_1-solution000001.solution b/tests/exhaustive/issues/166/expected/model_1_1-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_1_1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_1_1.eprime.orig b/tests/exhaustive/issues/166/expected/model_1_1.eprime.orig
deleted file mode 100644
index 7199fd0ce5..0000000000
--- a/tests/exhaustive/issues/166/expected/model_1_1.eprime.orig
+++ /dev/null
@@ -1,46 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR2_Occurrence: matrix indexed by [int(1, 2), int(1..3), int(1, 2)] of bool
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-branching on [y_1_1, y_1_2_Function1DR2_Occurrence, y_1_3]
-such that
-    and([and([y_1_1[q4] = [10, 11; int(1..2)][q4],
-              and([and([y_1_2_Function1DR2_Occurrence[q4, q7, 1] | 1 = q4, 1 = q7]) /\
-                   and([y_1_2_Function1DR2_Occurrence[q4, q7, 2] | 1 = q4, 1 = q7])
-                   /\ and([y_1_2_Function1DR2_Occurrence[q4, q7, 1] | 1 = q4, 2 = q7])
-                   /\
-                   (and([y_1_2_Function1DR2_Occurrence[q4, q7, 1] | 2 = q4, 1 = q7]) /\
-                    and([y_1_2_Function1DR2_Occurrence[q4, q7, 2] | 2 = q4, 1 = q7])
-                    /\ and([y_1_2_Function1DR2_Occurrence[q4, q7, 1] | 2 = q4, 2 = q7]))
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q4, q7, q13] ->
-                        or([1 = q13 | 1 = q4, 1 = q7]) \/ or([2 = q13 | 1 = q4, 1 = q7]) \/
-                        or([1 = q13 | 1 = q4, 2 = q7])
-                        \/
-                        (or([1 = q13 | 2 = q4, 1 = q7]) \/ or([2 = q13 | 2 = q4, 1 = q7]) \/
-                         or([1 = q13 | 2 = q4, 2 = q7]))
-                            | q13 : int(1, 2)])
-                       | q7 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR2_Occurrence[q4, 1, q19] -> 1 = q19 \/ 2 = q19 | q19 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q4, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q4, 1, 2])
-                             | 1 = q4]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q4, 2, q19] -> 1 = q19 | q19 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q4, 2, 1]
-                             | 1 = q4]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q4, 3, q19] -> false | q19 : int(1, 2)]) | 1 = q4]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR2_Occurrence[q4, 1, q21] -> 1 = q21 \/ 2 = q21 | q21 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q4, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q4, 1, 2])
-                             | 2 = q4]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q4, 2, q21] -> 1 = q21 | q21 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q4, 2, 1]
-                             | 2 = q4]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q4, 3, q21] -> false | q21 : int(1, 2)]) | 2 = q4]);
-                        int(1..3)])),
-              y_1_3[q4] = [33, 55; int(1..2)][q4];
-                  int(1..3)])
-             | q4 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_1_2-solution000001.solution b/tests/exhaustive/issues/166/expected/model_1_2-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_1_2-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_1_2.eprime.orig b/tests/exhaustive/issues/166/expected/model_1_2.eprime.orig
deleted file mode 100644
index 03fb76651e..0000000000
--- a/tests/exhaustive/issues/166/expected/model_1_2.eprime.orig
+++ /dev/null
@@ -1,83 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR2_Occurrence: matrix indexed by [int(1, 2), int(1..3), int(1, 2)] of bool
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR6_ExplicitVarSizeWithDummy: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2, 3)
-branching on [y_1_1, y_1_2_Function1DR6_ExplicitVarSizeWithDummy, y_1_3, y_1_2_Function1DR2_Occurrence]
-such that
-    and([and([y_1_1[q25] = [10, 11; int(1..2)][q25],
-              and([and([y_1_2_Function1DR2_Occurrence[q25, q28, 1] | 1 = q25, 1 = q28]) /\
-                   and([y_1_2_Function1DR2_Occurrence[q25, q28, 2] | 1 = q25, 1 = q28])
-                   /\ and([y_1_2_Function1DR2_Occurrence[q25, q28, 1] | 1 = q25, 2 = q28])
-                   /\
-                   (and([y_1_2_Function1DR2_Occurrence[q25, q28, 1] | 2 = q25, 1 = q28]) /\
-                    and([y_1_2_Function1DR2_Occurrence[q25, q28, 2] | 2 = q25, 1 = q28])
-                    /\ and([y_1_2_Function1DR2_Occurrence[q25, q28, 1] | 2 = q25, 2 = q28]))
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q25, q28, q34] ->
-                        or([1 = q34 | 1 = q25, 1 = q28]) \/ or([2 = q34 | 1 = q25, 1 = q28]) \/
-                        or([1 = q34 | 1 = q25, 2 = q28])
-                        \/
-                        (or([1 = q34 | 2 = q25, 1 = q28]) \/ or([2 = q34 | 2 = q25, 1 = q28]) \/
-                         or([1 = q34 | 2 = q25, 2 = q28]))
-                            | q34 : int(1, 2)])
-                       | q28 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR2_Occurrence[q25, 1, q40] -> 1 = q40 \/ 2 = q40 | q40 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q25, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q25, 1, 2])
-                             | 1 = q25]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q25, 2, q40] -> 1 = q40 | q40 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q25, 2, 1]
-                             | 1 = q25]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q25, 3, q40] -> false | q40 : int(1, 2)]) | 1 = q25]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR2_Occurrence[q25, 1, q42] -> 1 = q42 \/ 2 = q42 | q42 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q25, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q25, 1, 2])
-                             | 2 = q25]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q25, 2, q42] -> 1 = q42 | q42 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q25, 2, 1]
-                             | 2 = q25]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q25, 3, q42] -> false | q42 : int(1, 2)]) | 2 = q25]);
-                        int(1..3)])),
-              y_1_3[q25] = [33, 55; int(1..2)][q25];
-                  int(1..3)])
-             | q25 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q4, q5, 1] <
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q4, q5, 2]
-              \/ y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q4, q5, 1] = 3
-                  | q5 : int(1..3)])
-             | q4 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q4, q5, 1] = 3 ->
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q4, q5, 2] = 3
-                  | q5 : int(1..3)])
-             | q4 : int(1, 2)]),
-    and([and([y_1_1[q10] = y_1_1[q10],
-              and([and([y_1_2_Function1DR2_Occurrence[q10, q13, q14] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q16] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q16] = q14
-                                | q16 : int(1..2)])
-                            | q14 : int(1, 2)])
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q18] != 3 ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q10, q13, y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q18]]
-                            | q18 : int(1..2)])
-                       | q13 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q19, q21] != 3 ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q10, q19, y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q19, q21]]
-                            | q21 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q10, q19, q22] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q19, q24] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q19, q24] = q22
-                                | q24 : int(1..2)])
-                            | q22 : int(1, 2)])
-                       | q19 : int(1..3)]),
-              y_1_3[q10] = y_1_3[q10];
-                  int(1..3)])
-             | q10 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_1_3-solution000001.solution b/tests/exhaustive/issues/166/expected/model_1_3-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_1_3-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_1_3.eprime.orig b/tests/exhaustive/issues/166/expected/model_1_3.eprime.orig
deleted file mode 100644
index f7d0ce6fe6..0000000000
--- a/tests/exhaustive/issues/166/expected/model_1_3.eprime.orig
+++ /dev/null
@@ -1,88 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR2_Occurrence: matrix indexed by [int(1, 2), int(1..3), int(1, 2)] of bool
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker: matrix indexed by [int(1, 2), int(1..3)] of int(0..2)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-branching on
-    [y_1_1, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values,
-     y_1_3, y_1_2_Function1DR2_Occurrence]
-such that
-    and([and([y_1_1[q24] = [10, 11; int(1..2)][q24],
-              and([and([y_1_2_Function1DR2_Occurrence[q24, q27, 1] | 1 = q24, 1 = q27]) /\
-                   and([y_1_2_Function1DR2_Occurrence[q24, q27, 2] | 1 = q24, 1 = q27])
-                   /\ and([y_1_2_Function1DR2_Occurrence[q24, q27, 1] | 1 = q24, 2 = q27])
-                   /\
-                   (and([y_1_2_Function1DR2_Occurrence[q24, q27, 1] | 2 = q24, 1 = q27]) /\
-                    and([y_1_2_Function1DR2_Occurrence[q24, q27, 2] | 2 = q24, 1 = q27])
-                    /\ and([y_1_2_Function1DR2_Occurrence[q24, q27, 1] | 2 = q24, 2 = q27]))
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q24, q27, q33] ->
-                        or([1 = q33 | 1 = q24, 1 = q27]) \/ or([2 = q33 | 1 = q24, 1 = q27]) \/
-                        or([1 = q33 | 1 = q24, 2 = q27])
-                        \/
-                        (or([1 = q33 | 2 = q24, 1 = q27]) \/ or([2 = q33 | 2 = q24, 1 = q27]) \/
-                         or([1 = q33 | 2 = q24, 2 = q27]))
-                            | q33 : int(1, 2)])
-                       | q27 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR2_Occurrence[q24, 1, q39] -> 1 = q39 \/ 2 = q39 | q39 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q24, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q24, 1, 2])
-                             | 1 = q24]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q24, 2, q39] -> 1 = q39 | q39 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q24, 2, 1]
-                             | 1 = q24]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q24, 3, q39] -> false | q39 : int(1, 2)]) | 1 = q24]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR2_Occurrence[q24, 1, q41] -> 1 = q41 \/ 2 = q41 | q41 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q24, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q24, 1, 2])
-                             | 2 = q24]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q24, 2, q41] -> 1 = q41 | q41 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q24, 2, 1]
-                             | 2 = q24]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q24, 3, q41] -> false | q41 : int(1, 2)]) | 2 = q24]);
-                        int(1..3)])),
-              y_1_3[q24] = [33, 55; int(1..2)][q24];
-                  int(1..3)])
-             | q24 : int(1, 2)]),
-    and([and([2 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q4, q5] ->
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q4, q5, 1] <
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q4, q5, 2]
-                  | q5 : int(1..3)])
-             | q4 : int(1, 2)]),
-    and([and([and([q7 > y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q4, q5] ->
-                   y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q4, q5, q7] = 1
-                       | q7 : int(1..2)])
-                  | q5 : int(1..3)])
-             | q4 : int(1, 2)]),
-    and([and([y_1_1[q9] = y_1_1[q9],
-              and([and([y_1_2_Function1DR2_Occurrence[q9, q12, q13] ->
-                        or([q15 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q15] = q13
-                                | q15 : int(1..2)])
-                            | q13 : int(1, 2)])
-                   /\
-                   and([q17 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q9, q12, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q17]]
-                            | q17 : int(1..2)])
-                       | q12 : int(1..3)])
-              /\
-              and([and([q20 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q18] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q9, q18, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q18, q20]]
-                            | q20 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q9, q18, q21] ->
-                        or([q23 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q18] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q18, q23] = q21
-                                | q23 : int(1..2)])
-                            | q21 : int(1, 2)])
-                       | q18 : int(1..3)]),
-              y_1_3[q9] = y_1_3[q9];
-                  int(1..3)])
-             | q9 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_1_4-solution000001.solution b/tests/exhaustive/issues/166/expected/model_1_4-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_1_4-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_1_4.eprime.orig b/tests/exhaustive/issues/166/expected/model_1_4.eprime.orig
deleted file mode 100644
index 4e9afcbfc1..0000000000
--- a/tests/exhaustive/issues/166/expected/model_1_4.eprime.orig
+++ /dev/null
@@ -1,92 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR2_Occurrence: matrix indexed by [int(1, 2), int(1..3), int(1, 2)] of bool
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of bool
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-branching on
-    [y_1_1, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values,
-     y_1_3, y_1_2_Function1DR2_Occurrence]
-such that
-    and([and([y_1_1[q26] = [10, 11; int(1..2)][q26],
-              and([and([y_1_2_Function1DR2_Occurrence[q26, q29, 1] | 1 = q26, 1 = q29]) /\
-                   and([y_1_2_Function1DR2_Occurrence[q26, q29, 2] | 1 = q26, 1 = q29])
-                   /\ and([y_1_2_Function1DR2_Occurrence[q26, q29, 1] | 1 = q26, 2 = q29])
-                   /\
-                   (and([y_1_2_Function1DR2_Occurrence[q26, q29, 1] | 2 = q26, 1 = q29]) /\
-                    and([y_1_2_Function1DR2_Occurrence[q26, q29, 2] | 2 = q26, 1 = q29])
-                    /\ and([y_1_2_Function1DR2_Occurrence[q26, q29, 1] | 2 = q26, 2 = q29]))
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q26, q29, q35] ->
-                        or([1 = q35 | 1 = q26, 1 = q29]) \/ or([2 = q35 | 1 = q26, 1 = q29]) \/
-                        or([1 = q35 | 1 = q26, 2 = q29])
-                        \/
-                        (or([1 = q35 | 2 = q26, 1 = q29]) \/ or([2 = q35 | 2 = q26, 1 = q29]) \/
-                         or([1 = q35 | 2 = q26, 2 = q29]))
-                            | q35 : int(1, 2)])
-                       | q29 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR2_Occurrence[q26, 1, q41] -> 1 = q41 \/ 2 = q41 | q41 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q26, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q26, 1, 2])
-                             | 1 = q26]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q26, 2, q41] -> 1 = q41 | q41 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q26, 2, 1]
-                             | 1 = q26]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q26, 3, q41] -> false | q41 : int(1, 2)]) | 1 = q26]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR2_Occurrence[q26, 1, q43] -> 1 = q43 \/ 2 = q43 | q43 : int(1, 2)]) /\
-                         (y_1_2_Function1DR2_Occurrence[q26, 1, 1] /\ y_1_2_Function1DR2_Occurrence[q26, 1, 2])
-                             | 2 = q26]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q26, 2, q43] -> 1 = q43 | q43 : int(1, 2)]) /\
-                         y_1_2_Function1DR2_Occurrence[q26, 2, 1]
-                             | 2 = q26]),
-                    and([and([y_1_2_Function1DR2_Occurrence[q26, 3, q43] -> false | q43 : int(1, 2)]) | 2 = q26]);
-                        int(1..3)])),
-              y_1_3[q26] = [33, 55; int(1..2)][q26];
-                  int(1..3)])
-             | q26 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q4, q5, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q4, q5, 1] <
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q4, q5, 2]
-                  | q5 : int(1..3)])
-             | q4 : int(1, 2)]),
-    and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q4, q5, q7] = false ->
-                   y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q4, q5, q7] = 1
-                       | q7 : int(1..2)])
-                  | q5 : int(1..3)])
-             | q4 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q4, q5, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q4, q5, 1]
-                  | q5 : int(1..3)])
-             | q4 : int(1, 2)]),
-    and([and([y_1_1[q11] = y_1_1[q11],
-              and([and([y_1_2_Function1DR2_Occurrence[q11, q14, q15] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q17] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q17] = q15
-                                | q17 : int(1..2)])
-                            | q15 : int(1, 2)])
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q19] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q11, q14, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q19]]
-                            | q19 : int(1..2)])
-                       | q14 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q20, q22] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q11, q20, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q20, q22]]
-                            | q22 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q11, q20, q23] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q20, q25] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q20, q25] = q23
-                                | q25 : int(1..2)])
-                            | q23 : int(1, 2)])
-                       | q20 : int(1..3)]),
-              y_1_3[q11] = y_1_3[q11];
-                  int(1..3)])
-             | q11 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_2_1-solution000001.solution b/tests/exhaustive/issues/166/expected/model_2_1-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_2_1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_2_1.eprime.orig b/tests/exhaustive/issues/166/expected/model_2_1.eprime.orig
deleted file mode 100644
index 48f869f112..0000000000
--- a/tests/exhaustive/issues/166/expected/model_2_1.eprime.orig
+++ /dev/null
@@ -1,139 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR6_ExplicitVarSizeWithDummy: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2, 3)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR2_Occurrence: matrix indexed by [int(1, 2), int(1..3), int(1, 2)] of bool
-branching on [y_1_1, y_1_2_Function1DR2_Occurrence, y_1_3, y_1_2_Function1DR6_ExplicitVarSizeWithDummy]
-such that
-    and([and([y_1_1[q10] = [10, 11; int(1..2)][q10],
-              and([and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q19] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q19] = 1
-                                | q19 : int(1..2)])
-                            | 1 = q10, 1 = q13])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q21] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q21] = 2
-                                | q21 : int(1..2)])
-                            | 1 = q10, 1 = q13])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q23] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q23] = 1
-                                | q23 : int(1..2)])
-                            | 1 = q10, 2 = q13])
-                   /\
-                   (and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q26] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q26] = 1
-                                 | q26 : int(1..2)])
-                             | 2 = q10, 1 = q13])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q28] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q28] = 2
-                                 | q28 : int(1..2)])
-                             | 2 = q10, 1 = q13])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q30] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q30] = 1
-                                 | q30 : int(1..2)])
-                             | 2 = q10, 2 = q13]))
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q32] != 3 ->
-                        or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q32] | 1 = q10, 1 = q13]) \/
-                        or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q32] | 1 = q10, 1 = q13])
-                        \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q32] | 1 = q10, 2 = q13])
-                        \/
-                        (or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q32] | 2 = q10, 1 = q13]) \/
-                         or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q32] | 2 = q10, 1 = q13])
-                         \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, q13, q32] | 2 = q10, 2 = q13]))
-                            | q32 : int(1..2)])
-                       | q13 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q39] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q39] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q39]
-                                  | q39 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q42] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q42] = 1
-                                  | q42 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q42] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q42] = 2
-                                  | q42 : int(1..2)]))
-                             | 1 = q10]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q39] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q39]
-                                  | q39 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q42] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q42] = 1
-                                 | q42 : int(1..2)])
-                             | 1 = q10]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 3, q39] != 3 -> false | q39 : int(1..2)])
-                             | 1 = q10]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q44] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q44] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q44]
-                                  | q44 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q47] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q47] = 1
-                                  | q47 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q47] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 1, q47] = 2
-                                  | q47 : int(1..2)]))
-                             | 2 = q10]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q44] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q44]
-                                  | q44 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q47] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 2, q47] = 1
-                                 | q47 : int(1..2)])
-                             | 2 = q10]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q10, 3, q44] != 3 -> false | q44 : int(1..2)])
-                             | 2 = q10]);
-                        int(1..3)])),
-              y_1_3[q10] = [33, 55; int(1..2)][q10];
-                  int(1..3)])
-             | q10 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] <
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2]
-              \/ y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3 ->
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_1[q56] = y_1_1[q56],
-              and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q59, q61] != 3 ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q56, q59, y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q59, q61]]
-                            | q61 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q56, q59, q62] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q59, q64] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q59, q64] = q62
-                                | q64 : int(1..2)])
-                            | q62 : int(1, 2)])
-                       | q59 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR2_Occurrence[q56, q65, q66] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q65, q68] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q65, q68] = q66
-                                | q68 : int(1..2)])
-                            | q66 : int(1, 2)])
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q65, q70] != 3 ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q56, q65, y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q56, q65, q70]]
-                            | q70 : int(1..2)])
-                       | q65 : int(1..3)]),
-              y_1_3[q56] = y_1_3[q56];
-                  int(1..3)])
-             | q56 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_2_2-solution000001.solution b/tests/exhaustive/issues/166/expected/model_2_2-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_2_2-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_2_2.eprime.orig b/tests/exhaustive/issues/166/expected/model_2_2.eprime.orig
deleted file mode 100644
index 882d24f70f..0000000000
--- a/tests/exhaustive/issues/166/expected/model_2_2.eprime.orig
+++ /dev/null
@@ -1,111 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR6_ExplicitVarSizeWithDummy: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2, 3)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-branching on [y_1_1, y_1_2_Function1DR6_ExplicitVarSizeWithDummy, y_1_3]
-such that
-    and([and([y_1_1[q7] = [10, 11; int(1..2)][q7],
-              and([and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q16] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q16] = 1
-                                | q16 : int(1..2)])
-                            | 1 = q7, 1 = q10])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q18] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q18] = 2
-                                | q18 : int(1..2)])
-                            | 1 = q7, 1 = q10])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q20] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q20] = 1
-                                | q20 : int(1..2)])
-                            | 1 = q7, 2 = q10])
-                   /\
-                   (and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q23] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q23] = 1
-                                 | q23 : int(1..2)])
-                             | 2 = q7, 1 = q10])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q25] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q25] = 2
-                                 | q25 : int(1..2)])
-                             | 2 = q7, 1 = q10])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q27] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q27] = 1
-                                 | q27 : int(1..2)])
-                             | 2 = q7, 2 = q10]))
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q29] != 3 ->
-                        or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q29] | 1 = q7, 1 = q10]) \/
-                        or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q29] | 1 = q7, 1 = q10])
-                        \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q29] | 1 = q7, 2 = q10])
-                        \/
-                        (or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q29] | 2 = q7, 1 = q10]) \/
-                         or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q29] | 2 = q7, 1 = q10])
-                         \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, q10, q29] | 2 = q7, 2 = q10]))
-                            | q29 : int(1..2)])
-                       | q10 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q36] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q36] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q36]
-                                  | q36 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q39] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q39] = 1
-                                  | q39 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q39] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q39] = 2
-                                  | q39 : int(1..2)]))
-                             | 1 = q7]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q36] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q36]
-                                  | q36 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q39] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q39] = 1
-                                 | q39 : int(1..2)])
-                             | 1 = q7]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 3, q36] != 3 -> false | q36 : int(1..2)])
-                             | 1 = q7]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q41] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q41] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q41]
-                                  | q41 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q44] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q44] = 1
-                                  | q44 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q44] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 1, q44] = 2
-                                  | q44 : int(1..2)]))
-                             | 2 = q7]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q41] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q41]
-                                  | q41 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q44] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 2, q44] = 1
-                                 | q44 : int(1..2)])
-                             | 2 = q7]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q7, 3, q41] != 3 -> false | q41 : int(1..2)])
-                             | 2 = q7]);
-                        int(1..3)])),
-              y_1_3[q7] = [33, 55; int(1..2)][q7];
-                  int(1..3)])
-             | q7 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] <
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2]
-              \/ y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3 ->
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_2_3-solution000001.solution b/tests/exhaustive/issues/166/expected/model_2_3-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_2_3-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_2_3.eprime.orig b/tests/exhaustive/issues/166/expected/model_2_3.eprime.orig
deleted file mode 100644
index fc24bf17b7..0000000000
--- a/tests/exhaustive/issues/166/expected/model_2_3.eprime.orig
+++ /dev/null
@@ -1,159 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR6_ExplicitVarSizeWithDummy: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2, 3)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker: matrix indexed by [int(1, 2), int(1..3)] of int(0..2)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-branching on
-    [y_1_1, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values,
-     y_1_3, y_1_2_Function1DR6_ExplicitVarSizeWithDummy]
-such that
-    and([and([y_1_1[q33] = [10, 11; int(1..2)][q33],
-              and([and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q42] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q42] = 1
-                                | q42 : int(1..2)])
-                            | 1 = q33, 1 = q36])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q44] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q44] = 2
-                                | q44 : int(1..2)])
-                            | 1 = q33, 1 = q36])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q46] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q46] = 1
-                                | q46 : int(1..2)])
-                            | 1 = q33, 2 = q36])
-                   /\
-                   (and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q49] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q49] = 1
-                                 | q49 : int(1..2)])
-                             | 2 = q33, 1 = q36])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q51] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q51] = 2
-                                 | q51 : int(1..2)])
-                             | 2 = q33, 1 = q36])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q53] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q53] = 1
-                                 | q53 : int(1..2)])
-                             | 2 = q33, 2 = q36]))
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q55] != 3 ->
-                        or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q55] | 1 = q33, 1 = q36]) \/
-                        or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q55] | 1 = q33, 1 = q36])
-                        \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q55] | 1 = q33, 2 = q36])
-                        \/
-                        (or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q55] | 2 = q33, 1 = q36]) \/
-                         or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q55] | 2 = q33, 1 = q36])
-                         \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, q36, q55] | 2 = q33, 2 = q36]))
-                            | q55 : int(1..2)])
-                       | q36 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q62] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q62] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q62]
-                                  | q62 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q65] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q65] = 1
-                                  | q65 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q65] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q65] = 2
-                                  | q65 : int(1..2)]))
-                             | 1 = q33]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q62] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q62]
-                                  | q62 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q65] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q65] = 1
-                                 | q65 : int(1..2)])
-                             | 1 = q33]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 3, q62] != 3 -> false | q62 : int(1..2)])
-                             | 1 = q33]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q67] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q67] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q67]
-                                  | q67 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q70] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q70] = 1
-                                  | q70 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q70] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 1, q70] = 2
-                                  | q70 : int(1..2)]))
-                             | 2 = q33]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q67] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q67]
-                                  | q67 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q70] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 2, q70] = 1
-                                 | q70 : int(1..2)])
-                             | 2 = q33]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q33, 3, q67] != 3 -> false | q67 : int(1..2)])
-                             | 2 = q33]);
-                        int(1..3)])),
-              y_1_3[q33] = [33, 55; int(1..2)][q33];
-                  int(1..3)])
-             | q33 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] <
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2]
-              \/ y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3 ->
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([2 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q7, q8] ->
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q7, q8, 1] <
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q7, q8, 2]
-                  | q8 : int(1..3)])
-             | q7 : int(1, 2)]),
-    and([and([and([q10 > y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q7, q8] ->
-                   y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q7, q8, q10] = 1
-                       | q10 : int(1..2)])
-                  | q8 : int(1..3)])
-             | q7 : int(1, 2)]),
-    and([and([y_1_1[q12] = y_1_1[q12],
-              and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q17] != 3 ->
-                        or([q19 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q15] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q15, q19] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q17]
-                                | q19 : int(1..2)])
-                            | q17 : int(1..2)])
-                   /\
-                   and([q21 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q15] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q23] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q23] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q15, q21]
-                                | q23 : int(1..2)])
-                            | q21 : int(1..2)])
-                       | q15 : int(1..3)])
-              /\
-              and([and([q26 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q24] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q28] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q28] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q24, q26]
-                                | q28 : int(1..2)])
-                            | q26 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q30] != 3 ->
-                        or([q32 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q24] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q24, q32] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q30]
-                                | q32 : int(1..2)])
-                            | q30 : int(1..2)])
-                       | q24 : int(1..3)]),
-              y_1_3[q12] = y_1_3[q12];
-                  int(1..3)])
-             | q12 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_2_4-solution000001.solution b/tests/exhaustive/issues/166/expected/model_2_4-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_2_4-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_2_4.eprime.orig b/tests/exhaustive/issues/166/expected/model_2_4.eprime.orig
deleted file mode 100644
index abe826fdd7..0000000000
--- a/tests/exhaustive/issues/166/expected/model_2_4.eprime.orig
+++ /dev/null
@@ -1,163 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR6_ExplicitVarSizeWithDummy: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2, 3)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of bool
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-branching on
-    [y_1_1, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values,
-     y_1_3, y_1_2_Function1DR6_ExplicitVarSizeWithDummy]
-such that
-    and([and([y_1_1[q35] = [10, 11; int(1..2)][q35],
-              and([and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q44] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q44] = 1
-                                | q44 : int(1..2)])
-                            | 1 = q35, 1 = q38])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q46] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q46] = 2
-                                | q46 : int(1..2)])
-                            | 1 = q35, 1 = q38])
-                   /\
-                   and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q48] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q48] = 1
-                                | q48 : int(1..2)])
-                            | 1 = q35, 2 = q38])
-                   /\
-                   (and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q51] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q51] = 1
-                                 | q51 : int(1..2)])
-                             | 2 = q35, 1 = q38])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q53] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q53] = 2
-                                 | q53 : int(1..2)])
-                             | 2 = q35, 1 = q38])
-                    /\
-                    and([or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q55] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q55] = 1
-                                 | q55 : int(1..2)])
-                             | 2 = q35, 2 = q38]))
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q57] != 3 ->
-                        or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q57] | 1 = q35, 1 = q38]) \/
-                        or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q57] | 1 = q35, 1 = q38])
-                        \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q57] | 1 = q35, 2 = q38])
-                        \/
-                        (or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q57] | 2 = q35, 1 = q38]) \/
-                         or([2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q57] | 2 = q35, 1 = q38])
-                         \/ or([1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, q38, q57] | 2 = q35, 2 = q38]))
-                            | q57 : int(1..2)])
-                       | q38 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q64] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q64] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q64]
-                                  | q64 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q67] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q67] = 1
-                                  | q67 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q67] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q67] = 2
-                                  | q67 : int(1..2)]))
-                             | 1 = q35]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q64] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q64]
-                                  | q64 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q67] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q67] = 1
-                                 | q67 : int(1..2)])
-                             | 1 = q35]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 3, q64] != 3 -> false | q64 : int(1..2)])
-                             | 1 = q35]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q69] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q69] \/
-                              2 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q69]
-                                  | q69 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q72] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q72] = 1
-                                  | q72 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q72] != 3 /\
-                              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 1, q72] = 2
-                                  | q72 : int(1..2)]))
-                             | 2 = q35]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q69] != 3 ->
-                              1 = y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q69]
-                                  | q69 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q72] != 3 /\
-                             y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 2, q72] = 1
-                                 | q72 : int(1..2)])
-                             | 2 = q35]),
-                    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q35, 3, q69] != 3 -> false | q69 : int(1..2)])
-                             | 2 = q35]);
-                        int(1..3)])),
-              y_1_3[q35] = [33, 55; int(1..2)][q35];
-                  int(1..3)])
-             | q35 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] <
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2]
-              \/ y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 1] = 3 ->
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q1, q2, 2] = 3
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q7, q8, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q7, q8, 1] <
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q7, q8, 2]
-                  | q8 : int(1..3)])
-             | q7 : int(1, 2)]),
-    and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q7, q8, q10] = false ->
-                   y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q7, q8, q10] = 1
-                       | q10 : int(1..2)])
-                  | q8 : int(1..3)])
-             | q7 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q7, q8, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q7, q8, 1]
-                  | q8 : int(1..3)])
-             | q7 : int(1, 2)]),
-    and([and([y_1_1[q14] = y_1_1[q14],
-              and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q19] != 3 ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q17, q21] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q17, q21] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q19]
-                                | q21 : int(1..2)])
-                            | q19 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q17, q23] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q25] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q25] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q17, q23]
-                                | q25 : int(1..2)])
-                            | q23 : int(1..2)])
-                       | q17 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q26, q28] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q30] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q30] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q26, q28]
-                                | q30 : int(1..2)])
-                            | q28 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q32] != 3 ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q26, q34] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q26, q34] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q32]
-                                | q34 : int(1..2)])
-                            | q32 : int(1..2)])
-                       | q26 : int(1..3)]),
-              y_1_3[q14] = y_1_3[q14];
-                  int(1..3)])
-             | q14 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_3_1-solution000001.solution b/tests/exhaustive/issues/166/expected/model_3_1-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_3_1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_3_1.eprime.orig b/tests/exhaustive/issues/166/expected/model_3_1.eprime.orig
deleted file mode 100644
index 1ce6c6503c..0000000000
--- a/tests/exhaustive/issues/166/expected/model_3_1.eprime.orig
+++ /dev/null
@@ -1,148 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker: matrix indexed by [int(1, 2), int(1..3)] of int(0..2)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR2_Occurrence: matrix indexed by [int(1, 2), int(1..3), int(1, 2)] of bool
-branching on
-    [y_1_1, y_1_2_Function1DR2_Occurrence, y_1_3, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker,
-     y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values]
-such that
-    and([and([y_1_1[q9] = [10, 11; int(1..2)][q9],
-              and([and([or([q18 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q18] = 1
-                                | q18 : int(1..2)])
-                            | 1 = q9, 1 = q12])
-                   /\
-                   and([or([q20 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q20] = 2
-                                | q20 : int(1..2)])
-                            | 1 = q9, 1 = q12])
-                   /\
-                   and([or([q22 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q22] = 1
-                                | q22 : int(1..2)])
-                            | 1 = q9, 2 = q12])
-                   /\
-                   (and([or([q25 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q25] = 1
-                                 | q25 : int(1..2)])
-                             | 2 = q9, 1 = q12])
-                    /\
-                    and([or([q27 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q27] = 2
-                                 | q27 : int(1..2)])
-                             | 2 = q9, 1 = q12])
-                    /\
-                    and([or([q29 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q29] = 1
-                                 | q29 : int(1..2)])
-                             | 2 = q9, 2 = q12]))
-                   /\
-                   and([q31 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, q12] ->
-                        or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q31] | 1 = q9, 1 = q12]) \/
-                        or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q31] | 1 = q9, 1 = q12])
-                        \/ or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q31] | 1 = q9, 2 = q12])
-                        \/
-                        (or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q31] | 2 = q9, 1 = q12])
-                         \/
-                         or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q31] | 2 = q9, 1 = q12])
-                         \/
-                         or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, q12, q31] | 2 = q9, 2 = q12]))
-                            | q31 : int(1..2)])
-                       | q12 : int(1..3)])
-              /\
-              (and([and([and([q38 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q38] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q38]
-                                  | q38 : int(1..2)])
-                         /\
-                         (or([q41 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q41] = 1
-                                  | q41 : int(1..2)])
-                          /\
-                          or([q41 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q41] = 2
-                                  | q41 : int(1..2)]))
-                             | 1 = q9]),
-                    and([and([q38 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 2, q38]
-                                  | q38 : int(1..2)])
-                         /\
-                         or([q41 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 2, q41] = 1
-                                 | q41 : int(1..2)])
-                             | 1 = q9]),
-                    and([and([q38 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 3] -> false
-                                  | q38 : int(1..2)])
-                             | 1 = q9]);
-                        int(1..3)])
-               /\
-               and([and([and([q43 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q43] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q43]
-                                  | q43 : int(1..2)])
-                         /\
-                         (or([q46 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q46] = 1
-                                  | q46 : int(1..2)])
-                          /\
-                          or([q46 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 1, q46] = 2
-                                  | q46 : int(1..2)]))
-                             | 2 = q9]),
-                    and([and([q43 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 2, q43]
-                                  | q43 : int(1..2)])
-                         /\
-                         or([q46 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q9, 2, q46] = 1
-                                 | q46 : int(1..2)])
-                             | 2 = q9]),
-                    and([and([q43 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q9, 3] -> false
-                                  | q43 : int(1..2)])
-                             | 2 = q9]);
-                        int(1..3)])),
-              y_1_3[q9] = [33, 55; int(1..2)][q9];
-                  int(1..3)])
-             | q9 : int(1, 2)]),
-    and([and([2 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 1] <
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([q4 > y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-                   y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_1[q55] = y_1_1[q55],
-              and([and([q60 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q55, q58] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q55, q58, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q55, q58, q60]]
-                            | q60 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q55, q58, q61] ->
-                        or([q63 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q55, q58] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q55, q58, q63] = q61
-                                | q63 : int(1..2)])
-                            | q61 : int(1, 2)])
-                       | q58 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR2_Occurrence[q55, q64, q65] ->
-                        or([q67 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q55, q64] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q55, q64, q67] = q65
-                                | q67 : int(1..2)])
-                            | q65 : int(1, 2)])
-                   /\
-                   and([q69 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q55, q64] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q55, q64, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q55, q64, q69]]
-                            | q69 : int(1..2)])
-                       | q64 : int(1..3)]),
-              y_1_3[q55] = y_1_3[q55];
-                  int(1..3)])
-             | q55 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_3_2-solution000001.solution b/tests/exhaustive/issues/166/expected/model_3_2-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_3_2-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_3_2.eprime.orig b/tests/exhaustive/issues/166/expected/model_3_2.eprime.orig
deleted file mode 100644
index 72459ac480..0000000000
--- a/tests/exhaustive/issues/166/expected/model_3_2.eprime.orig
+++ /dev/null
@@ -1,166 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker: matrix indexed by [int(1, 2), int(1..3)] of int(0..2)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR6_ExplicitVarSizeWithDummy: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2, 3)
-branching on
-    [y_1_1, y_1_2_Function1DR6_ExplicitVarSizeWithDummy, y_1_3, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker,
-     y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values]
-such that
-    and([and([y_1_1[q33] = [10, 11; int(1..2)][q33],
-              and([and([or([q42 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, q36] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q42] = 1
-                                | q42 : int(1..2)])
-                            | 1 = q33, 1 = q36])
-                   /\
-                   and([or([q44 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, q36] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q44] = 2
-                                | q44 : int(1..2)])
-                            | 1 = q33, 1 = q36])
-                   /\
-                   and([or([q46 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, q36] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q46] = 1
-                                | q46 : int(1..2)])
-                            | 1 = q33, 2 = q36])
-                   /\
-                   (and([or([q49 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, q36] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q49] = 1
-                                 | q49 : int(1..2)])
-                             | 2 = q33, 1 = q36])
-                    /\
-                    and([or([q51 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, q36] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q51] = 2
-                                 | q51 : int(1..2)])
-                             | 2 = q33, 1 = q36])
-                    /\
-                    and([or([q53 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, q36] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q53] = 1
-                                 | q53 : int(1..2)])
-                             | 2 = q33, 2 = q36]))
-                   /\
-                   and([q55 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, q36] ->
-                        or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q55] | 1 = q33, 1 = q36])
-                        \/
-                        or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q55] | 1 = q33, 1 = q36])
-                        \/
-                        or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q55] | 1 = q33, 2 = q36])
-                        \/
-                        (or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q55] | 2 = q33, 1 = q36])
-                         \/
-                         or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q55] | 2 = q33, 1 = q36])
-                         \/
-                         or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, q36, q55]
-                                 | 2 = q33, 2 = q36]))
-                            | q55 : int(1..2)])
-                       | q36 : int(1..3)])
-              /\
-              (and([and([and([q62 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q62] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q62]
-                                  | q62 : int(1..2)])
-                         /\
-                         (or([q65 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q65] = 1
-                                  | q65 : int(1..2)])
-                          /\
-                          or([q65 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q65] = 2
-                                  | q65 : int(1..2)]))
-                             | 1 = q33]),
-                    and([and([q62 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 2, q62]
-                                  | q62 : int(1..2)])
-                         /\
-                         or([q65 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 2, q65] = 1
-                                 | q65 : int(1..2)])
-                             | 1 = q33]),
-                    and([and([q62 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 3] -> false
-                                  | q62 : int(1..2)])
-                             | 1 = q33]);
-                        int(1..3)])
-               /\
-               and([and([and([q67 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q67] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q67]
-                                  | q67 : int(1..2)])
-                         /\
-                         (or([q70 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q70] = 1
-                                  | q70 : int(1..2)])
-                          /\
-                          or([q70 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 1, q70] = 2
-                                  | q70 : int(1..2)]))
-                             | 2 = q33]),
-                    and([and([q67 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 2, q67]
-                                  | q67 : int(1..2)])
-                         /\
-                         or([q70 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q33, 2, q70] = 1
-                                 | q70 : int(1..2)])
-                             | 2 = q33]),
-                    and([and([q67 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q33, 3] -> false
-                                  | q67 : int(1..2)])
-                             | 2 = q33]);
-                        int(1..3)])),
-              y_1_3[q33] = [33, 55; int(1..2)][q33];
-                  int(1..3)])
-             | q33 : int(1, 2)]),
-    and([and([2 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 1] <
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([q4 > y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-                   y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q6, q7, 1] <
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q6, q7, 2]
-              \/ y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q6, q7, 1] = 3
-                  | q7 : int(1..3)])
-             | q6 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q6, q7, 1] = 3 ->
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q6, q7, 2] = 3
-                  | q7 : int(1..3)])
-             | q6 : int(1, 2)]),
-    and([and([y_1_1[q12] = y_1_1[q12],
-              and([and([q17 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q15] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q19] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q19] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q15, q17]
-                                | q19 : int(1..2)])
-                            | q17 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q21] != 3 ->
-                        or([q23 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q15] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q15, q23] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q15, q21]
-                                | q23 : int(1..2)])
-                            | q21 : int(1..2)])
-                       | q15 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q26] != 3 ->
-                        or([q28 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q24] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q24, q28] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q26]
-                                | q28 : int(1..2)])
-                            | q26 : int(1..2)])
-                   /\
-                   and([q30 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q12, q24] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q32] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q12, q24, q32] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q12, q24, q30]
-                                | q32 : int(1..2)])
-                            | q30 : int(1..2)])
-                       | q24 : int(1..3)]),
-              y_1_3[q12] = y_1_3[q12];
-                  int(1..3)])
-             | q12 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_3_3-solution000001.solution b/tests/exhaustive/issues/166/expected/model_3_3-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_3_3-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_3_3.eprime.orig b/tests/exhaustive/issues/166/expected/model_3_3.eprime.orig
deleted file mode 100644
index f9b537481c..0000000000
--- a/tests/exhaustive/issues/166/expected/model_3_3.eprime.orig
+++ /dev/null
@@ -1,118 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker: matrix indexed by [int(1, 2), int(1..3)] of int(0..2)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-branching on
-    [y_1_1, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values,
-     y_1_3]
-such that
-    and([and([y_1_1[q6] = [10, 11; int(1..2)][q6],
-              and([and([or([q15 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, q9] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q15] = 1
-                                | q15 : int(1..2)])
-                            | 1 = q6, 1 = q9])
-                   /\
-                   and([or([q17 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, q9] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q17] = 2
-                                | q17 : int(1..2)])
-                            | 1 = q6, 1 = q9])
-                   /\
-                   and([or([q19 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, q9] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q19] = 1
-                                | q19 : int(1..2)])
-                            | 1 = q6, 2 = q9])
-                   /\
-                   (and([or([q22 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, q9] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q22] = 1
-                                 | q22 : int(1..2)])
-                             | 2 = q6, 1 = q9])
-                    /\
-                    and([or([q24 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, q9] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q24] = 2
-                                 | q24 : int(1..2)])
-                             | 2 = q6, 1 = q9])
-                    /\
-                    and([or([q26 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, q9] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q26] = 1
-                                 | q26 : int(1..2)])
-                             | 2 = q6, 2 = q9]))
-                   /\
-                   and([q28 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, q9] ->
-                        or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q28] | 1 = q6, 1 = q9]) \/
-                        or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q28] | 1 = q6, 1 = q9])
-                        \/ or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q28] | 1 = q6, 2 = q9])
-                        \/
-                        (or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q28] | 2 = q6, 1 = q9]) \/
-                         or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q28] | 2 = q6, 1 = q9])
-                         \/ or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, q9, q28] | 2 = q6, 2 = q9]))
-                            | q28 : int(1..2)])
-                       | q9 : int(1..3)])
-              /\
-              (and([and([and([q35 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q35] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q35]
-                                  | q35 : int(1..2)])
-                         /\
-                         (or([q38 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q38] = 1
-                                  | q38 : int(1..2)])
-                          /\
-                          or([q38 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q38] = 2
-                                  | q38 : int(1..2)]))
-                             | 1 = q6]),
-                    and([and([q35 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 2, q35]
-                                  | q35 : int(1..2)])
-                         /\
-                         or([q38 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 2, q38] = 1
-                                 | q38 : int(1..2)])
-                             | 1 = q6]),
-                    and([and([q35 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 3] -> false
-                                  | q35 : int(1..2)])
-                             | 1 = q6]);
-                        int(1..3)])
-               /\
-               and([and([and([q40 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q40] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q40]
-                                  | q40 : int(1..2)])
-                         /\
-                         (or([q43 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q43] = 1
-                                  | q43 : int(1..2)])
-                          /\
-                          or([q43 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 1, q43] = 2
-                                  | q43 : int(1..2)]))
-                             | 2 = q6]),
-                    and([and([q40 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 2, q40]
-                                  | q40 : int(1..2)])
-                         /\
-                         or([q43 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q6, 2, q43] = 1
-                                 | q43 : int(1..2)])
-                             | 2 = q6]),
-                    and([and([q40 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q6, 3] -> false
-                                  | q40 : int(1..2)])
-                             | 2 = q6]);
-                        int(1..3)])),
-              y_1_3[q6] = [33, 55; int(1..2)][q6];
-                  int(1..3)])
-             | q6 : int(1, 2)]),
-    and([and([2 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 1] <
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([q4 > y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-                   y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_3_4-solution000001.solution b/tests/exhaustive/issues/166/expected/model_3_4-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_3_4-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_3_4.eprime.orig b/tests/exhaustive/issues/166/expected/model_3_4.eprime.orig
deleted file mode 100644
index 10a65c931f..0000000000
--- a/tests/exhaustive/issues/166/expected/model_3_4.eprime.orig
+++ /dev/null
@@ -1,173 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker: matrix indexed by [int(1, 2), int(1..3)] of int(0..2)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of bool
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-branching on
-    [y_1_1, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values,
-     y_1_3, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values]
-such that
-    and([and([y_1_1[q34] = [10, 11; int(1..2)][q34],
-              and([and([or([q43 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, q37] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q43] = 1
-                                | q43 : int(1..2)])
-                            | 1 = q34, 1 = q37])
-                   /\
-                   and([or([q45 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, q37] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q45] = 2
-                                | q45 : int(1..2)])
-                            | 1 = q34, 1 = q37])
-                   /\
-                   and([or([q47 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, q37] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q47] = 1
-                                | q47 : int(1..2)])
-                            | 1 = q34, 2 = q37])
-                   /\
-                   (and([or([q50 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, q37] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q50] = 1
-                                 | q50 : int(1..2)])
-                             | 2 = q34, 1 = q37])
-                    /\
-                    and([or([q52 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, q37] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q52] = 2
-                                 | q52 : int(1..2)])
-                             | 2 = q34, 1 = q37])
-                    /\
-                    and([or([q54 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, q37] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q54] = 1
-                                 | q54 : int(1..2)])
-                             | 2 = q34, 2 = q37]))
-                   /\
-                   and([q56 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, q37] ->
-                        or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q56] | 1 = q34, 1 = q37])
-                        \/
-                        or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q56] | 1 = q34, 1 = q37])
-                        \/
-                        or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q56] | 1 = q34, 2 = q37])
-                        \/
-                        (or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q56] | 2 = q34, 1 = q37])
-                         \/
-                         or([2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q56] | 2 = q34, 1 = q37])
-                         \/
-                         or([1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, q37, q56]
-                                 | 2 = q34, 2 = q37]))
-                            | q56 : int(1..2)])
-                       | q37 : int(1..3)])
-              /\
-              (and([and([and([q63 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q63] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q63]
-                                  | q63 : int(1..2)])
-                         /\
-                         (or([q66 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q66] = 1
-                                  | q66 : int(1..2)])
-                          /\
-                          or([q66 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q66] = 2
-                                  | q66 : int(1..2)]))
-                             | 1 = q34]),
-                    and([and([q63 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 2, q63]
-                                  | q63 : int(1..2)])
-                         /\
-                         or([q66 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 2, q66] = 1
-                                 | q66 : int(1..2)])
-                             | 1 = q34]),
-                    and([and([q63 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 3] -> false
-                                  | q63 : int(1..2)])
-                             | 1 = q34]);
-                        int(1..3)])
-               /\
-               and([and([and([q68 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 1] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q68] \/
-                              2 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q68]
-                                  | q68 : int(1..2)])
-                         /\
-                         (or([q71 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q71] = 1
-                                  | q71 : int(1..2)])
-                          /\
-                          or([q71 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 1] /\
-                              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 1, q71] = 2
-                                  | q71 : int(1..2)]))
-                             | 2 = q34]),
-                    and([and([q68 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 2] ->
-                              1 = y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 2, q68]
-                                  | q68 : int(1..2)])
-                         /\
-                         or([q71 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 2] /\
-                             y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q34, 2, q71] = 1
-                                 | q71 : int(1..2)])
-                             | 2 = q34]),
-                    and([and([q68 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q34, 3] -> false
-                                  | q68 : int(1..2)])
-                             | 2 = q34]);
-                        int(1..3)])),
-              y_1_3[q34] = [33, 55; int(1..2)][q34];
-                  int(1..3)])
-             | q34 : int(1, 2)]),
-    and([and([2 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 1] <
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([q4 > y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q1, q2] ->
-                   y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q6, q7, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q6, q7, 1] <
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q6, q7, 2]
-                  | q7 : int(1..3)])
-             | q6 : int(1, 2)]),
-    and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q6, q7, q9] = false ->
-                   y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q6, q7, q9] = 1
-                       | q9 : int(1..2)])
-                  | q7 : int(1..3)])
-             | q6 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q6, q7, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q6, q7, 1]
-                  | q7 : int(1..3)])
-             | q6 : int(1, 2)]),
-    and([and([y_1_1[q13] = y_1_1[q13],
-              and([and([q18 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q16] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q16, q20] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q16, q20] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q16, q18]
-                                | q20 : int(1..2)])
-                            | q18 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q16, q22] ->
-                        or([q24 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q16] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q16, q24] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q16, q22]
-                                | q24 : int(1..2)])
-                            | q22 : int(1..2)])
-                       | q16 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q25, q27] ->
-                        or([q29 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q25] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q25, q29] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q25, q27]
-                                | q29 : int(1..2)])
-                            | q27 : int(1..2)])
-                   /\
-                   and([q31 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q25] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q25, q33] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q25, q33] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q25, q31]
-                                | q33 : int(1..2)])
-                            | q31 : int(1..2)])
-                       | q25 : int(1..3)]),
-              y_1_3[q13] = y_1_3[q13];
-                  int(1..3)])
-             | q13 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_4_1-solution000001.solution b/tests/exhaustive/issues/166/expected/model_4_1-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_4_1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_4_1.eprime.orig b/tests/exhaustive/issues/166/expected/model_4_1.eprime.orig
deleted file mode 100644
index 8ff2e45e2f..0000000000
--- a/tests/exhaustive/issues/166/expected/model_4_1.eprime.orig
+++ /dev/null
@@ -1,154 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of bool
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR2_Occurrence: matrix indexed by [int(1, 2), int(1..3), int(1, 2)] of bool
-branching on
-    [y_1_1, y_1_2_Function1DR2_Occurrence, y_1_3, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags,
-     y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values]
-such that
-    and([and([y_1_1[q11] = [10, 11; int(1..2)][q11],
-              and([and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q20] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q20] = 1
-                                | q20 : int(1..2)])
-                            | 1 = q11, 1 = q14])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q22] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q22] = 2
-                                | q22 : int(1..2)])
-                            | 1 = q11, 1 = q14])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q24] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q24] = 1
-                                | q24 : int(1..2)])
-                            | 1 = q11, 2 = q14])
-                   /\
-                   (and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q27] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q27] = 1
-                                 | q27 : int(1..2)])
-                             | 2 = q11, 1 = q14])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q29] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q29] = 2
-                                 | q29 : int(1..2)])
-                             | 2 = q11, 1 = q14])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q31] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q31] = 1
-                                 | q31 : int(1..2)])
-                             | 2 = q11, 2 = q14]))
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, q14, q33] ->
-                        or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q33] | 1 = q11, 1 = q14])
-                        \/
-                        or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q33] | 1 = q11, 1 = q14])
-                        \/
-                        or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q33] | 1 = q11, 2 = q14])
-                        \/
-                        (or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q33] | 2 = q11, 1 = q14])
-                         \/
-                         or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q33] | 2 = q11, 1 = q14])
-                         \/
-                         or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, q14, q33] | 2 = q11, 2 = q14]))
-                            | q33 : int(1..2)])
-                       | q14 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 1, q40] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q40] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q40]
-                                  | q40 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 1, q43] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q43] = 1
-                                  | q43 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 1, q43] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q43] = 2
-                                  | q43 : int(1..2)]))
-                             | 1 = q11]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 2, q40] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 2, q40]
-                                  | q40 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 2, q43] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 2, q43] = 1
-                                 | q43 : int(1..2)])
-                             | 1 = q11]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 3, q40] -> false
-                                  | q40 : int(1..2)])
-                             | 1 = q11]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 1, q45] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q45] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q45]
-                                  | q45 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 1, q48] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q48] = 1
-                                  | q48 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 1, q48] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 1, q48] = 2
-                                  | q48 : int(1..2)]))
-                             | 2 = q11]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 2, q45] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 2, q45]
-                                  | q45 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 2, q48] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q11, 2, q48] = 1
-                                 | q48 : int(1..2)])
-                             | 2 = q11]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q11, 3, q45] -> false
-                                  | q45 : int(1..2)])
-                             | 2 = q11]);
-                        int(1..3)])),
-              y_1_3[q11] = [33, 55; int(1..2)][q11];
-                  int(1..3)])
-             | q11 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 1] <
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, q4] = false ->
-                   y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 1]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_1[q57] = y_1_1[q57],
-              and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q57, q60, q62] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q57, q60, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q57, q60, q62]]
-                            | q62 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR2_Occurrence[q57, q60, q63] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q57, q60, q65] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q57, q60, q65] = q63
-                                | q65 : int(1..2)])
-                            | q63 : int(1, 2)])
-                       | q60 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR2_Occurrence[q57, q66, q67] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q57, q66, q69] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q57, q66, q69] = q67
-                                | q69 : int(1..2)])
-                            | q67 : int(1, 2)])
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q57, q66, q71] ->
-                        y_1_2_Function1DR2_Occurrence
-                            [q57, q66, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q57, q66, q71]]
-                            | q71 : int(1..2)])
-                       | q66 : int(1..3)]),
-              y_1_3[q57] = y_1_3[q57];
-                  int(1..3)])
-             | q57 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_4_2-solution000001.solution b/tests/exhaustive/issues/166/expected/model_4_2-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_4_2-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_4_2.eprime.orig b/tests/exhaustive/issues/166/expected/model_4_2.eprime.orig
deleted file mode 100644
index 69c1bf0cc6..0000000000
--- a/tests/exhaustive/issues/166/expected/model_4_2.eprime.orig
+++ /dev/null
@@ -1,169 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of bool
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR6_ExplicitVarSizeWithDummy: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2, 3)
-branching on
-    [y_1_1, y_1_2_Function1DR6_ExplicitVarSizeWithDummy, y_1_3, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags,
-     y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values]
-such that
-    and([and([y_1_1[q35] = [10, 11; int(1..2)][q35],
-              and([and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, q38, q44] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q44] = 1
-                                | q44 : int(1..2)])
-                            | 1 = q35, 1 = q38])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, q38, q46] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q46] = 2
-                                | q46 : int(1..2)])
-                            | 1 = q35, 1 = q38])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, q38, q48] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q48] = 1
-                                | q48 : int(1..2)])
-                            | 1 = q35, 2 = q38])
-                   /\
-                   (and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, q38, q51] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q51] = 1
-                                 | q51 : int(1..2)])
-                             | 2 = q35, 1 = q38])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, q38, q53] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q53] = 2
-                                 | q53 : int(1..2)])
-                             | 2 = q35, 1 = q38])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, q38, q55] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q55] = 1
-                                 | q55 : int(1..2)])
-                             | 2 = q35, 2 = q38]))
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, q38, q57] ->
-                        or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q57] | 1 = q35, 1 = q38])
-                        \/
-                        or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q57] | 1 = q35, 1 = q38])
-                        \/
-                        or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q57] | 1 = q35, 2 = q38])
-                        \/
-                        (or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q57] | 2 = q35, 1 = q38])
-                         \/
-                         or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q57] | 2 = q35, 1 = q38])
-                         \/
-                         or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, q38, q57] | 2 = q35, 2 = q38]))
-                            | q57 : int(1..2)])
-                       | q38 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 1, q64] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q64] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q64]
-                                  | q64 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 1, q67] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q67] = 1
-                                  | q67 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 1, q67] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q67] = 2
-                                  | q67 : int(1..2)]))
-                             | 1 = q35]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 2, q64] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 2, q64]
-                                  | q64 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 2, q67] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 2, q67] = 1
-                                 | q67 : int(1..2)])
-                             | 1 = q35]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 3, q64] -> false
-                                  | q64 : int(1..2)])
-                             | 1 = q35]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 1, q69] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q69] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q69]
-                                  | q69 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 1, q72] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q72] = 1
-                                  | q72 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 1, q72] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 1, q72] = 2
-                                  | q72 : int(1..2)]))
-                             | 2 = q35]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 2, q69] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 2, q69]
-                                  | q69 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 2, q72] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q35, 2, q72] = 1
-                                 | q72 : int(1..2)])
-                             | 2 = q35]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q35, 3, q69] -> false
-                                  | q69 : int(1..2)])
-                             | 2 = q35]);
-                        int(1..3)])),
-              y_1_3[q35] = [33, 55; int(1..2)][q35];
-                  int(1..3)])
-             | q35 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 1] <
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, q4] = false ->
-                   y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 1]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q8, q9, 1] <
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q8, q9, 2]
-              \/ y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q8, q9, 1] = 3
-                  | q9 : int(1..3)])
-             | q8 : int(1, 2)]),
-    and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q8, q9, 1] = 3 ->
-              y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q8, q9, 2] = 3
-                  | q9 : int(1..3)])
-             | q8 : int(1, 2)]),
-    and([and([y_1_1[q14] = y_1_1[q14],
-              and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q17, q19] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q21] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q21] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q17, q19]
-                                | q21 : int(1..2)])
-                            | q19 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q23] != 3 ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q17, q25] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q17, q25] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q17, q23]
-                                | q25 : int(1..2)])
-                            | q23 : int(1..2)])
-                       | q17 : int(1..3)])
-              /\
-              and([and([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q28] != 3 ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q26, q30] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q26, q30] =
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q28]
-                                | q30 : int(1..2)])
-                            | q28 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q14, q26, q32] ->
-                        or([y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q34] != 3 /\
-                            y_1_2_Function1DR6_ExplicitVarSizeWithDummy[q14, q26, q34] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q14, q26, q32]
-                                | q34 : int(1..2)])
-                            | q32 : int(1..2)])
-                       | q26 : int(1..3)]),
-              y_1_3[q14] = y_1_3[q14];
-                  int(1..3)])
-             | q14 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_4_3-solution000001.solution b/tests/exhaustive/issues/166/expected/model_4_3-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_4_3-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_4_3.eprime.orig b/tests/exhaustive/issues/166/expected/model_4_3.eprime.orig
deleted file mode 100644
index 9b108c2e09..0000000000
--- a/tests/exhaustive/issues/166/expected/model_4_3.eprime.orig
+++ /dev/null
@@ -1,172 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of bool
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker: matrix indexed by [int(1, 2), int(1..3)] of int(0..2)
-find y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-branching on
-    [y_1_1, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker, y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values,
-     y_1_3, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values]
-such that
-    and([and([y_1_1[q34] = [10, 11; int(1..2)][q34],
-              and([and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, q37, q43] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q43] = 1
-                                | q43 : int(1..2)])
-                            | 1 = q34, 1 = q37])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, q37, q45] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q45] = 2
-                                | q45 : int(1..2)])
-                            | 1 = q34, 1 = q37])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, q37, q47] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q47] = 1
-                                | q47 : int(1..2)])
-                            | 1 = q34, 2 = q37])
-                   /\
-                   (and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, q37, q50] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q50] = 1
-                                 | q50 : int(1..2)])
-                             | 2 = q34, 1 = q37])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, q37, q52] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q52] = 2
-                                 | q52 : int(1..2)])
-                             | 2 = q34, 1 = q37])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, q37, q54] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q54] = 1
-                                 | q54 : int(1..2)])
-                             | 2 = q34, 2 = q37]))
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, q37, q56] ->
-                        or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q56] | 1 = q34, 1 = q37])
-                        \/
-                        or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q56] | 1 = q34, 1 = q37])
-                        \/
-                        or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q56] | 1 = q34, 2 = q37])
-                        \/
-                        (or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q56] | 2 = q34, 1 = q37])
-                         \/
-                         or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q56] | 2 = q34, 1 = q37])
-                         \/
-                         or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, q37, q56] | 2 = q34, 2 = q37]))
-                            | q56 : int(1..2)])
-                       | q37 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 1, q63] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q63] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q63]
-                                  | q63 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 1, q66] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q66] = 1
-                                  | q66 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 1, q66] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q66] = 2
-                                  | q66 : int(1..2)]))
-                             | 1 = q34]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 2, q63] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 2, q63]
-                                  | q63 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 2, q66] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 2, q66] = 1
-                                 | q66 : int(1..2)])
-                             | 1 = q34]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 3, q63] -> false
-                                  | q63 : int(1..2)])
-                             | 1 = q34]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 1, q68] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q68] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q68]
-                                  | q68 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 1, q71] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q71] = 1
-                                  | q71 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 1, q71] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 1, q71] = 2
-                                  | q71 : int(1..2)]))
-                             | 2 = q34]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 2, q68] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 2, q68]
-                                  | q68 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 2, q71] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q34, 2, q71] = 1
-                                 | q71 : int(1..2)])
-                             | 2 = q34]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q34, 3, q68] -> false
-                                  | q68 : int(1..2)])
-                             | 2 = q34]);
-                        int(1..3)])),
-              y_1_3[q34] = [33, 55; int(1..2)][q34];
-                  int(1..3)])
-             | q34 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 1] <
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, q4] = false ->
-                   y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 1]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([2 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q8, q9] ->
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q8, q9, 1] <
-              y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q8, q9, 2]
-                  | q9 : int(1..3)])
-             | q8 : int(1, 2)]),
-    and([and([and([q11 > y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q8, q9] ->
-                   y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q8, q9, q11] = 1
-                       | q11 : int(1..2)])
-                  | q9 : int(1..3)])
-             | q8 : int(1, 2)]),
-    and([and([y_1_1[q13] = y_1_1[q13],
-              and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q16, q18] ->
-                        or([q20 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q16] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q16, q20] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q16, q18]
-                                | q20 : int(1..2)])
-                            | q18 : int(1..2)])
-                   /\
-                   and([q22 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q16] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q16, q24] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q16, q24] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q16, q22]
-                                | q24 : int(1..2)])
-                            | q22 : int(1..2)])
-                       | q16 : int(1..3)])
-              /\
-              and([and([q27 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q25] ->
-                        or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q25, q29] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q25, q29] =
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q25, q27]
-                                | q29 : int(1..2)])
-                            | q27 : int(1..2)])
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q13, q25, q31] ->
-                        or([q33 <= y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Marker[q13, q25] /\
-                            y_1_2_Function1DR5_ExplicitVarSizeWithMarker_Values[q13, q25, q33] =
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q13, q25, q31]
-                                | q33 : int(1..2)])
-                            | q31 : int(1..2)])
-                       | q25 : int(1..3)]),
-              y_1_3[q13] = y_1_3[q13];
-                  int(1..3)])
-             | q13 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/166/expected/model_4_4-solution000001.solution b/tests/exhaustive/issues/166/expected/model_4_4-solution000001.solution
new file mode 100644
index 0000000000..15cf35802e
--- /dev/null
+++ b/tests/exhaustive/issues/166/expected/model_4_4-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting y be
+        tuple ([(10, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 33),
+                (11, function(1 --> {1, 2}, 2 --> {1}, 3 --> {}), 55);
+                    int(1..2)])
diff --git a/tests/exhaustive/issues/166/expected/model_4_4.eprime.orig b/tests/exhaustive/issues/166/expected/model_4_4.eprime.orig
deleted file mode 100644
index 9dd300ffd7..0000000000
--- a/tests/exhaustive/issues/166/expected/model_4_4.eprime.orig
+++ /dev/null
@@ -1,121 +0,0 @@
-language ESSENCE' 1.0
-
-find y_1_1: matrix indexed by [int(1, 2)] of int(10, 11)
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1, 2), int(1..3), int(1..2)] of bool
-find y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values:
-        matrix indexed by [int(1, 2), int(1..3), int(1..2)] of int(1, 2)
-find y_1_3: matrix indexed by [int(1, 2)] of int(33, 55)
-branching on
-    [y_1_1, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags, y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values,
-     y_1_3]
-such that
-    and([and([y_1_1[q8] = [10, 11; int(1..2)][q8],
-              and([and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, q11, q17] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q17] = 1
-                                | q17 : int(1..2)])
-                            | 1 = q8, 1 = q11])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, q11, q19] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q19] = 2
-                                | q19 : int(1..2)])
-                            | 1 = q8, 1 = q11])
-                   /\
-                   and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, q11, q21] /\
-                            y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q21] = 1
-                                | q21 : int(1..2)])
-                            | 1 = q8, 2 = q11])
-                   /\
-                   (and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, q11, q24] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q24] = 1
-                                 | q24 : int(1..2)])
-                             | 2 = q8, 1 = q11])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, q11, q26] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q26] = 2
-                                 | q26 : int(1..2)])
-                             | 2 = q8, 1 = q11])
-                    /\
-                    and([or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, q11, q28] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q28] = 1
-                                 | q28 : int(1..2)])
-                             | 2 = q8, 2 = q11]))
-                   /\
-                   and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, q11, q30] ->
-                        or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q30] | 1 = q8, 1 = q11]) \/
-                        or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q30] | 1 = q8, 1 = q11])
-                        \/ or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q30] | 1 = q8, 2 = q11])
-                        \/
-                        (or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q30] | 2 = q8, 1 = q11]) \/
-                         or([2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q30] | 2 = q8, 1 = q11])
-                         \/
-                         or([1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, q11, q30] | 2 = q8, 2 = q11]))
-                            | q30 : int(1..2)])
-                       | q11 : int(1..3)])
-              /\
-              (and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 1, q37] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q37] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q37]
-                                  | q37 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 1, q40] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q40] = 1
-                                  | q40 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 1, q40] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q40] = 2
-                                  | q40 : int(1..2)]))
-                             | 1 = q8]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 2, q37] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 2, q37]
-                                  | q37 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 2, q40] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 2, q40] = 1
-                                 | q40 : int(1..2)])
-                             | 1 = q8]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 3, q37] -> false | q37 : int(1..2)])
-                             | 1 = q8]);
-                        int(1..3)])
-               /\
-               and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 1, q42] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q42] \/
-                              2 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q42]
-                                  | q42 : int(1..2)])
-                         /\
-                         (or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 1, q45] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q45] = 1
-                                  | q45 : int(1..2)])
-                          /\
-                          or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 1, q45] /\
-                              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 1, q45] = 2
-                                  | q45 : int(1..2)]))
-                             | 2 = q8]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 2, q42] ->
-                              1 = y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 2, q42]
-                                  | q42 : int(1..2)])
-                         /\
-                         or([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 2, q45] /\
-                             y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q8, 2, q45] = 1
-                                 | q45 : int(1..2)])
-                             | 2 = q8]),
-                    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q8, 3, q42] -> false | q42 : int(1..2)])
-                             | 2 = q8]);
-                        int(1..3)])),
-              y_1_3[q8] = [33, 55; int(1..2)][q8];
-                  int(1..3)])
-             | q8 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 1] <
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, 2]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, q4] = false ->
-                   y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Values[q1, q2, q4] = 1
-                       | q4 : int(1..2)])
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)]),
-    and([and([y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 2] ->
-              y_1_2_Function1DR4_ExplicitVarSizeWithFlags_Flags[q1, q2, 1]
-                  | q2 : int(1..3)])
-             | q1 : int(1, 2)])
-
diff --git a/tests/exhaustive/issues/200/expected/model_1_2.eprime b/tests/exhaustive/issues/200/expected/model_1_2.eprime
index b07ac8079b..681dbb21e1 100644
--- a/tests/exhaustive/issues/200/expected/model_1_2.eprime
+++ b/tests/exhaustive/issues/200/expected/model_1_2.eprime
@@ -6,14 +6,6 @@ find quasigroup_Explicit: matrix indexed by [int(1..5)] of int(0..4)
 find quasigroup_Occurrence: matrix indexed by [int(0..4)] of bool
 branching on [quasigroup_Occurrence, quasigroup_Explicit]
 such that
-<<<<<<< HEAD
-    and([quasigroup_Occurrence[a] /\ quasigroup_Occurrence[b] -> a * b * (b * a) = a
-             | a : int(0..4), b : int(0..4), b > a]),
-    5 = sum([toInt(quasigroup_Occurrence[q1]) | q1 : int(0..4)]),
-    and([[quasigroup_Explicit[q2]; int(1)] <lex [quasigroup_Explicit[q2 + 1]; int(1)] | q2 : int(1..4)]),
-    and([quasigroup_Occurrence[quasigroup_Explicit[q5]] | q5 : int(1..5)]),
-    and([quasigroup_Occurrence[q6] -> or([quasigroup_Explicit[q8] = q6 | q8 : int(1..5)]) | q6 : int(0..4)])
-=======
     and([quasigroup_Explicit[q11] * quasigroup_Explicit[q12] * (quasigroup_Explicit[q12] * quasigroup_Explicit[q11]) =
          quasigroup_Explicit[q11]
              | q11 : int(1..5), q12 : int(1..5), q12 > q11]),
@@ -21,5 +13,4 @@ such that
     5 = sum([toInt(quasigroup_Occurrence[q3]) | q3 : int(0..4)]),
     and([quasigroup_Occurrence[q4] -> or([quasigroup_Explicit[q6] = q4 | q6 : int(1..5)]) | q4 : int(0..4)]),
     and([quasigroup_Occurrence[quasigroup_Explicit[q8]] | q8 : int(1..5)])
->>>>>>> main
 
diff --git a/tests/exhaustive/issues/200/expected/model_2_1.eprime b/tests/exhaustive/issues/200/expected/model_2_1.eprime
index 7782685892..698b9815ac 100644
--- a/tests/exhaustive/issues/200/expected/model_2_1.eprime
+++ b/tests/exhaustive/issues/200/expected/model_2_1.eprime
@@ -6,20 +6,10 @@ find quasigroup_Occurrence: matrix indexed by [int(0..4)] of bool
 find quasigroup_Explicit: matrix indexed by [int(1..5)] of int(0..4)
 branching on [quasigroup_Explicit, quasigroup_Occurrence]
 such that
-<<<<<<< HEAD
-    and([quasigroup_Explicit[q11] * quasigroup_Explicit[q12] * (quasigroup_Explicit[q12] * quasigroup_Explicit[q11]) =
-         quasigroup_Explicit[q11]
-             | q11 : int(1..5), q12 : int(1..5), q12 > q11]),
-    and([[quasigroup_Explicit[q1]; int(1)] <lex [quasigroup_Explicit[q1 + 1]; int(1)] | q1 : int(1..4)]),
-    5 = sum([toInt(quasigroup_Occurrence[q3]) | q3 : int(0..4)]),
-    and([quasigroup_Occurrence[q4] -> or([quasigroup_Explicit[q6] = q4 | q6 : int(1..5)]) | q4 : int(0..4)]),
-    and([quasigroup_Occurrence[quasigroup_Explicit[q8]] | q8 : int(1..5)])
-=======
     and([quasigroup_Occurrence[a] /\ quasigroup_Occurrence[b] -> a * b * (b * a) = a
              | a : int(0..4), b : int(0..4), b > a]),
     5 = sum([toInt(quasigroup_Occurrence[q1]) | q1 : int(0..4)]),
     and([quasigroup_Explicit[q2] < quasigroup_Explicit[q2 + 1] | q2 : int(1..4)]),
     and([quasigroup_Occurrence[quasigroup_Explicit[q5]] | q5 : int(1..5)]),
     and([quasigroup_Occurrence[q6] -> or([quasigroup_Explicit[q8] = q6 | q8 : int(1..5)]) | q6 : int(0..4)])
->>>>>>> main
 
diff --git a/tests/exhaustive/issues/200/expected/model_2_2.eprime b/tests/exhaustive/issues/200/expected/model_2_2.eprime
index 8467680992..c63510ba9a 100644
--- a/tests/exhaustive/issues/200/expected/model_2_2.eprime
+++ b/tests/exhaustive/issues/200/expected/model_2_2.eprime
@@ -5,14 +5,7 @@ letting let1 be 4
 find quasigroup_Occurrence: matrix indexed by [int(0..4)] of bool
 branching on [quasigroup_Occurrence]
 such that
-<<<<<<< HEAD
-    and([quasigroup_Explicit[q5] * quasigroup_Explicit[q6] * (quasigroup_Explicit[q6] * quasigroup_Explicit[q5]) =
-         quasigroup_Explicit[q5]
-             | q5 : int(1..5), q6 : int(1..5), q6 > q5]),
-    and([[quasigroup_Explicit[q1]; int(1)] <lex [quasigroup_Explicit[q1 + 1]; int(1)] | q1 : int(1..4)])
-=======
     and([quasigroup_Occurrence[a] /\ quasigroup_Occurrence[b] -> a * b * (b * a) = a
              | a : int(0..4), b : int(0..4), b > a]),
     5 = sum([toInt(quasigroup_Occurrence[q1]) | q1 : int(0..4)])
->>>>>>> main
 
diff --git a/tests/exhaustive/issues/212/expected/model_1_1-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_1_1-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_1-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_1_1-1.eprime-param b/tests/exhaustive/issues/212/expected/model_1_1-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_1-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_1_1.eprime b/tests/exhaustive/issues/212/expected/model_1_1.eprime
new file mode 100644
index 0000000000..7d498e9f22
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_1.eprime
@@ -0,0 +1,14 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_Occurrence: matrix indexed by [int(0..5)] of bool
+branching on [x_Occurrence]
+such that
+    and([x_Occurrence[q2] ->
+         or([a_Explicit[q4] = q2 | q4 : int(1..fin1), or([b_Explicit[q6] = a_Explicit[q4] | q6 : int(1..fin2)])])
+             | q2 : int(0..5)]),
+    and([x_Occurrence[a_Explicit[q8]] | q8 : int(1..fin1), or([b_Explicit[q10] = a_Explicit[q8] | q10 : int(1..fin2)])])
+
diff --git a/tests/exhaustive/issues/212/expected/model_1_2-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_1_2-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_2-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_1_2-1.eprime-param b/tests/exhaustive/issues/212/expected/model_1_2-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_2-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_1_2.eprime b/tests/exhaustive/issues/212/expected/model_1_2.eprime
new file mode 100644
index 0000000000..f65c809e22
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_2.eprime
@@ -0,0 +1,23 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_Occurrence: matrix indexed by [int(0..5)] of bool
+find x_ExplicitVarSizeWithDummy: matrix indexed by [int(1..6)] of int(0..6)
+branching on [x_ExplicitVarSizeWithDummy, x_Occurrence]
+such that
+    and([x_Occurrence[q11] ->
+         or([a_Explicit[q13] = q11 | q13 : int(1..fin1), or([b_Explicit[q15] = a_Explicit[q13] | q15 : int(1..fin2)])])
+             | q11 : int(0..5)]),
+    and([x_Occurrence[a_Explicit[q17]]
+             | q17 : int(1..fin1), or([b_Explicit[q19] = a_Explicit[q17] | q19 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithDummy[q2] < x_ExplicitVarSizeWithDummy[q2 + 1] \/ x_ExplicitVarSizeWithDummy[q2] = 6
+             | q2 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q3] = 6 -> x_ExplicitVarSizeWithDummy[q3 + 1] = 6 | q3 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q7] != 6 -> x_Occurrence[x_ExplicitVarSizeWithDummy[q7]] | q7 : int(1..6)]),
+    and([x_Occurrence[q8] ->
+         or([x_ExplicitVarSizeWithDummy[q10] != 6 /\ x_ExplicitVarSizeWithDummy[q10] = q8 | q10 : int(1..6)])
+             | q8 : int(0..5)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_1_3-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_1_3-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_3-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_1_3-1.eprime-param b/tests/exhaustive/issues/212/expected/model_1_3-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_3-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_1_3.eprime b/tests/exhaustive/issues/212/expected/model_1_3.eprime
new file mode 100644
index 0000000000..801bf91d9f
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_3.eprime
@@ -0,0 +1,26 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_Occurrence: matrix indexed by [int(0..5)] of bool
+find x_ExplicitVarSizeWithMarker_Marker: int(0..6)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on [x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values, x_Occurrence]
+such that
+    and([x_Occurrence[q10] ->
+         or([a_Explicit[q12] = q10 | q12 : int(1..fin1), or([b_Explicit[q14] = a_Explicit[q12] | q14 : int(1..fin2)])])
+             | q10 : int(0..5)]),
+    and([x_Occurrence[a_Explicit[q16]]
+             | q16 : int(1..fin1), or([b_Explicit[q18] = a_Explicit[q16] | q18 : int(1..fin2)])]),
+    and([q2 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q2] < x_ExplicitVarSizeWithMarker_Values[q2 + 1]
+             | q2 : int(1..5)]),
+    and([q3 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q3] = 0 | q3 : int(1..6)]),
+    and([q6 <= x_ExplicitVarSizeWithMarker_Marker -> x_Occurrence[x_ExplicitVarSizeWithMarker_Values[q6]]
+             | q6 : int(1..6)]),
+    and([x_Occurrence[q7] ->
+         or([q9 <= x_ExplicitVarSizeWithMarker_Marker /\ x_ExplicitVarSizeWithMarker_Values[q9] = q7 | q9 : int(1..6)])
+             | q7 : int(0..5)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_1_4-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_1_4-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_4-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_1_4-1.eprime-param b/tests/exhaustive/issues/212/expected/model_1_4-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_4-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_1_4.eprime b/tests/exhaustive/issues/212/expected/model_1_4.eprime
new file mode 100644
index 0000000000..ebe5228775
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_1_4.eprime
@@ -0,0 +1,26 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_Occurrence: matrix indexed by [int(0..5)] of bool
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..6)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on [x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values, x_Occurrence]
+such that
+    and([x_Occurrence[q12] ->
+         or([a_Explicit[q14] = q12 | q14 : int(1..fin1), or([b_Explicit[q16] = a_Explicit[q14] | q16 : int(1..fin2)])])
+             | q12 : int(0..5)]),
+    and([x_Occurrence[a_Explicit[q18]]
+             | q18 : int(1..fin1), or([b_Explicit[q20] = a_Explicit[q18] | q20 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q2] < x_ExplicitVarSizeWithFlags_Values[q2 + 1]
+             | q2 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3] = false -> x_ExplicitVarSizeWithFlags_Values[q3] = 0 | q3 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q4 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q8] -> x_Occurrence[x_ExplicitVarSizeWithFlags_Values[q8]] | q8 : int(1..6)]),
+    and([x_Occurrence[q9] ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q11] /\ x_ExplicitVarSizeWithFlags_Values[q11] = q9 | q11 : int(1..6)])
+             | q9 : int(0..5)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_2_1-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_2_1-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_1-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_2_1-1.eprime-param b/tests/exhaustive/issues/212/expected/model_2_1-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_1-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_2_1.eprime b/tests/exhaustive/issues/212/expected/model_2_1.eprime
new file mode 100644
index 0000000000..30e87e71e8
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_1.eprime
@@ -0,0 +1,25 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithDummy: matrix indexed by [int(1..6)] of int(0..6)
+find x_Occurrence: matrix indexed by [int(0..5)] of bool
+branching on [x_Occurrence, x_ExplicitVarSizeWithDummy]
+such that
+    and([x_ExplicitVarSizeWithDummy[q7] != 6 ->
+         or([a_Explicit[q9] = x_ExplicitVarSizeWithDummy[q7]
+                 | q9 : int(1..fin1), or([b_Explicit[q11] = a_Explicit[q9] | q11 : int(1..fin2)])])
+             | q7 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithDummy[q15] != 6 /\ x_ExplicitVarSizeWithDummy[q15] = a_Explicit[q13]
+                 | q15 : int(1..6)])
+             | q13 : int(1..fin1), or([b_Explicit[q17] = a_Explicit[q13] | q17 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithDummy[q1] < x_ExplicitVarSizeWithDummy[q1 + 1] \/ x_ExplicitVarSizeWithDummy[q1] = 6
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q2] = 6 -> x_ExplicitVarSizeWithDummy[q2 + 1] = 6 | q2 : int(1..5)]),
+    and([x_Occurrence[q18] ->
+         or([x_ExplicitVarSizeWithDummy[q20] != 6 /\ x_ExplicitVarSizeWithDummy[q20] = q18 | q20 : int(1..6)])
+             | q18 : int(0..5)]),
+    and([x_ExplicitVarSizeWithDummy[q22] != 6 -> x_Occurrence[x_ExplicitVarSizeWithDummy[q22]] | q22 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_2_2-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_2_2-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_2-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_2_2-1.eprime-param b/tests/exhaustive/issues/212/expected/model_2_2-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_2-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_2_2.eprime b/tests/exhaustive/issues/212/expected/model_2_2.eprime
new file mode 100644
index 0000000000..2046be1123
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_2.eprime
@@ -0,0 +1,20 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithDummy: matrix indexed by [int(1..6)] of int(0..6)
+branching on [x_ExplicitVarSizeWithDummy]
+such that
+    and([x_ExplicitVarSizeWithDummy[q6] != 6 ->
+         or([a_Explicit[q8] = x_ExplicitVarSizeWithDummy[q6]
+                 | q8 : int(1..fin1), or([b_Explicit[q10] = a_Explicit[q8] | q10 : int(1..fin2)])])
+             | q6 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithDummy[q14] != 6 /\ x_ExplicitVarSizeWithDummy[q14] = a_Explicit[q12]
+                 | q14 : int(1..6)])
+             | q12 : int(1..fin1), or([b_Explicit[q16] = a_Explicit[q12] | q16 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithDummy[q1] < x_ExplicitVarSizeWithDummy[q1 + 1] \/ x_ExplicitVarSizeWithDummy[q1] = 6
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q2] = 6 -> x_ExplicitVarSizeWithDummy[q2 + 1] = 6 | q2 : int(1..5)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_2_3-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_2_3-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_3-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_2_3-1.eprime-param b/tests/exhaustive/issues/212/expected/model_2_3-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_3-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_2_3.eprime b/tests/exhaustive/issues/212/expected/model_2_3.eprime
new file mode 100644
index 0000000000..93e3af90d4
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_3.eprime
@@ -0,0 +1,36 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithDummy: matrix indexed by [int(1..6)] of int(0..6)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..6)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on [x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values, x_ExplicitVarSizeWithDummy]
+such that
+    and([x_ExplicitVarSizeWithDummy[q17] != 6 ->
+         or([a_Explicit[q19] = x_ExplicitVarSizeWithDummy[q17]
+                 | q19 : int(1..fin1), or([b_Explicit[q21] = a_Explicit[q19] | q21 : int(1..fin2)])])
+             | q17 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithDummy[q25] != 6 /\ x_ExplicitVarSizeWithDummy[q25] = a_Explicit[q23]
+                 | q25 : int(1..6)])
+             | q23 : int(1..fin1), or([b_Explicit[q27] = a_Explicit[q23] | q27 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithDummy[q1] < x_ExplicitVarSizeWithDummy[q1 + 1] \/ x_ExplicitVarSizeWithDummy[q1] = 6
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q2] = 6 -> x_ExplicitVarSizeWithDummy[q2 + 1] = 6 | q2 : int(1..5)]),
+    and([q5 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q5] < x_ExplicitVarSizeWithMarker_Values[q5 + 1]
+             | q5 : int(1..5)]),
+    and([q6 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q6] = 0 | q6 : int(1..6)]),
+    and([q9 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithDummy[q11] != 6 /\
+             x_ExplicitVarSizeWithDummy[q11] = x_ExplicitVarSizeWithMarker_Values[q9]
+                 | q11 : int(1..6)])
+             | q9 : int(1..6)]),
+    and([x_ExplicitVarSizeWithDummy[q13] != 6 ->
+         or([q15 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q15] = x_ExplicitVarSizeWithDummy[q13]
+                 | q15 : int(1..6)])
+             | q13 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_2_4-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_2_4-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_4-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_2_4-1.eprime-param b/tests/exhaustive/issues/212/expected/model_2_4-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_4-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_2_4.eprime b/tests/exhaustive/issues/212/expected/model_2_4.eprime
new file mode 100644
index 0000000000..a7493d7565
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_2_4.eprime
@@ -0,0 +1,37 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithDummy: matrix indexed by [int(1..6)] of int(0..6)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..6)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on [x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values, x_ExplicitVarSizeWithDummy]
+such that
+    and([x_ExplicitVarSizeWithDummy[q19] != 6 ->
+         or([a_Explicit[q21] = x_ExplicitVarSizeWithDummy[q19]
+                 | q21 : int(1..fin1), or([b_Explicit[q23] = a_Explicit[q21] | q23 : int(1..fin2)])])
+             | q19 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithDummy[q27] != 6 /\ x_ExplicitVarSizeWithDummy[q27] = a_Explicit[q25]
+                 | q27 : int(1..6)])
+             | q25 : int(1..fin1), or([b_Explicit[q29] = a_Explicit[q25] | q29 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithDummy[q1] < x_ExplicitVarSizeWithDummy[q1 + 1] \/ x_ExplicitVarSizeWithDummy[q1] = 6
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q2] = 6 -> x_ExplicitVarSizeWithDummy[q2 + 1] = 6 | q2 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q5 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q5] < x_ExplicitVarSizeWithFlags_Values[q5 + 1]
+             | q5 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q6] = false -> x_ExplicitVarSizeWithFlags_Values[q6] = 0 | q6 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q7 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q7] | q7 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q11] ->
+         or([x_ExplicitVarSizeWithDummy[q13] != 6 /\
+             x_ExplicitVarSizeWithDummy[q13] = x_ExplicitVarSizeWithFlags_Values[q11]
+                 | q13 : int(1..6)])
+             | q11 : int(1..6)]),
+    and([x_ExplicitVarSizeWithDummy[q15] != 6 ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q17] /\
+             x_ExplicitVarSizeWithFlags_Values[q17] = x_ExplicitVarSizeWithDummy[q15]
+                 | q17 : int(1..6)])
+             | q15 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_3_1-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_3_1-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_1-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_3_1-1.eprime-param b/tests/exhaustive/issues/212/expected/model_3_1-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_1-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_3_1.eprime b/tests/exhaustive/issues/212/expected/model_3_1.eprime
new file mode 100644
index 0000000000..6308f8ed0c
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_1.eprime
@@ -0,0 +1,29 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..6)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..6)] of int(0..5)
+find x_Occurrence: matrix indexed by [int(0..5)] of bool
+branching on [x_Occurrence, x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values]
+such that
+    and([q6 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([a_Explicit[q8] = x_ExplicitVarSizeWithMarker_Values[q6]
+                 | q8 : int(1..fin1), or([b_Explicit[q10] = a_Explicit[q8] | q10 : int(1..fin2)])])
+             | q6 : int(1..6)]),
+    and([or([q14 <= x_ExplicitVarSizeWithMarker_Marker /\ x_ExplicitVarSizeWithMarker_Values[q14] = a_Explicit[q12]
+                 | q14 : int(1..6)])
+             | q12 : int(1..fin1), or([b_Explicit[q16] = a_Explicit[q12] | q16 : int(1..fin2)])]),
+    and([q1 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q1] < x_ExplicitVarSizeWithMarker_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([q2 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q2] = 0 | q2 : int(1..6)]),
+    and([x_Occurrence[q17] ->
+         or([q19 <= x_ExplicitVarSizeWithMarker_Marker /\ x_ExplicitVarSizeWithMarker_Values[q19] = q17
+                 | q19 : int(1..6)])
+             | q17 : int(0..5)]),
+    and([q21 <= x_ExplicitVarSizeWithMarker_Marker -> x_Occurrence[x_ExplicitVarSizeWithMarker_Values[q21]]
+             | q21 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_3_2-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_3_2-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_2-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_3_2-1.eprime-param b/tests/exhaustive/issues/212/expected/model_3_2-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_2-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_3_2.eprime b/tests/exhaustive/issues/212/expected/model_3_2.eprime
new file mode 100644
index 0000000000..364eb0520f
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_2.eprime
@@ -0,0 +1,36 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..6)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..6)] of int(0..5)
+find x_ExplicitVarSizeWithDummy: matrix indexed by [int(1..6)] of int(0..6)
+branching on [x_ExplicitVarSizeWithDummy, x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values]
+such that
+    and([q17 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([a_Explicit[q19] = x_ExplicitVarSizeWithMarker_Values[q17]
+                 | q19 : int(1..fin1), or([b_Explicit[q21] = a_Explicit[q19] | q21 : int(1..fin2)])])
+             | q17 : int(1..6)]),
+    and([or([q25 <= x_ExplicitVarSizeWithMarker_Marker /\ x_ExplicitVarSizeWithMarker_Values[q25] = a_Explicit[q23]
+                 | q25 : int(1..6)])
+             | q23 : int(1..fin1), or([b_Explicit[q27] = a_Explicit[q23] | q27 : int(1..fin2)])]),
+    and([q1 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q1] < x_ExplicitVarSizeWithMarker_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([q2 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q2] = 0 | q2 : int(1..6)]),
+    and([x_ExplicitVarSizeWithDummy[q4] < x_ExplicitVarSizeWithDummy[q4 + 1] \/ x_ExplicitVarSizeWithDummy[q4] = 6
+             | q4 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q5] = 6 -> x_ExplicitVarSizeWithDummy[q5 + 1] = 6 | q5 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q9] != 6 ->
+         or([q11 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q11] = x_ExplicitVarSizeWithDummy[q9]
+                 | q11 : int(1..6)])
+             | q9 : int(1..6)]),
+    and([q13 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithDummy[q15] != 6 /\
+             x_ExplicitVarSizeWithDummy[q15] = x_ExplicitVarSizeWithMarker_Values[q13]
+                 | q15 : int(1..6)])
+             | q13 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_3_3-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_3_3-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_3-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_3_3-1.eprime-param b/tests/exhaustive/issues/212/expected/model_3_3-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_3-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_3_3.eprime b/tests/exhaustive/issues/212/expected/model_3_3.eprime
new file mode 100644
index 0000000000..c3326d4adb
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_3.eprime
@@ -0,0 +1,22 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..6)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on [x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values]
+such that
+    and([q5 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([a_Explicit[q7] = x_ExplicitVarSizeWithMarker_Values[q5]
+                 | q7 : int(1..fin1), or([b_Explicit[q9] = a_Explicit[q7] | q9 : int(1..fin2)])])
+             | q5 : int(1..6)]),
+    and([or([q13 <= x_ExplicitVarSizeWithMarker_Marker /\ x_ExplicitVarSizeWithMarker_Values[q13] = a_Explicit[q11]
+                 | q13 : int(1..6)])
+             | q11 : int(1..fin1), or([b_Explicit[q15] = a_Explicit[q11] | q15 : int(1..fin2)])]),
+    and([q1 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q1] < x_ExplicitVarSizeWithMarker_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([q2 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q2] = 0 | q2 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_3_4-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_3_4-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_4-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_3_4-1.eprime-param b/tests/exhaustive/issues/212/expected/model_3_4-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_4-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_3_4.eprime b/tests/exhaustive/issues/212/expected/model_3_4.eprime
new file mode 100644
index 0000000000..eefd4567b9
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_3_4.eprime
@@ -0,0 +1,41 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..6)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..6)] of int(0..5)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..6)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on
+    [x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values, x_ExplicitVarSizeWithMarker_Marker,
+     x_ExplicitVarSizeWithMarker_Values]
+such that
+    and([q18 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([a_Explicit[q20] = x_ExplicitVarSizeWithMarker_Values[q18]
+                 | q20 : int(1..fin1), or([b_Explicit[q22] = a_Explicit[q20] | q22 : int(1..fin2)])])
+             | q18 : int(1..6)]),
+    and([or([q26 <= x_ExplicitVarSizeWithMarker_Marker /\ x_ExplicitVarSizeWithMarker_Values[q26] = a_Explicit[q24]
+                 | q26 : int(1..6)])
+             | q24 : int(1..fin1), or([b_Explicit[q28] = a_Explicit[q24] | q28 : int(1..fin2)])]),
+    and([q1 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q1] < x_ExplicitVarSizeWithMarker_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([q2 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q2] = 0 | q2 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q4 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q4] < x_ExplicitVarSizeWithFlags_Values[q4 + 1]
+             | q4 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q5] = false -> x_ExplicitVarSizeWithFlags_Values[q5] = 0 | q5 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q6 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q6] | q6 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q10] ->
+         or([q12 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q12] = x_ExplicitVarSizeWithFlags_Values[q10]
+                 | q12 : int(1..6)])
+             | q10 : int(1..6)]),
+    and([q14 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q16] /\
+             x_ExplicitVarSizeWithFlags_Values[q16] = x_ExplicitVarSizeWithMarker_Values[q14]
+                 | q16 : int(1..6)])
+             | q14 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_4_1-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_4_1-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_1-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_4_1-1.eprime-param b/tests/exhaustive/issues/212/expected/model_4_1-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_1-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_4_1.eprime b/tests/exhaustive/issues/212/expected/model_4_1.eprime
new file mode 100644
index 0000000000..3f9ecf24e4
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_1.eprime
@@ -0,0 +1,29 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..6)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..6)] of int(0..5)
+find x_Occurrence: matrix indexed by [int(0..5)] of bool
+branching on [x_Occurrence, x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values]
+such that
+    and([x_ExplicitVarSizeWithFlags_Flags[q8] ->
+         or([a_Explicit[q10] = x_ExplicitVarSizeWithFlags_Values[q8]
+                 | q10 : int(1..fin1), or([b_Explicit[q12] = a_Explicit[q10] | q12 : int(1..fin2)])])
+             | q8 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithFlags_Flags[q16] /\ x_ExplicitVarSizeWithFlags_Values[q16] = a_Explicit[q14]
+                 | q16 : int(1..6)])
+             | q14 : int(1..fin1), or([b_Explicit[q18] = a_Explicit[q14] | q18 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q1] < x_ExplicitVarSizeWithFlags_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2] = false -> x_ExplicitVarSizeWithFlags_Values[q2] = 0 | q2 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q3] | q3 : int(1..5)]),
+    and([x_Occurrence[q19] ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q21] /\ x_ExplicitVarSizeWithFlags_Values[q21] = q19 | q21 : int(1..6)])
+             | q19 : int(0..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q23] -> x_Occurrence[x_ExplicitVarSizeWithFlags_Values[q23]]
+             | q23 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_4_2-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_4_2-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_2-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_4_2-1.eprime-param b/tests/exhaustive/issues/212/expected/model_4_2-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_2-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_4_2.eprime b/tests/exhaustive/issues/212/expected/model_4_2.eprime
new file mode 100644
index 0000000000..4d34fb6bca
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_2.eprime
@@ -0,0 +1,37 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..6)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..6)] of int(0..5)
+find x_ExplicitVarSizeWithDummy: matrix indexed by [int(1..6)] of int(0..6)
+branching on [x_ExplicitVarSizeWithDummy, x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values]
+such that
+    and([x_ExplicitVarSizeWithFlags_Flags[q19] ->
+         or([a_Explicit[q21] = x_ExplicitVarSizeWithFlags_Values[q19]
+                 | q21 : int(1..fin1), or([b_Explicit[q23] = a_Explicit[q21] | q23 : int(1..fin2)])])
+             | q19 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithFlags_Flags[q27] /\ x_ExplicitVarSizeWithFlags_Values[q27] = a_Explicit[q25]
+                 | q27 : int(1..6)])
+             | q25 : int(1..fin1), or([b_Explicit[q29] = a_Explicit[q25] | q29 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q1] < x_ExplicitVarSizeWithFlags_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2] = false -> x_ExplicitVarSizeWithFlags_Values[q2] = 0 | q2 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q3] | q3 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q6] < x_ExplicitVarSizeWithDummy[q6 + 1] \/ x_ExplicitVarSizeWithDummy[q6] = 6
+             | q6 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q7] = 6 -> x_ExplicitVarSizeWithDummy[q7 + 1] = 6 | q7 : int(1..5)]),
+    and([x_ExplicitVarSizeWithDummy[q11] != 6 ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q13] /\
+             x_ExplicitVarSizeWithFlags_Values[q13] = x_ExplicitVarSizeWithDummy[q11]
+                 | q13 : int(1..6)])
+             | q11 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q15] ->
+         or([x_ExplicitVarSizeWithDummy[q17] != 6 /\
+             x_ExplicitVarSizeWithDummy[q17] = x_ExplicitVarSizeWithFlags_Values[q15]
+                 | q17 : int(1..6)])
+             | q15 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_4_3-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_4_3-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_3-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_4_3-1.eprime-param b/tests/exhaustive/issues/212/expected/model_4_3-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_3-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_4_3.eprime b/tests/exhaustive/issues/212/expected/model_4_3.eprime
new file mode 100644
index 0000000000..44a997c6a7
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_3.eprime
@@ -0,0 +1,41 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..6)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..6)] of int(0..5)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..6)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on
+    [x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values, x_ExplicitVarSizeWithFlags_Flags,
+     x_ExplicitVarSizeWithFlags_Values]
+such that
+    and([x_ExplicitVarSizeWithFlags_Flags[q18] ->
+         or([a_Explicit[q20] = x_ExplicitVarSizeWithFlags_Values[q18]
+                 | q20 : int(1..fin1), or([b_Explicit[q22] = a_Explicit[q20] | q22 : int(1..fin2)])])
+             | q18 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithFlags_Flags[q26] /\ x_ExplicitVarSizeWithFlags_Values[q26] = a_Explicit[q24]
+                 | q26 : int(1..6)])
+             | q24 : int(1..fin1), or([b_Explicit[q28] = a_Explicit[q24] | q28 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q1] < x_ExplicitVarSizeWithFlags_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2] = false -> x_ExplicitVarSizeWithFlags_Values[q2] = 0 | q2 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q3] | q3 : int(1..5)]),
+    and([q6 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q6] < x_ExplicitVarSizeWithMarker_Values[q6 + 1]
+             | q6 : int(1..5)]),
+    and([q7 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q7] = 0 | q7 : int(1..6)]),
+    and([q10 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q12] /\
+             x_ExplicitVarSizeWithFlags_Values[q12] = x_ExplicitVarSizeWithMarker_Values[q10]
+                 | q12 : int(1..6)])
+             | q10 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q14] ->
+         or([q16 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q16] = x_ExplicitVarSizeWithFlags_Values[q14]
+                 | q16 : int(1..6)])
+             | q14 : int(1..6)])
+
diff --git a/tests/exhaustive/issues/212/expected/model_4_4-1-solution000001.solution b/tests/exhaustive/issues/212/expected/model_4_4-1-solution000001.solution
new file mode 100644
index 0000000000..de5cc861ad
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_4-1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {1}
diff --git a/tests/exhaustive/issues/212/expected/model_4_4-1.eprime-param b/tests/exhaustive/issues/212/expected/model_4_4-1.eprime-param
new file mode 100644
index 0000000000..c50b6e81fd
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_4-1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting a_Explicit be [1, 2; int(1..2)]
+letting b_Explicit be [1, 3; int(1..2)]
+letting fin1 be 2
+letting fin2 be 2
diff --git a/tests/exhaustive/issues/212/expected/model_4_4.eprime b/tests/exhaustive/issues/212/expected/model_4_4.eprime
new file mode 100644
index 0000000000..fa1f37afc2
--- /dev/null
+++ b/tests/exhaustive/issues/212/expected/model_4_4.eprime
@@ -0,0 +1,23 @@
+language ESSENCE' 1.0
+
+given fin1: int
+given a_Explicit: matrix indexed by [int(1..fin1)] of int(0..5)
+given fin2: int
+given b_Explicit: matrix indexed by [int(1..fin2)] of int(0..5)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..6)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..6)] of int(0..5)
+branching on [x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values]
+such that
+    and([x_ExplicitVarSizeWithFlags_Flags[q7] ->
+         or([a_Explicit[q9] = x_ExplicitVarSizeWithFlags_Values[q7]
+                 | q9 : int(1..fin1), or([b_Explicit[q11] = a_Explicit[q9] | q11 : int(1..fin2)])])
+             | q7 : int(1..6)]),
+    and([or([x_ExplicitVarSizeWithFlags_Flags[q15] /\ x_ExplicitVarSizeWithFlags_Values[q15] = a_Explicit[q13]
+                 | q15 : int(1..6)])
+             | q13 : int(1..fin1), or([b_Explicit[q17] = a_Explicit[q13] | q17 : int(1..fin2)])]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q1] < x_ExplicitVarSizeWithFlags_Values[q1 + 1]
+             | q1 : int(1..5)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2] = false -> x_ExplicitVarSizeWithFlags_Values[q2] = 0 | q2 : int(1..6)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q3] | q3 : int(1..5)])
+
diff --git a/tests/exhaustive/issues/261/expected/model_1.eprime b/tests/exhaustive/issues/261/expected/model_1.eprime
index 6693ff9f73..a27aa5863f 100644
--- a/tests/exhaustive/issues/261/expected/model_1.eprime
+++ b/tests/exhaustive/issues/261/expected/model_1.eprime
@@ -8,7 +8,7 @@ branching on [a_Function1DPartial_Flags, a_Function1DPartial_Values]
 such that
     and([a_Function1DPartial_Flags[q1] /\ a_Function1DPartial_Flags[q2] ->
          a_Function1DPartial_Values[q1] != a_Function1DPartial_Values[q2]
-             | q1 : int(0..let1), q2 : int(0..let1), [q1; int(1)] <lex [q2; int(1)]]),
+             | q1 : int(0..let1), q2 : int(0..let1), q1 < q2]),
     and([or([a_Function1DPartial_Flags[q4] /\ a_Function1DPartial_Values[q4] = q3 | q4 : int(0..let1)])
              | q3 : int(1..3)]),
     and([a_Function1DPartial_Flags[q5] = false -> a_Function1DPartial_Values[q5] = 1 | q5 : int(0..let1)])
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000003.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000004.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000007.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000008.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_1-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_1_1-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_1_1.eprime b/tests/exhaustive/issues/286/expected/model_1_1.eprime
new file mode 100644
index 0000000000..aa35b895fb
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_1.eprime
@@ -0,0 +1,43 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..b), int(1..b)] of bool
+branching on
+    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
+such that
+    sum([toInt(q19 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) | q19 : int(1..b)]) <=
+    sum([1   | q20_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q20_ExplicitVarSizeWithDummy[q21] < q20_ExplicitVarSizeWithDummy[q21 + 1] \/
+                    q20_ExplicitVarSizeWithDummy[q21] = b + 1
+                        | q21 : int(1..b - 1)]),
+               and([q20_ExplicitVarSizeWithDummy[q22] = b + 1 -> q20_ExplicitVarSizeWithDummy[q22 + 1] = b + 1
+                        | q22 : int(1..b - 1)])])
+    / 8,
+    and([1 =
+         sum([toInt(q9 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q9, q1])
+                  | q9 : int(1..b)])
+             | q1 : int(1..b)]),
+    and([q15 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q15, q16]) | q16 : int(1..b)]) >= 1
+             | q15 : int(1..b)]),
+    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4, q10]) | q10 : int(1..b)] <lex
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4 + 1, q11]) | q11 : int(1..b)]
+             | q4 : int(1..b - 1)]),
+    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q12] = false | q12 : int(1..b)])
+             | q5 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= b,
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..b)]) <= b
+             | q6 : int(1..b)]),
+    b =
+    sum([toInt(q13 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q13, q14])
+                             | q14 : int(1..b)]),
+                    0)
+             | q13 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_2-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_1_2-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_1_2.eprime b/tests/exhaustive/issues/286/expected/model_1_2.eprime
new file mode 100644
index 0000000000..6777d21139
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_2.eprime
@@ -0,0 +1,122 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..b), int(1..b)] of bool
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..b), int(1..b)] of int(1..b + 1)
+branching on
+    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
+such that
+    sum([toInt(q63 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) | q63 : int(1..b)]) <=
+    sum([1   | q64_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q64_ExplicitVarSizeWithDummy[q65] < q64_ExplicitVarSizeWithDummy[q65 + 1] \/
+                    q64_ExplicitVarSizeWithDummy[q65] = b + 1
+                        | q65 : int(1..b - 1)]),
+               and([q64_ExplicitVarSizeWithDummy[q66] = b + 1 -> q64_ExplicitVarSizeWithDummy[q66 + 1] = b + 1
+                        | q66 : int(1..b - 1)])])
+    / 8,
+    and([1 =
+         sum([toInt(q20 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q20, q1])
+                  | q20 : int(1..b)])
+             | q1 : int(1..b)]),
+    and([q52 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q53]) | q53 : int(1..b)]) >= 1
+             | q52 : int(1..b)]),
+    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4, q21]) | q21 : int(1..b)] <lex
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4 + 1, q22]) | q22 : int(1..b)]
+             | q4 : int(1..b - 1)]),
+    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q23] = false | q23 : int(1..b)])
+             | q5 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= b,
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..b)]) <= b
+             | q6 : int(1..b)]),
+    b =
+    sum([toInt(q54 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q55])
+                             | q55 : int(1..b)]),
+                    0)
+             | q54 : int(1..b)]),
+    alldifferent_except([toInt(q56 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q56, q57] !=
+                               b + 1)
+                         *
+                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q56, q57],
+                                    0)
+                             | q56 : int(1..b), q57 : int(1..b)],
+                        0),
+    and([q58 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q58, q60] != b + 1)
+                  | q60 : int(1..b)])
+         >= 1
+             | q58 : int(1..b)]),
+    and([q12 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q12, q24] | q24 : int(1..b)] <lex
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q12 + 1, q25] | q25 : int(1..b)]
+             | q12 : int(1..b - 1)]),
+    and([q13 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q13, q26] = 1
+                  | q26 : int(1..b)])
+             | q13 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= b,
+    and([q14 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q15] <
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q15 + 1]
+              \/ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q15] = b + 1
+                  | q15 : int(1..b - 1)])
+             | q14 : int(1..b)]),
+    and([q14 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q16] = b + 1 ->
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q16 + 1] = b + 1
+                  | q16 : int(1..b - 1)])
+             | q14 : int(1..b)]),
+    and([q14 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q17] != b + 1)
+                  | q17 : int(1..b)])
+         <= b
+             | q14 : int(1..b)]),
+    b =
+    sum([toInt(q27 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q27, q29] !=
+                               b + 1)
+                             | q29 : int(1..b)]),
+                    0)
+             | q27 : int(1..b)]),
+    and([q32 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         or([q35 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q35, q36] ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q32, q38] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q32, q38] = q36
+                           | q38 : int(1..b)])
+                       | q36 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q32, q40] != b + 1 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                       [q35, p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q32, q40]]
+                       | q40 : int(1..b)]))
+                 | q35 : int(1..b)])
+             | q32 : int(1..b)]),
+    and([q43 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         or([q46 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q46, q48] != b + 1 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                       [q43, p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q46, q48]]
+                       | q48 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q43, q49] ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q46, q51] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q46, q51] = q49
+                           | q51 : int(1..b)])
+                       | q49 : int(1..b)]))
+                 | q46 : int(1..b)])
+             | q43 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000003.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000004.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000005.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000007.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000008.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_3-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_1_3-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_3-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_1_3.eprime.orig b/tests/exhaustive/issues/286/expected/model_1_3.eprime.orig
deleted file mode 100644
index dd27a70525..0000000000
--- a/tests/exhaustive/issues/286/expected/model_1_3.eprime.orig
+++ /dev/null
@@ -1,132 +0,0 @@
-language ESSENCE' 1.0
-
-given b: int
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..b), int(1..b)] of bool
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b)
-branching on
-    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
-such that
-    sum([toInt(q58 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) | q58 : int(1..b)]) <=
-    sum([1   | q59_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
-               and([q59_ExplicitVarSizeWithDummy[q60] < q59_ExplicitVarSizeWithDummy[q60 + 1] \/
-                    q59_ExplicitVarSizeWithDummy[q60] = b + 1
-                        | q60 : int(1..b - 1)]),
-               and([q59_ExplicitVarSizeWithDummy[q61] = b + 1 -> q59_ExplicitVarSizeWithDummy[q61 + 1] = b + 1
-                        | q61 : int(1..b - 1)])])
-    / 8,
-    and([1 =
-         sum([toInt(q19 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q19, q1])
-                  | q19 : int(1..b)])
-             | q1 : int(1..b)]),
-    and([q49 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q49, q50]) | q50 : int(1..b)]) >= 1
-             | q49 : int(1..b)]),
-    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4, q20]) | q20 : int(1..b)] <lex
-         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4 + 1, q21]) | q21 : int(1..b)]
-             | q4 : int(1..b - 1)]),
-    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q22] = false | q22 : int(1..b)])
-             | q5 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= b,
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..b)]) <= b
-             | q6 : int(1..b)]),
-    b =
-    sum([toInt(q51 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
-         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q51, q52])
-                             | q52 : int(1..b)]),
-                    0)
-             | q51 : int(1..b)]),
-    alldifferent_except([toInt(q53 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q54 <=
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q53])
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q53, q54],
-                                    0)
-                             | q53 : int(1..b), q54 : int(1..b)],
-                        0),
-    and([q55 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q55] >= 1
-             | q55 : int(1..b)]),
-    and([q12 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q12]; int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q12, q23]
-                       | q23 : int(1..b)];
-                      int(1..2)])
-         <lex
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q12 + 1];
-                       int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q12 + 1, q24]
-                       | q24 : int(1..b)];
-                      int(1..2)])
-             | q12 : int(1..b - 1)]),
-    and([q13 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q13] = 0 /\
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q13, q25] = 1
-                  | q25 : int(1..b)])
-             | q13 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= b,
-    and([q14 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q15 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q14] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q14, q15] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q14, q15 + 1]
-                  | q15 : int(1..b - 1)])
-             | q14 : int(1..b)]),
-    and([q14 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q16 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q14] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q14, q16] = 1
-                  | q16 : int(1..b)])
-             | q14 : int(1..b)]),
-    and([q14 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q14] <= b
-             | q14 : int(1..b)]),
-    b =
-    sum([toInt(q26 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q26], 0)
-             | q26 : int(1..b)]),
-    and([q29 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         or([q32 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q32, q33] ->
-                   or([q35 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q29]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q29, q35] =
-                       q33 | q35 : int(1..b)])
-                       | q33 : int(1..b)])
-              /\
-              and([q37 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q29] ->
-                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                       [q32,
-                        p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q29, q37]]
-                       | q37 : int(1..b)]))
-                 | q32 : int(1..b)])
-             | q29 : int(1..b)]),
-    and([q40 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         or([q43 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q45 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43] ->
-                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                       [q40,
-                        p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q43, q45]]
-                       | q45 : int(1..b)])
-              /\
-              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q40, q46] ->
-                   or([q48 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q43, q48] =
-                       q46 | q48 : int(1..b)])
-                       | q46 : int(1..b)]))
-                 | q43 : int(1..b)])
-             | q40 : int(1..b)])
-
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_1_4-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_1_4-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_1_4.eprime b/tests/exhaustive/issues/286/expected/model_1_4.eprime
new file mode 100644
index 0000000000..263a7836c6
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_1_4.eprime
@@ -0,0 +1,91 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..b), int(1..b)] of bool
+find p_PartitionOccurrence_NumParts: int(1..b)
+find p_PartitionOccurrence_WhichPart: matrix indexed by [int(1..b)] of int(1..b)
+find p_PartitionOccurrence_PartSizes: matrix indexed by [int(1..b)] of int(0..b)
+find p_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..b)] of int(1..b)
+branching on
+    [p_PartitionOccurrence_NumParts, p_PartitionOccurrence_WhichPart, p_PartitionOccurrence_PartSizes,
+     p_PartitionOccurrence_FirstIndex, p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
+such that
+    sum([toInt(q51 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) | q51 : int(1..b)]) <=
+    sum([1   | q52_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q52_ExplicitVarSizeWithDummy[q53] < q52_ExplicitVarSizeWithDummy[q53 + 1] \/
+                    q52_ExplicitVarSizeWithDummy[q53] = b + 1
+                        | q53 : int(1..b - 1)]),
+               and([q52_ExplicitVarSizeWithDummy[q54] = b + 1 -> q52_ExplicitVarSizeWithDummy[q54 + 1] = b + 1
+                        | q54 : int(1..b - 1)])])
+    / 8,
+    and([1 =
+         sum([toInt(q19 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q19, q1])
+                  | q19 : int(1..b)])
+             | q1 : int(1..b)]),
+    and([q45 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q45, q46]) | q46 : int(1..b)]) >= 1
+             | q45 : int(1..b)]),
+    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4, q20]) | q20 : int(1..b)] <lex
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q4 + 1, q21]) | q21 : int(1..b)]
+             | q4 : int(1..b - 1)]),
+    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q22] = false | q22 : int(1..b)])
+             | q5 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= b,
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..b)]) <= b
+             | q6 : int(1..b)]),
+    b =
+    sum([toInt(q47 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q47, q48])
+                             | q48 : int(1..b)]),
+                    0)
+             | q47 : int(1..b)]),
+    and([q9 <= p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q9] <= b | q9 : int(1..b)]),
+    and([q9 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q9] = 0 | q9 : int(1..b)]),
+    p_PartitionOccurrence_NumParts <= b,
+    and([q10 <= p_PartitionOccurrence_NumParts -> or([p_PartitionOccurrence_WhichPart[q11] = q10 | q11 : int(1..b)])
+             | q10 : int(3..b)]),
+    p_PartitionOccurrence_NumParts = max([p_PartitionOccurrence_WhichPart[q12] | q12 : int(1..b)]),
+    and([p_PartitionOccurrence_PartSizes[q13] =
+         sum([toInt(p_PartitionOccurrence_WhichPart[q14] = q13) | q14 : int(1..b)])
+             | q13 : int(1..b)]),
+    and([q15 <= p_PartitionOccurrence_NumParts ->
+         and([p_PartitionOccurrence_WhichPart[q16] = q15 -> p_PartitionOccurrence_FirstIndex[q15] <= q16
+                  | q16 : int(1..b)])
+             | q15 : int(1..b)]),
+    and([q15 <= p_PartitionOccurrence_NumParts ->
+         or([p_PartitionOccurrence_WhichPart[q16] = q15 /\ p_PartitionOccurrence_FirstIndex[q15] = q16
+                 | q16 : int(1..b)])
+             | q15 : int(1..b)]),
+    and([q15 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_FirstIndex[q15] = 1 | q15 : int(1..b)]),
+    and([q17 <= p_PartitionOccurrence_NumParts /\ q18 <= p_PartitionOccurrence_NumParts ->
+         (q17 < q18 <-> p_PartitionOccurrence_FirstIndex[q17] < p_PartitionOccurrence_FirstIndex[q18])
+             | q17 : int(1..b), q18 : int(1..b)]),
+    and([q24 <= p_PartitionOccurrence_NumParts ->
+         or([q28 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q28, q29] ->
+                   or([p_PartitionOccurrence_WhichPart[q31] = q24 /\ q31 = q29 | q31 : int(1..b)])
+                       | q29 : int(1..b)])
+              /\
+              and([p_PartitionOccurrence_WhichPart[q33] = q24 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q28, q33]
+                       | q33 : int(1..b)]))
+                 | q28 : int(1..b)])
+             | q24 : int(1..b)]),
+    and([q36 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         or([q38 <= p_PartitionOccurrence_NumParts /\
+             (and([p_PartitionOccurrence_WhichPart[q41] = q38 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q41]
+                       | q41 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q42] ->
+                   or([p_PartitionOccurrence_WhichPart[q44] = q38 /\ q44 = q42 | q44 : int(1..b)])
+                       | q42 : int(1..b)]))
+                 | q38 : int(1..b)])
+             | q36 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000003.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000004.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000007.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000008.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_1-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_2_1-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_2_1.eprime b/tests/exhaustive/issues/286/expected/model_2_1.eprime
new file mode 100644
index 0000000000..cd032fe57a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_1.eprime
@@ -0,0 +1,122 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..b), int(1..b)] of int(1..b + 1)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..b), int(1..b)] of bool
+branching on
+    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
+such that
+    sum([toInt(q63 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) | q63 : int(1..b)]) <=
+    sum([1   | q64_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q64_ExplicitVarSizeWithDummy[q65] < q64_ExplicitVarSizeWithDummy[q65 + 1] \/
+                    q64_ExplicitVarSizeWithDummy[q65] = b + 1
+                        | q65 : int(1..b - 1)]),
+               and([q64_ExplicitVarSizeWithDummy[q66] = b + 1 -> q64_ExplicitVarSizeWithDummy[q66 + 1] = b + 1
+                        | q66 : int(1..b - 1)])])
+    / 8,
+    alldifferent_except([toInt(q51 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q51, q52] !=
+                               b + 1)
+                         *
+                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q51, q52],
+                                    0)
+                             | q51 : int(1..b), q52 : int(1..b)],
+                        0),
+    and([q53 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q53, q55] != b + 1)
+                  | q55 : int(1..b)])
+         >= 1
+             | q53 : int(1..b)]),
+    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4, q20] | q20 : int(1..b)] <lex
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4 + 1, q21] | q21 : int(1..b)]
+             | q4 : int(1..b - 1)]),
+    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q22] = 1
+                  | q22 : int(1..b)])
+             | q5 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= b,
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] <
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7 + 1]
+              \/ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] = b + 1
+                  | q7 : int(1..b - 1)])
+             | q6 : int(1..b)]),
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8] = b + 1 ->
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8 + 1] = b + 1
+                  | q8 : int(1..b - 1)])
+             | q6 : int(1..b)]),
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != b + 1)
+                  | q9 : int(1..b)])
+         <= b
+             | q6 : int(1..b)]),
+    b =
+    sum([toInt(q56 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q56, q58] !=
+                               b + 1)
+                             | q58 : int(1..b)]),
+                    0)
+             | q56 : int(1..b)]),
+    and([1 =
+         sum([toInt(q23 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q23, q12])
+                  | q23 : int(1..b)])
+             | q12 : int(1..b)]),
+    and([q59 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q60]) | q60 : int(1..b)]) >= 1
+             | q59 : int(1..b)]),
+    and([q15 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q15, q24]) | q24 : int(1..b)] <lex
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q15 + 1, q25]) | q25 : int(1..b)]
+             | q15 : int(1..b - 1)]),
+    and([q16 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q16, q26] = false | q26 : int(1..b)])
+             | q16 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= b,
+    and([q17 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q17, q18]) | q18 : int(1..b)]) <= b
+             | q17 : int(1..b)]),
+    b =
+    sum([toInt(q27 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q27, q28])
+                             | q28 : int(1..b)]),
+                    0)
+             | q27 : int(1..b)]),
+    and([q31 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         or([q34 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q36] != b + 1 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                       [q31, p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q36]]
+                       | q36 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q31, q37] ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q39] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q39] = q37
+                           | q39 : int(1..b)])
+                       | q37 : int(1..b)]))
+                 | q34 : int(1..b)])
+             | q31 : int(1..b)]),
+    and([q42 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         or([q45 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q45, q46] ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q48] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q48] = q46
+                           | q48 : int(1..b)])
+                       | q46 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q50] != b + 1 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                       [q45, p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q50]]
+                       | q50 : int(1..b)]))
+                 | q45 : int(1..b)])
+             | q42 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_2-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_2_2-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_2_2.eprime b/tests/exhaustive/issues/286/expected/model_2_2.eprime
new file mode 100644
index 0000000000..8d40391ff8
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_2.eprime
@@ -0,0 +1,65 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..b), int(1..b)] of int(1..b + 1)
+branching on
+    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
+such that
+    sum([toInt(q25 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) | q25 : int(1..b)]) <=
+    sum([1   | q26_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q26_ExplicitVarSizeWithDummy[q27] < q26_ExplicitVarSizeWithDummy[q27 + 1] \/
+                    q26_ExplicitVarSizeWithDummy[q27] = b + 1
+                        | q27 : int(1..b - 1)]),
+               and([q26_ExplicitVarSizeWithDummy[q28] = b + 1 -> q26_ExplicitVarSizeWithDummy[q28 + 1] = b + 1
+                        | q28 : int(1..b - 1)])])
+    / 8,
+    alldifferent_except([toInt(q18 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q18, q19] !=
+                               b + 1)
+                         *
+                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q18, q19],
+                                    0)
+                             | q18 : int(1..b), q19 : int(1..b)],
+                        0),
+    and([q20 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q20, q22] != b + 1)
+                  | q22 : int(1..b)])
+         >= 1
+             | q20 : int(1..b)]),
+    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4, q12] | q12 : int(1..b)] <lex
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4 + 1, q13] | q13 : int(1..b)]
+             | q4 : int(1..b - 1)]),
+    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q14] = 1
+                  | q14 : int(1..b)])
+             | q5 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= b,
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] <
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7 + 1]
+              \/ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] = b + 1
+                  | q7 : int(1..b - 1)])
+             | q6 : int(1..b)]),
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8] = b + 1 ->
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8 + 1] = b + 1
+                  | q8 : int(1..b - 1)])
+             | q6 : int(1..b)]),
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != b + 1)
+                  | q9 : int(1..b)])
+         <= b
+             | q6 : int(1..b)]),
+    b =
+    sum([toInt(q15 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q15, q17] !=
+                               b + 1)
+                             | q17 : int(1..b)]),
+                    0)
+             | q15 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000003.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000004.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000005.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000007.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000008.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_3-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_2_3-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_3-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_2_3.eprime.orig b/tests/exhaustive/issues/286/expected/model_2_3.eprime.orig
deleted file mode 100644
index 4e4bb4ee37..0000000000
--- a/tests/exhaustive/issues/286/expected/model_2_3.eprime.orig
+++ /dev/null
@@ -1,160 +0,0 @@
-language ESSENCE' 1.0
-
-given b: int
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b + 1)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b)
-branching on
-    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
-such that
-    sum([toInt(q70 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) | q70 : int(1..b)]) <=
-    sum([1   | q71_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
-               and([q71_ExplicitVarSizeWithDummy[q72] < q71_ExplicitVarSizeWithDummy[q72 + 1] \/
-                    q71_ExplicitVarSizeWithDummy[q72] = b + 1
-                        | q72 : int(1..b - 1)]),
-               and([q71_ExplicitVarSizeWithDummy[q73] = b + 1 -> q71_ExplicitVarSizeWithDummy[q73 + 1] = b + 1
-                        | q73 : int(1..b - 1)])])
-    / 8,
-    alldifferent_except([toInt(q57 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q57, q58] !=
-                               b + 1)
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q57, q58],
-                                    0)
-                             | q57 : int(1..b), q58 : int(1..b)],
-                        0),
-    and([q59 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q61] != b + 1)
-                  | q61 : int(1..b)])
-         >= 1
-             | q59 : int(1..b)]),
-    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4, q22] | q22 : int(1..b)] <lex
-         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4 + 1, q23] | q23 : int(1..b)]
-             | q4 : int(1..b - 1)]),
-    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q24] = 1
-                  | q24 : int(1..b)])
-             | q5 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= b,
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7 + 1]
-              \/ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] = b + 1
-                  | q7 : int(1..b - 1)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8] = b + 1 ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8 + 1] = b + 1
-                  | q8 : int(1..b - 1)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != b + 1)
-                  | q9 : int(1..b)])
-         <= b
-             | q6 : int(1..b)]),
-    b =
-    sum([toInt(q62 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
-         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q64] !=
-                               b + 1)
-                             | q64 : int(1..b)]),
-                    0)
-             | q62 : int(1..b)]),
-    alldifferent_except([toInt(q65 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q66 <=
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q65])
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q65, q66],
-                                    0)
-                             | q65 : int(1..b), q66 : int(1..b)],
-                        0),
-    and([q67 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q67] >= 1
-             | q67 : int(1..b)]),
-    and([q15 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q15]; int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q15, q25]
-                       | q25 : int(1..b)];
-                      int(1..2)])
-         <lex
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q15 + 1];
-                       int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q15 + 1, q26]
-                       | q26 : int(1..b)];
-                      int(1..2)])
-             | q15 : int(1..b - 1)]),
-    and([q16 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q16] = 0 /\
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q16, q27] = 1
-                  | q27 : int(1..b)])
-             | q16 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= b,
-    and([q17 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q18 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q17] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q17, q18] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q17, q18 + 1]
-                  | q18 : int(1..b - 1)])
-             | q17 : int(1..b)]),
-    and([q17 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q19 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q17] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q17, q19] = 1
-                  | q19 : int(1..b)])
-             | q17 : int(1..b)]),
-    and([q17 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q17] <= b
-             | q17 : int(1..b)]),
-    b =
-    sum([toInt(q28 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q28], 0)
-             | q28 : int(1..b)]),
-    and([q31 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         or([q34 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q36] != b + 1 ->
-                   or([q38 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q31, q38] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q36]
-                           | q38 : int(1..b)])
-                       | q36 : int(1..b)])
-              /\
-              and([q40 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31] ->
-                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q42] != b + 1
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q42] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q31, q40]
-                           | q42 : int(1..b)])
-                       | q40 : int(1..b)]))
-                 | q34 : int(1..b)])
-             | q31 : int(1..b)]),
-    and([q45 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         or([q48 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q50 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q48] ->
-                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q52] != b + 1
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q52] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q48, q50]
-                           | q52 : int(1..b)])
-                       | q50 : int(1..b)])
-              /\
-              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q54] != b + 1 ->
-                   or([q56 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q48]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q48, q56] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q54]
-                           | q56 : int(1..b)])
-                       | q54 : int(1..b)]))
-                 | q48 : int(1..b)])
-             | q45 : int(1..b)])
-
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_2_4-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_2_4-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_2_4.eprime b/tests/exhaustive/issues/286/expected/model_2_4.eprime
new file mode 100644
index 0000000000..f24fc7e366
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_2_4.eprime
@@ -0,0 +1,121 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..b), int(1..b)] of int(1..b + 1)
+find p_PartitionOccurrence_NumParts: int(1..b)
+find p_PartitionOccurrence_WhichPart: matrix indexed by [int(1..b)] of int(1..b)
+find p_PartitionOccurrence_PartSizes: matrix indexed by [int(1..b)] of int(0..b)
+find p_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..b)] of int(1..b)
+branching on
+    [p_PartitionOccurrence_NumParts, p_PartitionOccurrence_WhichPart, p_PartitionOccurrence_PartSizes,
+     p_PartitionOccurrence_FirstIndex, p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
+such that
+    sum([toInt(q63 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) | q63 : int(1..b)]) <=
+    sum([1   | q64_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q64_ExplicitVarSizeWithDummy[q65] < q64_ExplicitVarSizeWithDummy[q65 + 1] \/
+                    q64_ExplicitVarSizeWithDummy[q65] = b + 1
+                        | q65 : int(1..b - 1)]),
+               and([q64_ExplicitVarSizeWithDummy[q66] = b + 1 -> q64_ExplicitVarSizeWithDummy[q66 + 1] = b + 1
+                        | q66 : int(1..b - 1)])])
+    / 8,
+    alldifferent_except([toInt(q53 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q53, q54] !=
+                               b + 1)
+                         *
+                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q53, q54],
+                                    0)
+                             | q53 : int(1..b), q54 : int(1..b)],
+                        0),
+    and([q55 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q55, q57] != b + 1)
+                  | q57 : int(1..b)])
+         >= 1
+             | q55 : int(1..b)]),
+    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4, q22] | q22 : int(1..b)] <lex
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q4 + 1, q23] | q23 : int(1..b)]
+             | q4 : int(1..b - 1)]),
+    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q24] = 1
+                  | q24 : int(1..b)])
+             | q5 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= b,
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] <
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7 + 1]
+              \/ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q7] = b + 1
+                  | q7 : int(1..b - 1)])
+             | q6 : int(1..b)]),
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8] = b + 1 ->
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q8 + 1] = b + 1
+                  | q8 : int(1..b - 1)])
+             | q6 : int(1..b)]),
+    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != b + 1)
+                  | q9 : int(1..b)])
+         <= b
+             | q6 : int(1..b)]),
+    b =
+    sum([toInt(q58 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q58, q60] !=
+                               b + 1)
+                             | q60 : int(1..b)]),
+                    0)
+             | q58 : int(1..b)]),
+    and([q12 <= p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q12] <= b | q12 : int(1..b)]),
+    and([q12 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q12] = 0 | q12 : int(1..b)]),
+    p_PartitionOccurrence_NumParts <= b,
+    and([q13 <= p_PartitionOccurrence_NumParts -> or([p_PartitionOccurrence_WhichPart[q14] = q13 | q14 : int(1..b)])
+             | q13 : int(3..b)]),
+    p_PartitionOccurrence_NumParts = max([p_PartitionOccurrence_WhichPart[q15] | q15 : int(1..b)]),
+    and([p_PartitionOccurrence_PartSizes[q16] =
+         sum([toInt(p_PartitionOccurrence_WhichPart[q17] = q16) | q17 : int(1..b)])
+             | q16 : int(1..b)]),
+    and([q18 <= p_PartitionOccurrence_NumParts ->
+         and([p_PartitionOccurrence_WhichPart[q19] = q18 -> p_PartitionOccurrence_FirstIndex[q18] <= q19
+                  | q19 : int(1..b)])
+             | q18 : int(1..b)]),
+    and([q18 <= p_PartitionOccurrence_NumParts ->
+         or([p_PartitionOccurrence_WhichPart[q19] = q18 /\ p_PartitionOccurrence_FirstIndex[q18] = q19
+                 | q19 : int(1..b)])
+             | q18 : int(1..b)]),
+    and([q18 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_FirstIndex[q18] = 1 | q18 : int(1..b)]),
+    and([q20 <= p_PartitionOccurrence_NumParts /\ q21 <= p_PartitionOccurrence_NumParts ->
+         (q20 < q21 <-> p_PartitionOccurrence_FirstIndex[q20] < p_PartitionOccurrence_FirstIndex[q21])
+             | q20 : int(1..b), q21 : int(1..b)]),
+    and([q26 <= p_PartitionOccurrence_NumParts ->
+         or([q30 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q32] != b + 1 ->
+                   or([p_PartitionOccurrence_WhichPart[q34] = q26 /\
+                       q34 = p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q32]
+                           | q34 : int(1..b)])
+                       | q32 : int(1..b)])
+              /\
+              and([p_PartitionOccurrence_WhichPart[q36] = q26 ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q38] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q38] = q36
+                           | q38 : int(1..b)])
+                       | q36 : int(1..b)]))
+                 | q30 : int(1..b)])
+             | q26 : int(1..b)]),
+    and([q41 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         or([q43 <= p_PartitionOccurrence_NumParts /\
+             (and([p_PartitionOccurrence_WhichPart[q46] = q43 ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q41, q48] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q41, q48] = q46
+                           | q48 : int(1..b)])
+                       | q46 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q41, q50] != b + 1 ->
+                   or([p_PartitionOccurrence_WhichPart[q52] = q43 /\
+                       q52 = p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q41, q50]
+                           | q52 : int(1..b)])
+                       | q50 : int(1..b)]))
+                 | q43 : int(1..b)])
+             | q41 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000003.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000004.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000007.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000008.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_1-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_3_1-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_1-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_3_1.eprime.orig b/tests/exhaustive/issues/286/expected/model_3_1.eprime.orig
deleted file mode 100644
index dd5e035a04..0000000000
--- a/tests/exhaustive/issues/286/expected/model_3_1.eprime.orig
+++ /dev/null
@@ -1,132 +0,0 @@
-language ESSENCE' 1.0
-
-given b: int
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..b), int(1..b)] of bool
-branching on
-    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    sum([toInt(q58 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) | q58 : int(1..b)]) <=
-    sum([1   | q59_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
-               and([q59_ExplicitVarSizeWithDummy[q60] < q59_ExplicitVarSizeWithDummy[q60 + 1] \/
-                    q59_ExplicitVarSizeWithDummy[q60] = b + 1
-                        | q60 : int(1..b - 1)]),
-               and([q59_ExplicitVarSizeWithDummy[q61] = b + 1 -> q59_ExplicitVarSizeWithDummy[q61 + 1] = b + 1
-                        | q61 : int(1..b - 1)])])
-    / 8,
-    alldifferent_except([toInt(q50 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q51 <=
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q50])
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q50, q51],
-                                    0)
-                             | q50 : int(1..b), q51 : int(1..b)],
-                        0),
-    and([q52 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52] >= 1
-             | q52 : int(1..b)]),
-    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4]; int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4, q19]
-                       | q19 : int(1..b)];
-                      int(1..2)])
-         <lex
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1];
-                       int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4 + 1, q20]
-                       | q20 : int(1..b)];
-                      int(1..2)])
-             | q4 : int(1..b - 1)]),
-    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q21] = 1
-                  | q21 : int(1..b)])
-             | q5 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= b,
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q7 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7 + 1]
-                  | q7 : int(1..b - 1)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..b)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= b
-             | q6 : int(1..b)]),
-    b =
-    sum([toInt(q53 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q53], 0)
-             | q53 : int(1..b)]),
-    and([1 =
-         sum([toInt(q22 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q22, q11])
-                  | q22 : int(1..b)])
-             | q11 : int(1..b)]),
-    and([q54 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q55]) | q55 : int(1..b)]) >= 1
-             | q54 : int(1..b)]),
-    and([q14 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q14, q23]) | q23 : int(1..b)] <lex
-         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q14 + 1, q24]) | q24 : int(1..b)]
-             | q14 : int(1..b - 1)]),
-    and([q15 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q15, q25] = false | q25 : int(1..b)])
-             | q15 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= b,
-    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q16, q17]) | q17 : int(1..b)]) <= b
-             | q16 : int(1..b)]),
-    b =
-    sum([toInt(q26 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
-         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q26, q27])
-                             | q27 : int(1..b)]),
-                    0)
-             | q26 : int(1..b)]),
-    and([q30 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         or([q33 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q35 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q33] ->
-                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                       [q30,
-                        p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q33, q35]]
-                       | q35 : int(1..b)])
-              /\
-              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q36] ->
-                   or([q38 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q33]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q33, q38] =
-                       q36 | q38 : int(1..b)])
-                       | q36 : int(1..b)]))
-                 | q33 : int(1..b)])
-             | q30 : int(1..b)]),
-    and([q41 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         or([q44 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q45] ->
-                   or([q47 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q41]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q41, q47] =
-                       q45 | q47 : int(1..b)])
-                       | q45 : int(1..b)])
-              /\
-              and([q49 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q41] ->
-                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                       [q44,
-                        p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q41, q49]]
-                       | q49 : int(1..b)]))
-                 | q44 : int(1..b)])
-             | q41 : int(1..b)])
-
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_2-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_3_2-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_2-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_3_2.eprime.orig b/tests/exhaustive/issues/286/expected/model_3_2.eprime.orig
deleted file mode 100644
index ca91efa6d5..0000000000
--- a/tests/exhaustive/issues/286/expected/model_3_2.eprime.orig
+++ /dev/null
@@ -1,160 +0,0 @@
-language ESSENCE' 1.0
-
-given b: int
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b + 1)
-branching on
-    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    sum([toInt(q70 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) | q70 : int(1..b)]) <=
-    sum([1   | q71_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
-               and([q71_ExplicitVarSizeWithDummy[q72] < q71_ExplicitVarSizeWithDummy[q72 + 1] \/
-                    q71_ExplicitVarSizeWithDummy[q72] = b + 1
-                        | q72 : int(1..b - 1)]),
-               and([q71_ExplicitVarSizeWithDummy[q73] = b + 1 -> q71_ExplicitVarSizeWithDummy[q73 + 1] = b + 1
-                        | q73 : int(1..b - 1)])])
-    / 8,
-    alldifferent_except([toInt(q59 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q60 <=
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q59])
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q59, q60],
-                                    0)
-                             | q59 : int(1..b), q60 : int(1..b)],
-                        0),
-    and([q61 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q61] >= 1
-             | q61 : int(1..b)]),
-    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4]; int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4, q22]
-                       | q22 : int(1..b)];
-                      int(1..2)])
-         <lex
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1];
-                       int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4 + 1, q23]
-                       | q23 : int(1..b)];
-                      int(1..2)])
-             | q4 : int(1..b - 1)]),
-    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q24] = 1
-                  | q24 : int(1..b)])
-             | q5 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= b,
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q7 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7 + 1]
-                  | q7 : int(1..b - 1)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..b)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= b
-             | q6 : int(1..b)]),
-    b =
-    sum([toInt(q62 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q62], 0)
-             | q62 : int(1..b)]),
-    alldifferent_except([toInt(q63 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q64] !=
-                               b + 1)
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q63, q64],
-                                    0)
-                             | q63 : int(1..b), q64 : int(1..b)],
-                        0),
-    and([q65 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q67] != b + 1)
-                  | q67 : int(1..b)])
-         >= 1
-             | q65 : int(1..b)]),
-    and([q14 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q25] | q25 : int(1..b)] <lex
-         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14 + 1, q26] | q26 : int(1..b)]
-             | q14 : int(1..b - 1)]),
-    and([q15 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q15, q27] = 1
-                  | q27 : int(1..b)])
-             | q15 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= b,
-    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q17] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q17 + 1]
-              \/ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q17] = b + 1
-                  | q17 : int(1..b - 1)])
-             | q16 : int(1..b)]),
-    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q18] = b + 1 ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q18 + 1] = b + 1
-                  | q18 : int(1..b - 1)])
-             | q16 : int(1..b)]),
-    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q19] != b + 1)
-                  | q19 : int(1..b)])
-         <= b
-             | q16 : int(1..b)]),
-    b =
-    sum([toInt(q28 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
-         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q28, q30] !=
-                               b + 1)
-                             | q30 : int(1..b)]),
-                    0)
-             | q28 : int(1..b)]),
-    and([q33 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         or([q36 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q38 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q36] ->
-                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q33, q40] != b + 1
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q33, q40] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36, q38]
-                           | q40 : int(1..b)])
-                       | q38 : int(1..b)])
-              /\
-              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q33, q42] != b + 1 ->
-                   or([q44 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q36]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36, q44] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q33, q42]
-                           | q44 : int(1..b)])
-                       | q42 : int(1..b)]))
-                 | q36 : int(1..b)])
-             | q33 : int(1..b)]),
-    and([q47 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         or([q50 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q52] != b + 1 ->
-                   or([q54 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q47]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q47, q54] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q52]
-                           | q54 : int(1..b)])
-                       | q52 : int(1..b)])
-              /\
-              and([q56 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q47] ->
-                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q58] != b + 1
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q58] =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q47, q56]
-                           | q58 : int(1..b)])
-                       | q56 : int(1..b)]))
-                 | q50 : int(1..b)])
-             | q47 : int(1..b)])
-
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000003.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000004.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000005.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000007.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000008.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_3-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_3_3-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_3-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_3_3.eprime.orig b/tests/exhaustive/issues/286/expected/model_3_3.eprime.orig
deleted file mode 100644
index 22f502666a..0000000000
--- a/tests/exhaustive/issues/286/expected/model_3_3.eprime.orig
+++ /dev/null
@@ -1,71 +0,0 @@
-language ESSENCE' 1.0
-
-given b: int
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b)
-branching on
-    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    sum([toInt(q20 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) | q20 : int(1..b)]) <=
-    sum([1   | q21_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
-               and([q21_ExplicitVarSizeWithDummy[q22] < q21_ExplicitVarSizeWithDummy[q22 + 1] \/
-                    q21_ExplicitVarSizeWithDummy[q22] = b + 1
-                        | q22 : int(1..b - 1)]),
-               and([q21_ExplicitVarSizeWithDummy[q23] = b + 1 -> q21_ExplicitVarSizeWithDummy[q23 + 1] = b + 1
-                        | q23 : int(1..b - 1)])])
-    / 8,
-    alldifferent_except([toInt(q15 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q16 <=
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q15])
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q15, q16],
-                                    0)
-                             | q15 : int(1..b), q16 : int(1..b)],
-                        0),
-    and([q17 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q17] >= 1
-             | q17 : int(1..b)]),
-    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4]; int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4, q11]
-                       | q11 : int(1..b)];
-                      int(1..2)])
-         <lex
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1];
-                       int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4 + 1, q12]
-                       | q12 : int(1..b)];
-                      int(1..2)])
-             | q4 : int(1..b - 1)]),
-    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q13] = 1
-                  | q13 : int(1..b)])
-             | q5 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= b,
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q7 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7 + 1]
-                  | q7 : int(1..b - 1)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..b)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= b
-             | q6 : int(1..b)]),
-    b =
-    sum([toInt(q14 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q14], 0)
-             | q14 : int(1..b)])
-
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_3_4-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_3_4-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_3_4-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_3_4.eprime.orig b/tests/exhaustive/issues/286/expected/model_3_4.eprime.orig
deleted file mode 100644
index 6e0f9e3295..0000000000
--- a/tests/exhaustive/issues/286/expected/model_3_4.eprime.orig
+++ /dev/null
@@ -1,131 +0,0 @@
-language ESSENCE' 1.0
-
-given b: int
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b)
-find p_PartitionOccurrence_NumParts: int(1..b)
-find p_PartitionOccurrence_WhichPart: matrix indexed by [int(1..b)] of int(1..b)
-find p_PartitionOccurrence_PartSizes: matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..b)] of int(1..b)
-branching on
-    [p_PartitionOccurrence_NumParts, p_PartitionOccurrence_WhichPart, p_PartitionOccurrence_PartSizes,
-     p_PartitionOccurrence_FirstIndex, p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    sum([toInt(q58 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) | q58 : int(1..b)]) <=
-    sum([1   | q59_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
-               and([q59_ExplicitVarSizeWithDummy[q60] < q59_ExplicitVarSizeWithDummy[q60 + 1] \/
-                    q59_ExplicitVarSizeWithDummy[q60] = b + 1
-                        | q60 : int(1..b - 1)]),
-               and([q59_ExplicitVarSizeWithDummy[q61] = b + 1 -> q59_ExplicitVarSizeWithDummy[q61 + 1] = b + 1
-                        | q61 : int(1..b - 1)])])
-    / 8,
-    alldifferent_except([toInt(q52 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q53 <=
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q52])
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q52, q53],
-                                    0)
-                             | q52 : int(1..b), q53 : int(1..b)],
-                        0),
-    and([q54 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54] >= 1
-             | q54 : int(1..b)]),
-    and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4]; int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4, q21]
-                       | q21 : int(1..b)];
-                      int(1..2)])
-         <lex
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1];
-                       int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q4 + 1, q22]
-                       | q22 : int(1..b)];
-                      int(1..2)])
-             | q4 : int(1..b - 1)]),
-    and([q5 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q23] = 1
-                  | q23 : int(1..b)])
-             | q5 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= b,
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q7 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7 + 1]
-                  | q7 : int(1..b - 1)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..b)])
-             | q6 : int(1..b)]),
-    and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= b
-             | q6 : int(1..b)]),
-    b =
-    sum([toInt(q55 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q55], 0)
-             | q55 : int(1..b)]),
-    and([q11 <= p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q11] <= b | q11 : int(1..b)]),
-    and([q11 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q11] = 0 | q11 : int(1..b)]),
-    p_PartitionOccurrence_NumParts <= b,
-    and([q12 <= p_PartitionOccurrence_NumParts -> or([p_PartitionOccurrence_WhichPart[q13] = q12 | q13 : int(1..b)])
-             | q12 : int(3..b)]),
-    p_PartitionOccurrence_NumParts = max([p_PartitionOccurrence_WhichPart[q14] | q14 : int(1..b)]),
-    and([p_PartitionOccurrence_PartSizes[q15] =
-         sum([toInt(p_PartitionOccurrence_WhichPart[q16] = q15) | q16 : int(1..b)])
-             | q15 : int(1..b)]),
-    and([q17 <= p_PartitionOccurrence_NumParts ->
-         and([p_PartitionOccurrence_WhichPart[q18] = q17 -> p_PartitionOccurrence_FirstIndex[q17] <= q18
-                  | q18 : int(1..b)])
-             | q17 : int(1..b)]),
-    and([q17 <= p_PartitionOccurrence_NumParts ->
-         or([p_PartitionOccurrence_WhichPart[q18] = q17 /\ p_PartitionOccurrence_FirstIndex[q17] = q18
-                 | q18 : int(1..b)])
-             | q17 : int(1..b)]),
-    and([q17 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_FirstIndex[q17] = 1 | q17 : int(1..b)]),
-    and([q19 <= p_PartitionOccurrence_NumParts /\ q20 <= p_PartitionOccurrence_NumParts ->
-         (q19 < q20 <-> p_PartitionOccurrence_FirstIndex[q19] < p_PartitionOccurrence_FirstIndex[q20])
-             | q19 : int(1..b), q20 : int(1..b)]),
-    and([q25 <= p_PartitionOccurrence_NumParts ->
-         or([q29 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q31 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q29] ->
-                   or([p_PartitionOccurrence_WhichPart[q33] = q25 /\
-                       q33 =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q29, q31]
-                           | q33 : int(1..b)])
-                       | q31 : int(1..b)])
-              /\
-              and([p_PartitionOccurrence_WhichPart[q35] = q25 ->
-                   or([q37 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q29]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q29, q37] =
-                       q35 | q37 : int(1..b)])
-                       | q35 : int(1..b)]))
-                 | q29 : int(1..b)])
-             | q25 : int(1..b)]),
-    and([q40 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         or([q42 <= p_PartitionOccurrence_NumParts /\
-             (and([p_PartitionOccurrence_WhichPart[q45] = q42 ->
-                   or([q47 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q40, q47] =
-                       q45 | q47 : int(1..b)])
-                       | q45 : int(1..b)])
-              /\
-              and([q49 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40] ->
-                   or([p_PartitionOccurrence_WhichPart[q51] = q42 /\
-                       q51 =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q40, q49]
-                           | q51 : int(1..b)])
-                       | q49 : int(1..b)]))
-                 | q42 : int(1..b)])
-             | q40 : int(1..b)])
-
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000003.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000004.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000007.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000008.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_1-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_4_1-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_4_1.eprime b/tests/exhaustive/issues/286/expected/model_4_1.eprime
new file mode 100644
index 0000000000..361ef22b1b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_1.eprime
@@ -0,0 +1,88 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionOccurrence_NumParts: int(1..b)
+find p_PartitionOccurrence_WhichPart: matrix indexed by [int(1..b)] of int(1..b)
+find p_PartitionOccurrence_PartSizes: matrix indexed by [int(1..b)] of int(0..b)
+find p_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..b)] of int(1..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..b), int(1..b)] of bool
+branching on
+    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence, p_PartitionOccurrence_NumParts,
+     p_PartitionOccurrence_WhichPart, p_PartitionOccurrence_PartSizes, p_PartitionOccurrence_FirstIndex]
+such that
+    sum([toInt(q50 <= p_PartitionOccurrence_NumParts) | q50 : int(1..b)]) <=
+    sum([1   | q52_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q52_ExplicitVarSizeWithDummy[q53] < q52_ExplicitVarSizeWithDummy[q53 + 1] \/
+                    q52_ExplicitVarSizeWithDummy[q53] = b + 1
+                        | q53 : int(1..b - 1)]),
+               and([q52_ExplicitVarSizeWithDummy[q54] = b + 1 -> q52_ExplicitVarSizeWithDummy[q54 + 1] = b + 1
+                        | q54 : int(1..b - 1)])])
+    / 8,
+    and([q1 <= p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] <= b | q1 : int(1..b)]),
+    and([q1 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..b)]),
+    p_PartitionOccurrence_NumParts <= b,
+    and([q2 <= p_PartitionOccurrence_NumParts -> or([p_PartitionOccurrence_WhichPart[q3] = q2 | q3 : int(1..b)])
+             | q2 : int(3..b)]),
+    p_PartitionOccurrence_NumParts = max([p_PartitionOccurrence_WhichPart[q4] | q4 : int(1..b)]),
+    and([p_PartitionOccurrence_PartSizes[q5] = sum([toInt(p_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..b)])
+             | q5 : int(1..b)]),
+    and([q7 <= p_PartitionOccurrence_NumParts ->
+         and([p_PartitionOccurrence_WhichPart[q8] = q7 -> p_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..b)])
+             | q7 : int(1..b)]),
+    and([q7 <= p_PartitionOccurrence_NumParts ->
+         or([p_PartitionOccurrence_WhichPart[q8] = q7 /\ p_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..b)])
+             | q7 : int(1..b)]),
+    and([q7 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..b)]),
+    and([q9 <= p_PartitionOccurrence_NumParts /\ q10 <= p_PartitionOccurrence_NumParts ->
+         (q9 < q10 <-> p_PartitionOccurrence_FirstIndex[q9] < p_PartitionOccurrence_FirstIndex[q10])
+             | q9 : int(1..b), q10 : int(1..b)]),
+    and([1 =
+         sum([toInt(q19 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q19, q11])
+                  | q19 : int(1..b)])
+             | q11 : int(1..b)]),
+    and([q47 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q47, q48]) | q48 : int(1..b)]) >= 1
+             | q47 : int(1..b)]),
+    and([q14 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q14, q20]) | q20 : int(1..b)] <lex
+         [-toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q14 + 1, q21]) | q21 : int(1..b)]
+             | q14 : int(1..b - 1)]),
+    and([q15 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q15, q22] = false | q22 : int(1..b)])
+             | q15 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= b,
+    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q16, q17]) | q17 : int(1..b)]) <= b
+             | q16 : int(1..b)]),
+    b =
+    sum([toInt(q23 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q23, q24])
+                             | q24 : int(1..b)]),
+                    0)
+             | q23 : int(1..b)]),
+    and([q27 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         or([q29 <= p_PartitionOccurrence_NumParts /\
+             (and([p_PartitionOccurrence_WhichPart[q32] = q29 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q27, q32]
+                       | q32 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q27, q33] ->
+                   or([p_PartitionOccurrence_WhichPart[q35] = q29 /\ q35 = q33 | q35 : int(1..b)])
+                       | q33 : int(1..b)]))
+                 | q29 : int(1..b)])
+             | q27 : int(1..b)]),
+    and([q37 <= p_PartitionOccurrence_NumParts ->
+         or([q41 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q41, q42] ->
+                   or([p_PartitionOccurrence_WhichPart[q44] = q37 /\ q44 = q42 | q44 : int(1..b)])
+                       | q42 : int(1..b)])
+              /\
+              and([p_PartitionOccurrence_WhichPart[q46] = q37 ->
+                   p_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q41, q46]
+                       | q46 : int(1..b)]))
+                 | q41 : int(1..b)])
+             | q37 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_2-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_4_2-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_4_2.eprime b/tests/exhaustive/issues/286/expected/model_4_2.eprime
new file mode 100644
index 0000000000..6786740b4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_2.eprime
@@ -0,0 +1,118 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionOccurrence_NumParts: int(1..b)
+find p_PartitionOccurrence_WhichPart: matrix indexed by [int(1..b)] of int(1..b)
+find p_PartitionOccurrence_PartSizes: matrix indexed by [int(1..b)] of int(0..b)
+find p_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..b)] of int(1..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..b)
+find p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..b), int(1..b)] of int(1..b + 1)
+branching on
+    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy, p_PartitionOccurrence_NumParts,
+     p_PartitionOccurrence_WhichPart, p_PartitionOccurrence_PartSizes, p_PartitionOccurrence_FirstIndex]
+such that
+    sum([toInt(q62 <= p_PartitionOccurrence_NumParts) | q62 : int(1..b)]) <=
+    sum([1   | q64_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q64_ExplicitVarSizeWithDummy[q65] < q64_ExplicitVarSizeWithDummy[q65 + 1] \/
+                    q64_ExplicitVarSizeWithDummy[q65] = b + 1
+                        | q65 : int(1..b - 1)]),
+               and([q64_ExplicitVarSizeWithDummy[q66] = b + 1 -> q64_ExplicitVarSizeWithDummy[q66 + 1] = b + 1
+                        | q66 : int(1..b - 1)])])
+    / 8,
+    and([q1 <= p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] <= b | q1 : int(1..b)]),
+    and([q1 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..b)]),
+    p_PartitionOccurrence_NumParts <= b,
+    and([q2 <= p_PartitionOccurrence_NumParts -> or([p_PartitionOccurrence_WhichPart[q3] = q2 | q3 : int(1..b)])
+             | q2 : int(3..b)]),
+    p_PartitionOccurrence_NumParts = max([p_PartitionOccurrence_WhichPart[q4] | q4 : int(1..b)]),
+    and([p_PartitionOccurrence_PartSizes[q5] = sum([toInt(p_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..b)])
+             | q5 : int(1..b)]),
+    and([q7 <= p_PartitionOccurrence_NumParts ->
+         and([p_PartitionOccurrence_WhichPart[q8] = q7 -> p_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..b)])
+             | q7 : int(1..b)]),
+    and([q7 <= p_PartitionOccurrence_NumParts ->
+         or([p_PartitionOccurrence_WhichPart[q8] = q7 /\ p_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..b)])
+             | q7 : int(1..b)]),
+    and([q7 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..b)]),
+    and([q9 <= p_PartitionOccurrence_NumParts /\ q10 <= p_PartitionOccurrence_NumParts ->
+         (q9 < q10 <-> p_PartitionOccurrence_FirstIndex[q9] < p_PartitionOccurrence_FirstIndex[q10])
+             | q9 : int(1..b), q10 : int(1..b)]),
+    alldifferent_except([toInt(q56 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q56, q57] !=
+                               b + 1)
+                         *
+                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q56, q57],
+                                    0)
+                             | q56 : int(1..b), q57 : int(1..b)],
+                        0),
+    and([q58 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q58, q60] != b + 1)
+                  | q60 : int(1..b)])
+         >= 1
+             | q58 : int(1..b)]),
+    and([q14 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q22] | q22 : int(1..b)] <lex
+         [p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14 + 1, q23] | q23 : int(1..b)]
+             | q14 : int(1..b - 1)]),
+    and([q15 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q15, q24] = 1
+                  | q24 : int(1..b)])
+             | q15 : int(1..b)]),
+    p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= b,
+    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q17] <
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q17 + 1]
+              \/ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q17] = b + 1
+                  | q17 : int(1..b - 1)])
+             | q16 : int(1..b)]),
+    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q18] = b + 1 ->
+              p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q18 + 1] = b + 1
+                  | q18 : int(1..b - 1)])
+             | q16 : int(1..b)]),
+    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q19] != b + 1)
+                  | q19 : int(1..b)])
+         <= b
+             | q16 : int(1..b)]),
+    b =
+    sum([toInt(q25 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q25, q27] !=
+                               b + 1)
+                             | q27 : int(1..b)]),
+                    0)
+             | q25 : int(1..b)]),
+    and([q30 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         or([q32 <= p_PartitionOccurrence_NumParts /\
+             (and([p_PartitionOccurrence_WhichPart[q35] = q32 ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q37] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q37] = q35
+                           | q37 : int(1..b)])
+                       | q35 : int(1..b)])
+              /\
+              and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q39] != b + 1 ->
+                   or([p_PartitionOccurrence_WhichPart[q41] = q32 /\
+                       q41 = p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q39]
+                           | q41 : int(1..b)])
+                       | q39 : int(1..b)]))
+                 | q32 : int(1..b)])
+             | q30 : int(1..b)]),
+    and([q43 <= p_PartitionOccurrence_NumParts ->
+         or([q47 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+             (and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q49] != b + 1 ->
+                   or([p_PartitionOccurrence_WhichPart[q51] = q43 /\
+                       q51 = p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q49]
+                           | q51 : int(1..b)])
+                       | q49 : int(1..b)])
+              /\
+              and([p_PartitionOccurrence_WhichPart[q53] = q43 ->
+                   or([p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q55] != b + 1
+                       /\ p_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q55] = q53
+                           | q55 : int(1..b)])
+                       | q53 : int(1..b)]))
+                 | q47 : int(1..b)])
+             | q43 : int(1..b)])
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000002.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000003.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000004.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000005.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000006.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000007.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000008.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_3-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_4_3-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_3-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_4_3.eprime.orig b/tests/exhaustive/issues/286/expected/model_4_3.eprime.orig
deleted file mode 100644
index 69b657a99f..0000000000
--- a/tests/exhaustive/issues/286/expected/model_4_3.eprime.orig
+++ /dev/null
@@ -1,129 +0,0 @@
-language ESSENCE' 1.0
-
-given b: int
-find p_PartitionOccurrence_NumParts: int(1..b)
-find p_PartitionOccurrence_WhichPart: matrix indexed by [int(1..b)] of int(1..b)
-find p_PartitionOccurrence_PartSizes: matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..b)] of int(1..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..b)] of int(0..b)
-find p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..b), int(1..b)] of int(1..b)
-branching on
-    [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values,
-     p_PartitionOccurrence_NumParts, p_PartitionOccurrence_WhichPart, p_PartitionOccurrence_PartSizes,
-     p_PartitionOccurrence_FirstIndex]
-such that
-    sum([toInt(q57 <= p_PartitionOccurrence_NumParts) | q57 : int(1..b)]) <=
-    sum([1   | q59_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
-               and([q59_ExplicitVarSizeWithDummy[q60] < q59_ExplicitVarSizeWithDummy[q60 + 1] \/
-                    q59_ExplicitVarSizeWithDummy[q60] = b + 1
-                        | q60 : int(1..b - 1)]),
-               and([q59_ExplicitVarSizeWithDummy[q61] = b + 1 -> q59_ExplicitVarSizeWithDummy[q61 + 1] = b + 1
-                        | q61 : int(1..b - 1)])])
-    / 8,
-    and([q1 <= p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] <= b | q1 : int(1..b)]),
-    and([q1 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..b)]),
-    p_PartitionOccurrence_NumParts <= b,
-    and([q2 <= p_PartitionOccurrence_NumParts -> or([p_PartitionOccurrence_WhichPart[q3] = q2 | q3 : int(1..b)])
-             | q2 : int(3..b)]),
-    p_PartitionOccurrence_NumParts = max([p_PartitionOccurrence_WhichPart[q4] | q4 : int(1..b)]),
-    and([p_PartitionOccurrence_PartSizes[q5] = sum([toInt(p_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..b)])
-             | q5 : int(1..b)]),
-    and([q7 <= p_PartitionOccurrence_NumParts ->
-         and([p_PartitionOccurrence_WhichPart[q8] = q7 -> p_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..b)])
-             | q7 : int(1..b)]),
-    and([q7 <= p_PartitionOccurrence_NumParts ->
-         or([p_PartitionOccurrence_WhichPart[q8] = q7 /\ p_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..b)])
-             | q7 : int(1..b)]),
-    and([q7 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..b)]),
-    and([q9 <= p_PartitionOccurrence_NumParts /\ q10 <= p_PartitionOccurrence_NumParts ->
-         (q9 < q10 <-> p_PartitionOccurrence_FirstIndex[q9] < p_PartitionOccurrence_FirstIndex[q10])
-             | q9 : int(1..b), q10 : int(1..b)]),
-    alldifferent_except([toInt(q53 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q54 <=
-                               p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q53])
-                         *
-                         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q53, q54],
-                                    0)
-                             | q53 : int(1..b), q54 : int(1..b)],
-                        0),
-    and([q55 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q55] >= 1
-             | q55 : int(1..b)]),
-    and([q14 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q14]; int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q14, q21]
-                       | q21 : int(1..b)];
-                      int(1..2)])
-         <lex
-         flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q14 + 1];
-                       int(1)],
-                  [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q14 + 1, q22]
-                       | q22 : int(1..b)];
-                      int(1..2)])
-             | q14 : int(1..b - 1)]),
-    and([q15 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q15] = 0 /\
-         and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q15, q23] = 1
-                  | q23 : int(1..b)])
-             | q15 : int(1..b)]),
-    p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= b,
-    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q17 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q16] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q16, q17] <
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q16, q17 + 1]
-                  | q17 : int(1..b - 1)])
-             | q16 : int(1..b)]),
-    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q18 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q16] ->
-              p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q16, q18] = 1
-                  | q18 : int(1..b)])
-             | q16 : int(1..b)]),
-    and([q16 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q16] <= b
-             | q16 : int(1..b)]),
-    b =
-    sum([toInt(q24 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q24], 0)
-             | q24 : int(1..b)]),
-    and([q27 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         or([q29 <= p_PartitionOccurrence_NumParts /\
-             (and([p_PartitionOccurrence_WhichPart[q32] = q29 ->
-                   or([q34 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q27]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q27, q34] =
-                       q32 | q34 : int(1..b)])
-                       | q32 : int(1..b)])
-              /\
-              and([q36 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q27] ->
-                   or([p_PartitionOccurrence_WhichPart[q38] = q29 /\
-                       q38 =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q27, q36]
-                           | q38 : int(1..b)])
-                       | q36 : int(1..b)]))
-                 | q29 : int(1..b)])
-             | q27 : int(1..b)]),
-    and([q40 <= p_PartitionOccurrence_NumParts ->
-         or([q44 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q46 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q44] ->
-                   or([p_PartitionOccurrence_WhichPart[q48] = q40 /\
-                       q48 =
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q44, q46]
-                           | q48 : int(1..b)])
-                       | q46 : int(1..b)])
-              /\
-              and([p_PartitionOccurrence_WhichPart[q50] = q40 ->
-                   or([q52 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q44]
-                       /\
-                       p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q44, q52] =
-                       q50 | q52 : int(1..b)])
-                       | q50 : int(1..b)]))
-                 | q44 : int(1..b)])
-             | q40 : int(1..b)])
-
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000001.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000001.solution
new file mode 100644
index 0000000000..8f7fa48018
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000001.solution
@@ -0,0 +1,6 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3, 4})
+$ Visualisation for p
+$ 1 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000002.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000002.solution
new file mode 100644
index 0000000000..556f2c0ecc
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 3}, {4})
+$ Visualisation for p
+$ 1 2 3
+$ 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000003.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000003.solution
new file mode 100644
index 0000000000..7781800dc4
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000003.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2, 4}, {3})
+$ Visualisation for p
+$ 1 2 4
+$ 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000004.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000004.solution
new file mode 100644
index 0000000000..1507fcc0c1
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 2}, {3, 4})
+$ Visualisation for p
+$ 1 2
+$ 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000005.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000005.solution
new file mode 100644
index 0000000000..0368fc950b
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000005.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3, 4}, {2})
+$ Visualisation for p
+$ 1 3 4
+$ 2
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000006.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000006.solution
new file mode 100644
index 0000000000..dafa529443
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000006.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 3}, {2, 4})
+$ Visualisation for p
+$ 1 3
+$ 2 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000007.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000007.solution
new file mode 100644
index 0000000000..69d6c9f6be
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000007.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1, 4}, {2, 3})
+$ Visualisation for p
+$ 1 4
+$ 2 3
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000008.solution b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000008.solution
new file mode 100644
index 0000000000..cd8086fa4a
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting p be partition({1}, {2, 3, 4})
+$ Visualisation for p
+$ 1
+$ 2 3 4
+
diff --git a/tests/exhaustive/issues/286/expected/model_4_4-p1.eprime-param b/tests/exhaustive/issues/286/expected/model_4_4-p1.eprime-param
new file mode 100644
index 0000000000..85954307ca
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4-p1.eprime-param
@@ -0,0 +1,3 @@
+language ESSENCE' 1.0
+
+letting b be 4
diff --git a/tests/exhaustive/issues/286/expected/model_4_4.eprime b/tests/exhaustive/issues/286/expected/model_4_4.eprime
new file mode 100644
index 0000000000..5a6173b451
--- /dev/null
+++ b/tests/exhaustive/issues/286/expected/model_4_4.eprime
@@ -0,0 +1,38 @@
+language ESSENCE' 1.0
+
+given b: int
+find p_PartitionOccurrence_NumParts: int(1..b)
+find p_PartitionOccurrence_WhichPart: matrix indexed by [int(1..b)] of int(1..b)
+find p_PartitionOccurrence_PartSizes: matrix indexed by [int(1..b)] of int(0..b)
+find p_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..b)] of int(1..b)
+branching on
+    [p_PartitionOccurrence_NumParts, p_PartitionOccurrence_WhichPart, p_PartitionOccurrence_PartSizes,
+     p_PartitionOccurrence_FirstIndex]
+such that
+    sum([toInt(q12 <= p_PartitionOccurrence_NumParts) | q12 : int(1..b)]) <=
+    sum([1   | q14_ExplicitVarSizeWithDummy : matrix indexed by [int(1..b)] of int(1..b + 1),
+               and([q14_ExplicitVarSizeWithDummy[q15] < q14_ExplicitVarSizeWithDummy[q15 + 1] \/
+                    q14_ExplicitVarSizeWithDummy[q15] = b + 1
+                        | q15 : int(1..b - 1)]),
+               and([q14_ExplicitVarSizeWithDummy[q16] = b + 1 -> q14_ExplicitVarSizeWithDummy[q16 + 1] = b + 1
+                        | q16 : int(1..b - 1)])])
+    / 8,
+    and([q1 <= p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] <= b | q1 : int(1..b)]),
+    and([q1 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..b)]),
+    p_PartitionOccurrence_NumParts <= b,
+    and([q2 <= p_PartitionOccurrence_NumParts -> or([p_PartitionOccurrence_WhichPart[q3] = q2 | q3 : int(1..b)])
+             | q2 : int(3..b)]),
+    p_PartitionOccurrence_NumParts = max([p_PartitionOccurrence_WhichPart[q4] | q4 : int(1..b)]),
+    and([p_PartitionOccurrence_PartSizes[q5] = sum([toInt(p_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..b)])
+             | q5 : int(1..b)]),
+    and([q7 <= p_PartitionOccurrence_NumParts ->
+         and([p_PartitionOccurrence_WhichPart[q8] = q7 -> p_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..b)])
+             | q7 : int(1..b)]),
+    and([q7 <= p_PartitionOccurrence_NumParts ->
+         or([p_PartitionOccurrence_WhichPart[q8] = q7 /\ p_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..b)])
+             | q7 : int(1..b)]),
+    and([q7 > p_PartitionOccurrence_NumParts -> p_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..b)]),
+    and([q9 <= p_PartitionOccurrence_NumParts /\ q10 <= p_PartitionOccurrence_NumParts ->
+         (q9 < q10 <-> p_PartitionOccurrence_FirstIndex[q9] < p_PartitionOccurrence_FirstIndex[q10])
+             | q9 : int(1..b), q10 : int(1..b)])
+
diff --git a/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1-solution000001.solution b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1-solution000001.solution
new file mode 100644
index 0000000000..04a3a6738a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting b be 0
diff --git a/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1.eprime-param b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1.eprime-param
new file mode 100644
index 0000000000..3c6853085f
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc1.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting n be 5
+letting g_RelationAsSet_Explicit_1 be [1, 2; int(1..2)]
+letting g_RelationAsSet_Explicit_2 be [2, 1; int(1..2)]
+letting fin1 be 2
diff --git a/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2-solution000001.solution b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2-solution000001.solution
new file mode 100644
index 0000000000..04a3a6738a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting b be 0
diff --git a/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2.eprime-param b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2.eprime-param
new file mode 100644
index 0000000000..a9b1ce1d7f
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-cyc2.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting n be 5
+letting g_RelationAsSet_Explicit_1 be [1, 2, 3; int(1..3)]
+letting g_RelationAsSet_Explicit_2 be [2, 3, 1; int(1..3)]
+letting fin1 be 3
diff --git a/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non-solution000001.solution b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non-solution000001.solution
new file mode 100644
index 0000000000..04a3a6738a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting b be 0
diff --git a/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non.eprime-param b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non.eprime-param
new file mode 100644
index 0000000000..651096c47a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/cyclic_graph/expected/model-non.eprime-param
@@ -0,0 +1,6 @@
+language ESSENCE' 1.0
+
+letting n be 5
+letting g_RelationAsSet_Explicit_1 be [1, 2; int(1..2)]
+letting g_RelationAsSet_Explicit_2 be [2, 3; int(1..2)]
+letting fin1 be 2
diff --git a/tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst-solution000001.solution b/tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst-solution000001.solution
new file mode 100644
index 0000000000..4ad15df1dd
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst-solution000001.solution
@@ -0,0 +1,182 @@
+language Essence 1.3
+
+letting bitmap be
+        [[true, true, true, true, true, true, true, false, true, true, true, false, false, false, true, false, true,
+          false, true, true, true, true, true, true, true;
+              int(1..25)],
+         [true, false, false, false, false, false, true, false, true, true, false, true, true, false, false, false,
+          false, false, true, false, false, false, false, false, true;
+              int(1..25)],
+         [true, false, true, true, true, false, true, false, false, false, false, false, true, true, true, false, true,
+          false, true, false, true, true, true, false, true;
+              int(1..25)],
+         [true, false, true, true, true, false, true, false, true, false, false, true, true, true, true, true, true,
+          false, true, false, true, true, true, false, true;
+              int(1..25)],
+         [true, false, true, true, true, false, true, false, false, true, true, true, true, true, false, true, true,
+          false, true, false, true, true, true, false, true;
+              int(1..25)],
+         [true, false, false, false, false, false, true, false, false, true, true, false, false, false, false, false,
+          false, false, true, false, false, false, false, false, true;
+              int(1..25)],
+         [true, true, true, true, true, true, true, false, true, false, true, false, true, false, true, false, true,
+          false, true, true, true, true, true, true, true;
+              int(1..25)],
+         [false, false, false, false, false, false, false, false, true, true, true, false, false, false, true, true,
+          true, false, false, false, false, false, false, false, false;
+              int(1..25)],
+         [true, false, true, true, false, true, true, true, false, false, true, false, true, false, true, true, true,
+          false, true, false, false, true, false, true, true;
+              int(1..25)],
+         [true, false, true, false, false, false, false, false, false, true, true, true, false, true, true, false,
+          false, false, false, true, false, false, false, true, false;
+              int(1..25)],
+         [false, true, true, true, true, false, true, false, true, true, true, true, false, true, true, false, true,
+          false, false, false, false, true, true, false, false;
+              int(1..25)],
+         [false, true, false, true, false, false, false, true, false, false, false, true, false, true, false, true,
+          true, true, true, false, true, false, true, true, true;
+              int(1..25)],
+         [false, false, true, true, false, false, true, false, true, false, true, false, false, false, false, false,
+          false, true, true, false, true, true, true, true, true;
+              int(1..25)],
+         [false, false, false, true, true, true, false, true, true, false, true, true, false, true, true, true, true,
+          true, true, false, true, true, true, false, true;
+              int(1..25)],
+         [true, false, true, true, true, true, true, true, true, true, true, false, true, false, true, false, false,
+          true, true, false, false, false, false, true, false;
+              int(1..25)],
+         [false, true, true, false, true, false, false, true, true, false, false, false, true, true, false, true, true,
+          true, false, false, false, false, false, true, false;
+              int(1..25)],
+         [true, true, true, false, true, false, true, false, true, false, false, true, false, false, false, false, true,
+          true, true, true, true, false, true, false, false;
+              int(1..25)],
+         [false, false, false, false, false, false, false, false, true, false, false, false, true, true, false, true,
+          true, false, false, false, true, true, true, true, true;
+              int(1..25)],
+         [true, true, true, true, true, true, true, false, true, false, false, true, true, false, false, false, true,
+          false, true, false, true, false, true, true, true;
+              int(1..25)],
+         [true, false, false, false, false, false, true, false, true, true, false, false, true, false, false, true,
+          true, false, false, false, true, true, false, true, false;
+              int(1..25)],
+         [true, false, true, true, true, false, true, false, false, false, true, true, true, true, false, false, true,
+          true, true, true, true, false, false, true, false;
+              int(1..25)],
+         [true, false, true, true, true, false, true, false, true, true, true, false, true, true, true, true, true,
+          true, true, true, true, true, false, true, true;
+              int(1..25)],
+         [true, false, true, true, true, false, true, false, true, false, false, true, true, true, true, true, true,
+          false, true, true, true, true, true, true, false;
+              int(1..25)],
+         [true, false, false, false, false, false, true, false, false, true, true, false, false, false, false, false,
+          false, true, false, true, false, true, true, false, false;
+              int(1..25)],
+         [true, true, true, true, true, true, true, false, true, true, false, false, false, true, false, true, true,
+          false, false, false, true, true, true, true, true;
+              int(1..25)];
+             int(1..25)]
+$ Visualisation for bitmap
+$ T T T T T T T _ T T T _ _ _ T _ T _ T T T T T T T
+$ T _ _ _ _ _ T _ T T _ T T _ _ _ _ _ T _ _ _ _ _ T
+$ T _ T T T _ T _ _ _ _ _ T T T _ T _ T _ T T T _ T
+$ T _ T T T _ T _ T _ _ T T T T T T _ T _ T T T _ T
+$ T _ T T T _ T _ _ T T T T T _ T T _ T _ T T T _ T
+$ T _ _ _ _ _ T _ _ T T _ _ _ _ _ _ _ T _ _ _ _ _ T
+$ T T T T T T T _ T _ T _ T _ T _ T _ T T T T T T T
+$ _ _ _ _ _ _ _ _ T T T _ _ _ T T T _ _ _ _ _ _ _ _
+$ T _ T T _ T T T _ _ T _ T _ T T T _ T _ _ T _ T T
+$ T _ T _ _ _ _ _ _ T T T _ T T _ _ _ _ T _ _ _ T _
+$ _ T T T T _ T _ T T T T _ T T _ T _ _ _ _ T T _ _
+$ _ T _ T _ _ _ T _ _ _ T _ T _ T T T T _ T _ T T T
+$ _ _ T T _ _ T _ T _ T _ _ _ _ _ _ T T _ T T T T T
+$ _ _ _ T T T _ T T _ T T _ T T T T T T _ T T T _ T
+$ T _ T T T T T T T T T _ T _ T _ _ T T _ _ _ _ T _
+$ _ T T _ T _ _ T T _ _ _ T T _ T T T _ _ _ _ _ T _
+$ T T T _ T _ T _ T _ _ T _ _ _ _ T T T T T _ T _ _
+$ _ _ _ _ _ _ _ _ T _ _ _ T T _ T T _ _ _ T T T T T
+$ T T T T T T T _ T _ _ T T _ _ _ T _ T _ T _ T T T
+$ T _ _ _ _ _ T _ T T _ _ T _ _ T T _ _ _ T T _ T _
+$ T _ T T T _ T _ _ _ T T T T _ _ T T T T T _ _ T _
+$ T _ T T T _ T _ T T T _ T T T T T T T T T T _ T T
+$ T _ T T T _ T _ T _ _ T T T T T T _ T T T T T T _
+$ T _ _ _ _ _ T _ _ T T _ _ _ _ _ _ T _ T _ T T _ _
+$ T T T T T T T _ T T _ _ _ T _ T T _ _ _ T T T T T
+
+letting horizontalLocs be
+        [sequence(1, 9, 15, 17, 19), sequence(1, 7, 9, 12, 19, 25), sequence(1, 3, 7, 13, 17, 19, 21, 25),
+         sequence(1, 3, 7, 9, 12, 19, 21, 25), sequence(1, 3, 7, 10, 16, 19, 21, 25), sequence(1, 7, 10, 19, 25),
+         sequence(1, 9, 11, 13, 15, 17, 19), sequence(9, 15), sequence(1, 3, 6, 11, 13, 15, 19, 22, 24),
+         sequence(1, 3, 10, 14, 20, 24), sequence(2, 7, 9, 14, 17, 22), sequence(2, 4, 8, 12, 14, 16, 21, 23),
+         sequence(3, 7, 9, 11, 18, 21), sequence(4, 8, 11, 14, 21, 25), sequence(1, 3, 13, 15, 18, 24),
+         sequence(2, 5, 8, 13, 16, 24), sequence(1, 5, 7, 9, 12, 17, 23), sequence(9, 13, 16, 21),
+         sequence(1, 9, 12, 17, 19, 21, 23), sequence(1, 7, 9, 13, 16, 21, 24), sequence(1, 3, 7, 11, 17, 24),
+         sequence(1, 3, 7, 9, 13, 24), sequence(1, 3, 7, 9, 12, 19), sequence(1, 7, 10, 18, 20, 22),
+         sequence(1, 9, 14, 16, 21);
+             int(1..25)]
+$ Visualisation for horizontalLocs
+$  1  9 15 17 19
+$  1  7  9 12 19 25
+$  1  3  7 13 17 19 21 25
+$  1  3  7  9 12 19 21 25
+$  1  3  7 10 16 19 21 25
+$  1  7 10 19 25
+$  1  9 11 13 15 17 19
+$  9 15
+$  1  3  6 11 13 15 19 22 24
+$  1  3 10 14 20 24
+$  2  7  9 14 17 22
+$  2  4  8 12 14 16 21 23
+$  3  7  9 11 18 21
+$  4  8 11 14 21 25
+$  1  3 13 15 18 24
+$  2  5  8 13 16 24
+$  1  5  7  9 12 17 23
+$  9 13 16 21
+$  1  9 12 17 19 21 23
+$  1  7  9 13 16 21 24
+$  1  3  7 11 17 24
+$  1  3  7  9 13 24
+$  1  3  7  9 12 19
+$  1  7 10 18 20 22
+$  1  9 14 16 21
+
+letting verticalLocs be
+        [sequence(1, 9, 15, 17, 19), sequence(1, 7, 11, 16, 19, 25), sequence(1, 3, 7, 9, 13, 15, 19, 21, 25),
+         sequence(1, 3, 7, 9, 11, 19, 21, 25), sequence(1, 3, 7, 11, 14, 19, 21, 25), sequence(1, 7, 9, 14, 19, 25),
+         sequence(1, 9, 11, 13, 15, 17, 19), sequence(9, 12, 14), sequence(1, 4, 7, 11, 13, 22, 25),
+         sequence(1, 5, 8, 10, 15, 20, 22, 24), sequence(1, 5, 13, 21, 24), sequence(2, 4, 10, 14, 17, 19, 21, 23),
+         sequence(2, 7, 9, 15, 18), sequence(3, 10, 14, 16, 18, 21, 25), sequence(1, 3, 7, 14, 22),
+         sequence(4, 8, 12, 14, 16, 18, 20, 22, 25), sequence(1, 3, 7, 11, 14, 16, 25), sequence(12, 21, 24),
+         sequence(1, 9, 12, 17, 19, 21), sequence(1, 7, 10, 17, 21), sequence(1, 3, 7, 12, 17, 25),
+         sequence(1, 3, 7, 9, 11, 13, 18, 20, 22), sequence(1, 3, 7, 11, 17, 23), sequence(1, 7, 9, 12, 15, 18, 25),
+         sequence(1, 9, 12, 18, 22, 25);
+             int(1..25)]
+$ Visualisation for verticalLocs
+$  1  9 15 17 19
+$  1  7 11 16 19 25
+$  1  3  7  9 13 15 19 21 25
+$  1  3  7  9 11 19 21 25
+$  1  3  7 11 14 19 21 25
+$  1  7  9 14 19 25
+$  1  9 11 13 15 17 19
+$  9 12 14
+$  1  4  7 11 13 22 25
+$  1  5  8 10 15 20 22 24
+$  1  5 13 21 24
+$  2  4 10 14 17 19 21 23
+$  2  7  9 15 18
+$  3 10 14 16 18 21 25
+$  1  3  7 14 22
+$  4  8 12 14 16 18 20 22 25
+$  1  3  7 11 14 16 25
+$ 12 21 24
+$  1  9 12 17 19 21
+$  1  7 10 17 21
+$  1  3  7 12 17 25
+$  1  3  7  9 11 13 18 20 22
+$  1  3  7 11 17 23
+$  1  7  9 12 15 18 25
+$  1  9 12 18 22 25
+
diff --git a/tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst.eprime-param b/tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst.eprime-param
new file mode 100644
index 0000000000..9712bd75a8
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/gchq_2016/expected/model-inst.eprime-param
@@ -0,0 +1,98 @@
+language ESSENCE' 1.0
+
+letting n be 25
+letting horizontalClues_ExplicitBounded_Length be
+        [5, 6, 8, 8, 8, 5, 7, 2, 9, 6, 6, 8, 6, 6, 6, 6, 7, 4, 7, 7, 6, 6, 6, 6, 5; int(1..25)]
+letting horizontalClues_ExplicitBounded_Values be
+        [[7, 3, 1, 1, 7, 1, 1, 1, 1; int(1..9)], [1, 1, 2, 2, 1, 1, 1, 1, 1; int(1..9)],
+         [1, 3, 1, 3, 1, 1, 3, 1, 1; int(1..9)], [1, 3, 1, 1, 6, 1, 3, 1, 1; int(1..9)],
+         [1, 3, 1, 5, 2, 1, 3, 1, 1; int(1..9)], [1, 1, 2, 1, 1, 1, 1, 1, 1; int(1..9)],
+         [7, 1, 1, 1, 1, 1, 7, 1, 1; int(1..9)], [3, 3, 1, 1, 1, 1, 1, 1, 1; int(1..9)],
+         [1, 2, 3, 1, 1, 3, 1, 1, 2; int(1..9)], [1, 1, 3, 2, 1, 1, 1, 1, 1; int(1..9)],
+         [4, 1, 4, 2, 1, 2, 1, 1, 1; int(1..9)], [1, 1, 1, 1, 1, 4, 1, 3, 1; int(1..9)],
+         [2, 1, 1, 1, 2, 5, 1, 1, 1; int(1..9)], [3, 2, 2, 6, 3, 1, 1, 1, 1; int(1..9)],
+         [1, 9, 1, 1, 2, 1, 1, 1, 1; int(1..9)], [2, 1, 2, 2, 3, 1, 1, 1, 1; int(1..9)],
+         [3, 1, 1, 1, 1, 5, 1, 1, 1; int(1..9)], [1, 2, 2, 5, 1, 1, 1, 1, 1; int(1..9)],
+         [7, 1, 2, 1, 1, 1, 3, 1, 1; int(1..9)], [1, 1, 2, 1, 2, 2, 1, 1, 1; int(1..9)],
+         [1, 3, 1, 4, 5, 1, 1, 1, 1; int(1..9)], [1, 3, 1, 3, 10, 2, 1, 1, 1; int(1..9)],
+         [1, 3, 1, 1, 6, 6, 1, 1, 1; int(1..9)], [1, 1, 2, 1, 1, 2, 1, 1, 1; int(1..9)],
+         [7, 2, 1, 2, 5, 1, 1, 1, 1; int(1..9)];
+             int(1..25)]
+$ Visualisation for horizontalClues_ExplicitBounded_Values
+$  7  3  1  1  7  1  1  1  1
+$  1  1  2  2  1  1  1  1  1
+$  1  3  1  3  1  1  3  1  1
+$  1  3  1  1  6  1  3  1  1
+$  1  3  1  5  2  1  3  1  1
+$  1  1  2  1  1  1  1  1  1
+$  7  1  1  1  1  1  7  1  1
+$  3  3  1  1  1  1  1  1  1
+$  1  2  3  1  1  3  1  1  2
+$  1  1  3  2  1  1  1  1  1
+$  4  1  4  2  1  2  1  1  1
+$  1  1  1  1  1  4  1  3  1
+$  2  1  1  1  2  5  1  1  1
+$  3  2  2  6  3  1  1  1  1
+$  1  9  1  1  2  1  1  1  1
+$  2  1  2  2  3  1  1  1  1
+$  3  1  1  1  1  5  1  1  1
+$  1  2  2  5  1  1  1  1  1
+$  7  1  2  1  1  1  3  1  1
+$  1  1  2  1  2  2  1  1  1
+$  1  3  1  4  5  1  1  1  1
+$  1  3  1  3 10  2  1  1  1
+$  1  3  1  1  6  6  1  1  1
+$  1  1  2  1  1  2  1  1  1
+$  7  2  1  2  5  1  1  1  1
+
+letting verticalClues_ExplicitBounded_Length be
+        [5, 6, 9, 8, 8, 6, 7, 3, 7, 8, 5, 8, 5, 7, 5, 9, 7, 3, 6, 5, 6, 9, 6, 7, 6; int(1..25)]
+letting verticalClues_ExplicitBounded_Values be
+        [[7, 2, 1, 1, 7, 1, 1, 1, 1; int(1..9)], [1, 1, 2, 2, 1, 1, 1, 1, 1; int(1..9)],
+         [1, 3, 1, 3, 1, 3, 1, 3, 1; int(1..9)], [1, 3, 1, 1, 5, 1, 3, 1, 1; int(1..9)],
+         [1, 3, 1, 1, 4, 1, 3, 1, 1; int(1..9)], [1, 1, 1, 2, 1, 1, 1, 1, 1; int(1..9)],
+         [7, 1, 1, 1, 1, 1, 7, 1, 1; int(1..9)], [1, 1, 3, 1, 1, 1, 1, 1, 1; int(1..9)],
+         [2, 1, 2, 1, 8, 2, 1, 1, 1; int(1..9)], [2, 2, 1, 2, 1, 1, 1, 2, 1; int(1..9)],
+         [1, 7, 3, 2, 1, 1, 1, 1, 1; int(1..9)], [1, 2, 3, 1, 1, 1, 1, 1, 1; int(1..9)],
+         [4, 1, 1, 2, 6, 1, 1, 1, 1; int(1..9)], [3, 3, 1, 1, 1, 3, 1, 1, 1; int(1..9)],
+         [1, 2, 5, 2, 2, 1, 1, 1, 1; int(1..9)], [2, 2, 1, 1, 1, 1, 1, 2, 1; int(1..9)],
+         [1, 3, 3, 2, 1, 8, 1, 1, 1; int(1..9)], [6, 2, 1, 1, 1, 1, 1, 1, 1; int(1..9)],
+         [7, 1, 4, 1, 1, 3, 1, 1, 1; int(1..9)], [1, 1, 1, 1, 4, 1, 1, 1, 1; int(1..9)],
+         [1, 3, 1, 3, 7, 1, 1, 1, 1; int(1..9)], [1, 3, 1, 1, 1, 2, 1, 1, 4; int(1..9)],
+         [1, 3, 1, 4, 3, 3, 1, 1, 1; int(1..9)], [1, 1, 2, 2, 2, 6, 1, 1, 1; int(1..9)],
+         [7, 1, 3, 2, 1, 1, 1, 1, 1; int(1..9)];
+             int(1..25)]
+$ Visualisation for verticalClues_ExplicitBounded_Values
+$ 7 2 1 1 7 1 1 1 1
+$ 1 1 2 2 1 1 1 1 1
+$ 1 3 1 3 1 3 1 3 1
+$ 1 3 1 1 5 1 3 1 1
+$ 1 3 1 1 4 1 3 1 1
+$ 1 1 1 2 1 1 1 1 1
+$ 7 1 1 1 1 1 7 1 1
+$ 1 1 3 1 1 1 1 1 1
+$ 2 1 2 1 8 2 1 1 1
+$ 2 2 1 2 1 1 1 2 1
+$ 1 7 3 2 1 1 1 1 1
+$ 1 2 3 1 1 1 1 1 1
+$ 4 1 1 2 6 1 1 1 1
+$ 3 3 1 1 1 3 1 1 1
+$ 1 2 5 2 2 1 1 1 1
+$ 2 2 1 1 1 1 1 2 1
+$ 1 3 3 2 1 8 1 1 1
+$ 6 2 1 1 1 1 1 1 1
+$ 7 1 4 1 1 3 1 1 1
+$ 1 1 1 1 4 1 1 1 1
+$ 1 3 1 3 7 1 1 1 1
+$ 1 3 1 1 1 2 1 1 4
+$ 1 3 1 4 3 3 1 1 1
+$ 1 1 2 2 2 6 1 1 1
+$ 7 1 3 2 1 1 1 1 1
+
+letting prefilled_Explicit_1 be
+        [4, 4, 4, 4, 4, 9, 9, 9, 9, 9, 9, 17, 17, 17, 17, 22, 22, 22, 22, 22, 22, 22; int(1..22)]
+letting prefilled_Explicit_2 be
+        [4, 5, 13, 14, 22, 7, 8, 11, 15, 16, 19, 7, 12, 17, 21, 4, 5, 10, 11, 16, 21, 22; int(1..22)]
+letting fin1 be 9
+letting fin2 be 9
+letting fin3 be 22
diff --git a/tests/exhaustive/mildly_interesting/gchq_2016/expected/model.eprime b/tests/exhaustive/mildly_interesting/gchq_2016/expected/model.eprime
new file mode 100644
index 0000000000..d06f46d615
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/gchq_2016/expected/model.eprime
@@ -0,0 +1,127 @@
+language ESSENCE' 1.0
+
+given n: int
+given fin1: int
+given horizontalClues_ExplicitBounded_Length: matrix indexed by [int(1..n)] of int(0..fin1)
+given horizontalClues_ExplicitBounded_Values: matrix indexed by [int(1..n), int(1..fin1)] of int(1..n)
+find horizontalLocs_ExplicitBounded_Length: matrix indexed by [int(1..n)] of int(0..n)
+find horizontalLocs_ExplicitBounded_Values: matrix indexed by [int(1..n), int(1..n)] of int(1..n)
+given fin2: int
+given verticalClues_ExplicitBounded_Length: matrix indexed by [int(1..n)] of int(0..fin2)
+given verticalClues_ExplicitBounded_Values: matrix indexed by [int(1..n), int(1..fin2)] of int(1..n)
+find verticalLocs_ExplicitBounded_Length: matrix indexed by [int(1..n)] of int(0..n)
+find verticalLocs_ExplicitBounded_Values: matrix indexed by [int(1..n), int(1..n)] of int(1..n)
+find bitmap: matrix indexed by [int(1..n), int(1..n)] of bool
+given fin3: int
+given prefilled_Explicit_1: matrix indexed by [int(1..fin3)] of int(1..n)
+given prefilled_Explicit_2: matrix indexed by [int(1..fin3)] of int(1..n)
+branching on
+    [horizontalLocs_ExplicitBounded_Length, horizontalLocs_ExplicitBounded_Values, verticalLocs_ExplicitBounded_Length,
+     verticalLocs_ExplicitBounded_Values, bitmap]
+such that
+    and([horizontalLocs_ExplicitBounded_Length[row] = horizontalClues_ExplicitBounded_Length[row] | row : int(1..n)]),
+    and([and([and([horizontalLocs_ExplicitBounded_Values[row, q10] >
+                   horizontalLocs_ExplicitBounded_Values[row, q10 - 1] +
+                   horizontalClues_ExplicitBounded_Values[row, q10 - 1],
+                   q10 <= horizontalLocs_ExplicitBounded_Length[row],
+                   q10 - 1 <= horizontalLocs_ExplicitBounded_Length[row],
+                   q10 - 1 <= horizontalClues_ExplicitBounded_Length[row];
+                       int(1..4)])
+                  | q10 : int(1..fin1), q10 <= horizontalClues_ExplicitBounded_Length[row], q10 > 1])
+             | row : int(1..n)]),
+    and([verticalLocs_ExplicitBounded_Length[col] = verticalClues_ExplicitBounded_Length[col] | col : int(1..n)]),
+    and([and([and([verticalLocs_ExplicitBounded_Values[col, q12] >
+                   verticalLocs_ExplicitBounded_Values[col, q12 - 1] +
+                   verticalClues_ExplicitBounded_Values[col, q12 - 1],
+                   q12 <= verticalLocs_ExplicitBounded_Length[col], q12 - 1 <= verticalLocs_ExplicitBounded_Length[col],
+                   q12 - 1 <= verticalClues_ExplicitBounded_Length[col];
+                       int(1..4)])
+                  | q12 : int(1..fin2), q12 <= verticalClues_ExplicitBounded_Length[col], q12 > 1])
+             | col : int(1..n)]),
+    and([bitmap[prefilled_Explicit_1[q14], prefilled_Explicit_2[q14]] | q14 : int(1..fin3)]),
+    and([and([i >= horizontalLocs_ExplicitBounded_Values[row, index] /\
+              index <= horizontalLocs_ExplicitBounded_Length[row]
+              /\
+              and([i <=
+                   horizontalLocs_ExplicitBounded_Values[row, index] +
+                   horizontalClues_ExplicitBounded_Values[row, index]
+                   - 1,
+                   index <= horizontalLocs_ExplicitBounded_Length[row],
+                   index <= horizontalClues_ExplicitBounded_Length[row];
+                       int(1..3)])
+              -> bitmap[row, i]
+                  | i : int(1..n)])
+         /\
+         and([i < horizontalLocs_ExplicitBounded_Values[row, index] /\
+              index <= horizontalLocs_ExplicitBounded_Length[row]
+              -> bitmap[row, i] = false
+                  | i : int(1..n), index = 1])
+         /\
+         and([and([i >
+                   horizontalLocs_ExplicitBounded_Values[row, index] +
+                   horizontalClues_ExplicitBounded_Values[row, index]
+                   - 1,
+                   index <= horizontalLocs_ExplicitBounded_Length[row],
+                   index <= horizontalClues_ExplicitBounded_Length[row];
+                       int(1..3)])
+              -> bitmap[row, i] = false
+                  | i : int(1..n), index = horizontalClues_ExplicitBounded_Length[row]])
+         /\
+         and([and([i >
+                   horizontalLocs_ExplicitBounded_Values[row, index] +
+                   horizontalClues_ExplicitBounded_Values[row, index]
+                   - 1,
+                   index <= horizontalLocs_ExplicitBounded_Length[row],
+                   index <= horizontalClues_ExplicitBounded_Length[row];
+                       int(1..3)])
+              /\
+              (i < horizontalLocs_ExplicitBounded_Values[row, index + 1] /\
+               index + 1 <= horizontalLocs_ExplicitBounded_Length[row])
+              -> bitmap[row, i] = false
+                  | i : int(1..n), index < horizontalClues_ExplicitBounded_Length[row]])
+             | row : int(1..n), index : int(1..n), index <= horizontalClues_ExplicitBounded_Length[row]]),
+    and([and([i >= verticalLocs_ExplicitBounded_Values[col, index] /\ index <= verticalLocs_ExplicitBounded_Length[col]
+              /\
+              and([i <=
+                   verticalLocs_ExplicitBounded_Values[col, index] + verticalClues_ExplicitBounded_Values[col, index] -
+                   1,
+                   index <= verticalLocs_ExplicitBounded_Length[col],
+                   index <= verticalClues_ExplicitBounded_Length[col];
+                       int(1..3)])
+              -> bitmap[i, col]
+                  | i : int(1..n)])
+         /\
+         and([i < verticalLocs_ExplicitBounded_Values[col, index] /\ index <= verticalLocs_ExplicitBounded_Length[col]
+              -> bitmap[i, col] = false
+                  | i : int(1..n), index = 1])
+         /\
+         and([and([i >
+                   verticalLocs_ExplicitBounded_Values[col, index] + verticalClues_ExplicitBounded_Values[col, index] -
+                   1,
+                   index <= verticalLocs_ExplicitBounded_Length[col],
+                   index <= verticalClues_ExplicitBounded_Length[col];
+                       int(1..3)])
+              -> bitmap[i, col] = false
+                  | i : int(1..n), index = verticalClues_ExplicitBounded_Length[col]])
+         /\
+         and([and([i >
+                   verticalLocs_ExplicitBounded_Values[col, index] + verticalClues_ExplicitBounded_Values[col, index] -
+                   1,
+                   index <= verticalLocs_ExplicitBounded_Length[col],
+                   index <= verticalClues_ExplicitBounded_Length[col];
+                       int(1..3)])
+              /\
+              (i < verticalLocs_ExplicitBounded_Values[col, index + 1] /\
+               index + 1 <= verticalLocs_ExplicitBounded_Length[col])
+              -> bitmap[i, col] = false
+                  | i : int(1..n), index < verticalClues_ExplicitBounded_Length[col]])
+             | col : int(1..n), index : int(1..n), index <= verticalClues_ExplicitBounded_Length[col]]),
+    and([and([q4 > horizontalLocs_ExplicitBounded_Length[q3] -> horizontalLocs_ExplicitBounded_Values[q3, q4] = 1
+                  | q4 : int(1..n)])
+             | q3 : int(1..n)]),
+    and([horizontalLocs_ExplicitBounded_Length[q3] <= n | q3 : int(1..n)]),
+    and([and([q7 > verticalLocs_ExplicitBounded_Length[q6] -> verticalLocs_ExplicitBounded_Values[q6, q7] = 1
+                  | q7 : int(1..n)])
+             | q6 : int(1..n)]),
+    and([verticalLocs_ExplicitBounded_Length[q6] <= n | q6 : int(1..n)])
+
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1-solution000001.solution
new file mode 100644
index 0000000000..273ab9e077
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-3, -2, 5}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1.eprime-param
new file mode 100644
index 0000000000..b1ce145328
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p1.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-7, -3, -2, 5, 8; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -7
+letting fin3 be 8
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000001.solution
new file mode 100644
index 0000000000..102034e8e6
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 1, 4}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000002.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000002.solution
new file mode 100644
index 0000000000..3192b721eb
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2-solution000002.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 2, 3}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2.eprime-param
new file mode 100644
index 0000000000..2d232d7d8a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1-p2.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-5, 1, 2, 3, 4; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -5
+letting fin3 be 4
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1.eprime b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1.eprime
new file mode 100644
index 0000000000..0193b6f90b
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_1.eprime
@@ -0,0 +1,27 @@
+language ESSENCE' 1.0
+
+given s: int
+given fin1: int
+given fin2: int
+given fin3: int
+given nums_Explicit: matrix indexed by [int(1..fin1)] of int(fin2..fin3)
+letting let1 be fin1
+letting let2 be [nums_Explicit[q5] | q5 : int(1..fin1)]
+find x_ExplicitVarSizeWithMarker_Marker: int(0..let1)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..let1)] of int(let2)
+branching on [x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values]
+such that
+    and([q8 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([nums_Explicit[q10] = x_ExplicitVarSizeWithMarker_Values[q8] | q10 : int(1..fin1)])
+             | q8 : int(1..let1)]),
+    s =
+    sum([toInt(q6 <= x_ExplicitVarSizeWithMarker_Marker) * catchUndef(x_ExplicitVarSizeWithMarker_Values[q6], 0)
+             | q6 : int(1..let1)]),
+    and([q2 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q2] < x_ExplicitVarSizeWithMarker_Values[q2 + 1]
+             | q2 : int(1..let1 - 1)]),
+    and([q3 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q3] = min(let2)
+             | q3 : int(1..let1)]),
+    1 <= x_ExplicitVarSizeWithMarker_Marker,
+    x_ExplicitVarSizeWithMarker_Marker <= let1
+
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1-solution000001.solution
new file mode 100644
index 0000000000..273ab9e077
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-3, -2, 5}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1.eprime-param
new file mode 100644
index 0000000000..b1ce145328
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p1.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-7, -3, -2, 5, 8; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -7
+letting fin3 be 8
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000001.solution
new file mode 100644
index 0000000000..102034e8e6
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 1, 4}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000002.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000002.solution
new file mode 100644
index 0000000000..3192b721eb
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2-solution000002.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 2, 3}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2.eprime-param
new file mode 100644
index 0000000000..2d232d7d8a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2-p2.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-5, 1, 2, 3, 4; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -5
+letting fin3 be 4
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2.eprime b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2.eprime
new file mode 100644
index 0000000000..f7a55a9331
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_1_2.eprime
@@ -0,0 +1,49 @@
+language ESSENCE' 1.0
+
+given s: int
+given fin1: int
+given fin2: int
+given fin3: int
+given nums_Explicit: matrix indexed by [int(1..fin1)] of int(fin2..fin3)
+letting let1 be fin1
+letting let2 be [nums_Explicit[q18] | q18 : int(1..fin1)]
+find x_ExplicitVarSizeWithMarker_Marker: int(0..let1)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..let1)] of int(let2)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..let1)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..let1)] of int(let2)
+branching on
+    [x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values, x_ExplicitVarSizeWithMarker_Marker,
+     x_ExplicitVarSizeWithMarker_Values]
+such that
+    and([q21 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([nums_Explicit[q23] = x_ExplicitVarSizeWithMarker_Values[q21] | q23 : int(1..fin1)])
+             | q21 : int(1..let1)]),
+    s =
+    sum([toInt(q19 <= x_ExplicitVarSizeWithMarker_Marker) * catchUndef(x_ExplicitVarSizeWithMarker_Values[q19], 0)
+             | q19 : int(1..let1)]),
+    and([q2 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q2] < x_ExplicitVarSizeWithMarker_Values[q2 + 1]
+             | q2 : int(1..let1 - 1)]),
+    and([q3 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q3] = min(let2)
+             | q3 : int(1..let1)]),
+    1 <= x_ExplicitVarSizeWithMarker_Marker,
+    x_ExplicitVarSizeWithMarker_Marker <= let1,
+    and([x_ExplicitVarSizeWithFlags_Flags[q5 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q5] < x_ExplicitVarSizeWithFlags_Values[q5 + 1]
+             | q5 : int(1..let1 - 1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q6] = false -> x_ExplicitVarSizeWithFlags_Values[q6] = min(let2)
+             | q6 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q7 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q7] | q7 : int(1..let1 - 1)]),
+    1 <= sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q8]) | q8 : int(1..let1)]),
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q8]) | q8 : int(1..let1)]) <= let1,
+    and([x_ExplicitVarSizeWithFlags_Flags[q11] ->
+         or([q13 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q13] = x_ExplicitVarSizeWithFlags_Values[q11]
+                 | q13 : int(1..let1)])
+             | q11 : int(1..let1)]),
+    and([q15 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q17] /\
+             x_ExplicitVarSizeWithFlags_Values[q17] = x_ExplicitVarSizeWithMarker_Values[q15]
+                 | q17 : int(1..let1)])
+             | q15 : int(1..let1)])
+
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1-solution000001.solution
new file mode 100644
index 0000000000..273ab9e077
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-3, -2, 5}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1.eprime-param
new file mode 100644
index 0000000000..b1ce145328
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p1.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-7, -3, -2, 5, 8; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -7
+letting fin3 be 8
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000001.solution
new file mode 100644
index 0000000000..102034e8e6
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 1, 4}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000002.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000002.solution
new file mode 100644
index 0000000000..3192b721eb
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2-solution000002.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 2, 3}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2.eprime-param
new file mode 100644
index 0000000000..2d232d7d8a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1-p2.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-5, 1, 2, 3, 4; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -5
+letting fin3 be 4
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1.eprime b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1.eprime
new file mode 100644
index 0000000000..55b8aa4153
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_1_2_1.eprime
@@ -0,0 +1,49 @@
+language ESSENCE' 1.0
+
+given s: int
+given fin1: int
+given fin2: int
+given fin3: int
+given nums_Explicit: matrix indexed by [int(1..fin1)] of int(fin2..fin3)
+letting let1 be fin1
+letting let2 be [nums_Explicit[q18] | q18 : int(1..fin1)]
+find x_ExplicitVarSizeWithMarker_Marker: int(0..let1)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..let1)] of int(let2)
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..let1)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..let1)] of int(let2)
+branching on
+    [x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values, x_ExplicitVarSizeWithMarker_Marker,
+     x_ExplicitVarSizeWithMarker_Values]
+such that
+    and([q21 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([nums_Explicit[q23] = x_ExplicitVarSizeWithMarker_Values[q21] | q23 : int(1..fin1)])
+             | q21 : int(1..let1)]),
+    s =
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q19]) * catchUndef(x_ExplicitVarSizeWithFlags_Values[q19], 0)
+             | q19 : int(1..let1)]),
+    and([q2 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q2] < x_ExplicitVarSizeWithMarker_Values[q2 + 1]
+             | q2 : int(1..let1 - 1)]),
+    and([q3 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q3] = min(let2)
+             | q3 : int(1..let1)]),
+    1 <= x_ExplicitVarSizeWithMarker_Marker,
+    x_ExplicitVarSizeWithMarker_Marker <= let1,
+    and([x_ExplicitVarSizeWithFlags_Flags[q5 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q5] < x_ExplicitVarSizeWithFlags_Values[q5 + 1]
+             | q5 : int(1..let1 - 1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q6] = false -> x_ExplicitVarSizeWithFlags_Values[q6] = min(let2)
+             | q6 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q7 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q7] | q7 : int(1..let1 - 1)]),
+    1 <= sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q8]) | q8 : int(1..let1)]),
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q8]) | q8 : int(1..let1)]) <= let1,
+    and([x_ExplicitVarSizeWithFlags_Flags[q11] ->
+         or([q13 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q13] = x_ExplicitVarSizeWithFlags_Values[q11]
+                 | q13 : int(1..let1)])
+             | q11 : int(1..let1)]),
+    and([q15 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q17] /\
+             x_ExplicitVarSizeWithFlags_Values[q17] = x_ExplicitVarSizeWithMarker_Values[q15]
+                 | q17 : int(1..let1)])
+             | q15 : int(1..let1)])
+
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1-solution000001.solution
new file mode 100644
index 0000000000..273ab9e077
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-3, -2, 5}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1.eprime-param
new file mode 100644
index 0000000000..b1ce145328
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p1.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-7, -3, -2, 5, 8; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -7
+letting fin3 be 8
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000001.solution
new file mode 100644
index 0000000000..102034e8e6
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 1, 4}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000002.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000002.solution
new file mode 100644
index 0000000000..3192b721eb
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2-solution000002.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 2, 3}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2.eprime-param
new file mode 100644
index 0000000000..2d232d7d8a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1-p2.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-5, 1, 2, 3, 4; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -5
+letting fin3 be 4
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1.eprime b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1.eprime
new file mode 100644
index 0000000000..b7ee7c510e
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_1_1.eprime
@@ -0,0 +1,49 @@
+language ESSENCE' 1.0
+
+given s: int
+given fin1: int
+given fin2: int
+given fin3: int
+given nums_Explicit: matrix indexed by [int(1..fin1)] of int(fin2..fin3)
+letting let1 be fin1
+letting let2 be [nums_Explicit[q18] | q18 : int(1..fin1)]
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..let1)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..let1)] of int(let2)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..let1)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..let1)] of int(let2)
+branching on
+    [x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values, x_ExplicitVarSizeWithFlags_Flags,
+     x_ExplicitVarSizeWithFlags_Values]
+such that
+    and([x_ExplicitVarSizeWithFlags_Flags[q21] ->
+         or([nums_Explicit[q23] = x_ExplicitVarSizeWithFlags_Values[q21] | q23 : int(1..fin1)])
+             | q21 : int(1..let1)]),
+    s =
+    sum([toInt(q19 <= x_ExplicitVarSizeWithMarker_Marker) * catchUndef(x_ExplicitVarSizeWithMarker_Values[q19], 0)
+             | q19 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q2] < x_ExplicitVarSizeWithFlags_Values[q2 + 1]
+             | q2 : int(1..let1 - 1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3] = false -> x_ExplicitVarSizeWithFlags_Values[q3] = min(let2)
+             | q3 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q4 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..let1 - 1)]),
+    1 <= sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q5]) | q5 : int(1..let1)]),
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q5]) | q5 : int(1..let1)]) <= let1,
+    and([q7 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q7] < x_ExplicitVarSizeWithMarker_Values[q7 + 1]
+             | q7 : int(1..let1 - 1)]),
+    and([q8 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q8] = min(let2)
+             | q8 : int(1..let1)]),
+    1 <= x_ExplicitVarSizeWithMarker_Marker,
+    x_ExplicitVarSizeWithMarker_Marker <= let1,
+    and([q11 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q13] /\
+             x_ExplicitVarSizeWithFlags_Values[q13] = x_ExplicitVarSizeWithMarker_Values[q11]
+                 | q13 : int(1..let1)])
+             | q11 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q15] ->
+         or([q17 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q17] = x_ExplicitVarSizeWithFlags_Values[q15]
+                 | q17 : int(1..let1)])
+             | q15 : int(1..let1)])
+
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1-solution000001.solution
new file mode 100644
index 0000000000..273ab9e077
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-3, -2, 5}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1.eprime-param
new file mode 100644
index 0000000000..b1ce145328
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p1.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-7, -3, -2, 5, 8; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -7
+letting fin3 be 8
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000001.solution
new file mode 100644
index 0000000000..102034e8e6
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 1, 4}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000002.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000002.solution
new file mode 100644
index 0000000000..3192b721eb
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2-solution000002.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 2, 3}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2.eprime-param
new file mode 100644
index 0000000000..2d232d7d8a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1-p2.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-5, 1, 2, 3, 4; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -5
+letting fin3 be 4
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1.eprime b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1.eprime
new file mode 100644
index 0000000000..36c7029a44
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_1.eprime
@@ -0,0 +1,49 @@
+language ESSENCE' 1.0
+
+given s: int
+given fin1: int
+given fin2: int
+given fin3: int
+given nums_Explicit: matrix indexed by [int(1..fin1)] of int(fin2..fin3)
+letting let1 be fin1
+letting let2 be [nums_Explicit[q18] | q18 : int(1..fin1)]
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..let1)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..let1)] of int(let2)
+find x_ExplicitVarSizeWithMarker_Marker: int(0..let1)
+find x_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..let1)] of int(let2)
+branching on
+    [x_ExplicitVarSizeWithMarker_Marker, x_ExplicitVarSizeWithMarker_Values, x_ExplicitVarSizeWithFlags_Flags,
+     x_ExplicitVarSizeWithFlags_Values]
+such that
+    and([x_ExplicitVarSizeWithFlags_Flags[q21] ->
+         or([nums_Explicit[q23] = x_ExplicitVarSizeWithFlags_Values[q21] | q23 : int(1..fin1)])
+             | q21 : int(1..let1)]),
+    s =
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q19]) * catchUndef(x_ExplicitVarSizeWithFlags_Values[q19], 0)
+             | q19 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q2] < x_ExplicitVarSizeWithFlags_Values[q2 + 1]
+             | q2 : int(1..let1 - 1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3] = false -> x_ExplicitVarSizeWithFlags_Values[q3] = min(let2)
+             | q3 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q4 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..let1 - 1)]),
+    1 <= sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q5]) | q5 : int(1..let1)]),
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q5]) | q5 : int(1..let1)]) <= let1,
+    and([q7 + 1 <= x_ExplicitVarSizeWithMarker_Marker ->
+         x_ExplicitVarSizeWithMarker_Values[q7] < x_ExplicitVarSizeWithMarker_Values[q7 + 1]
+             | q7 : int(1..let1 - 1)]),
+    and([q8 > x_ExplicitVarSizeWithMarker_Marker -> x_ExplicitVarSizeWithMarker_Values[q8] = min(let2)
+             | q8 : int(1..let1)]),
+    1 <= x_ExplicitVarSizeWithMarker_Marker,
+    x_ExplicitVarSizeWithMarker_Marker <= let1,
+    and([q11 <= x_ExplicitVarSizeWithMarker_Marker ->
+         or([x_ExplicitVarSizeWithFlags_Flags[q13] /\
+             x_ExplicitVarSizeWithFlags_Values[q13] = x_ExplicitVarSizeWithMarker_Values[q11]
+                 | q13 : int(1..let1)])
+             | q11 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q15] ->
+         or([q17 <= x_ExplicitVarSizeWithMarker_Marker /\
+             x_ExplicitVarSizeWithMarker_Values[q17] = x_ExplicitVarSizeWithFlags_Values[q15]
+                 | q17 : int(1..let1)])
+             | q15 : int(1..let1)])
+
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1-solution000001.solution
new file mode 100644
index 0000000000..273ab9e077
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-3, -2, 5}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1.eprime-param
new file mode 100644
index 0000000000..b1ce145328
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p1.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-7, -3, -2, 5, 8; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -7
+letting fin3 be 8
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000001.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000001.solution
new file mode 100644
index 0000000000..102034e8e6
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000001.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 1, 4}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000002.solution b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000002.solution
new file mode 100644
index 0000000000..3192b721eb
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2-solution000002.solution
@@ -0,0 +1,3 @@
+language Essence 1.3
+
+letting x be {-5, 2, 3}
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2.eprime-param b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2.eprime-param
new file mode 100644
index 0000000000..2d232d7d8a
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2-p2.eprime-param
@@ -0,0 +1,7 @@
+language ESSENCE' 1.0
+
+letting nums_Explicit be [-5, 1, 2, 3, 4; int(1..5)]
+letting s be 0
+letting fin1 be 5
+letting fin2 be -5
+letting fin3 be 4
diff --git a/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2.eprime b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2.eprime
new file mode 100644
index 0000000000..e242a71db7
--- /dev/null
+++ b/tests/exhaustive/mildly_interesting/subsetSum/expected/model_2_2_2.eprime
@@ -0,0 +1,28 @@
+language ESSENCE' 1.0
+
+given s: int
+given fin1: int
+given fin2: int
+given fin3: int
+given nums_Explicit: matrix indexed by [int(1..fin1)] of int(fin2..fin3)
+letting let1 be fin1
+letting let2 be [nums_Explicit[q7] | q7 : int(1..fin1)]
+find x_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..let1)] of bool
+find x_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..let1)] of int(let2)
+branching on [x_ExplicitVarSizeWithFlags_Flags, x_ExplicitVarSizeWithFlags_Values]
+such that
+    and([x_ExplicitVarSizeWithFlags_Flags[q10] ->
+         or([nums_Explicit[q12] = x_ExplicitVarSizeWithFlags_Values[q10] | q12 : int(1..fin1)])
+             | q10 : int(1..let1)]),
+    s =
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q8]) * catchUndef(x_ExplicitVarSizeWithFlags_Values[q8], 0)
+             | q8 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q2 + 1] ->
+         x_ExplicitVarSizeWithFlags_Values[q2] < x_ExplicitVarSizeWithFlags_Values[q2 + 1]
+             | q2 : int(1..let1 - 1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q3] = false -> x_ExplicitVarSizeWithFlags_Values[q3] = min(let2)
+             | q3 : int(1..let1)]),
+    and([x_ExplicitVarSizeWithFlags_Flags[q4 + 1] -> x_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..let1 - 1)]),
+    1 <= sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q5]) | q5 : int(1..let1)]),
+    sum([toInt(x_ExplicitVarSizeWithFlags_Flags[q5]) | q5 : int(1..let1)]) <= let1
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000001.solution
new file mode 100644
index 0000000000..534774871a
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000002.solution
new file mode 100644
index 0000000000..9346e1754b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000003.solution
new file mode 100644
index 0000000000..74b1a6d481
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(1 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000004.solution
new file mode 100644
index 0000000000..4a96af448e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(1 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000005.solution
new file mode 100644
index 0000000000..0e18364d45
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000006.solution
new file mode 100644
index 0000000000..a342f9b86e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(1 --> false, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000007.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000007.solution
new file mode 100644
index 0000000000..5677d2b395
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000007.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(1 --> true, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000008.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000008.solution
new file mode 100644
index 0000000000..2df313a9bf
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000008.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function()
+letting b be function(1 --> true, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000009.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000009.solution
new file mode 100644
index 0000000000..58fbafa57e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000009.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> false)
+letting b be function(1 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000010.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000010.solution
new file mode 100644
index 0000000000..789b9c90d3
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000010.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> false)
+letting b be function(1 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000011.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000011.solution
new file mode 100644
index 0000000000..2edff105b5
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000011.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> false)
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000012.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000012.solution
new file mode 100644
index 0000000000..74e94168a0
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000012.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> false)
+letting b be function(1 --> false, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000013.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000013.solution
new file mode 100644
index 0000000000..093bdec177
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000013.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> false)
+letting b be function(1 --> true, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000014.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000014.solution
new file mode 100644
index 0000000000..7f91bef76e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000014.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> false)
+letting b be function(1 --> true, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000015.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000015.solution
new file mode 100644
index 0000000000..2d31ea87c0
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000015.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> true)
+letting b be function(2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000016.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000016.solution
new file mode 100644
index 0000000000..39c8593d69
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000016.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> true)
+letting b be function(1 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000017.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000017.solution
new file mode 100644
index 0000000000..a0d0c36916
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000017.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> true)
+letting b be function(1 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000018.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000018.solution
new file mode 100644
index 0000000000..f9ea159aa2
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000018.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> true)
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000019.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000019.solution
new file mode 100644
index 0000000000..957cf9fb82
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000019.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> true)
+letting b be function(1 --> false, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000020.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000020.solution
new file mode 100644
index 0000000000..3f9decd735
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000020.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> true)
+letting b be function(1 --> true, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000021.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000021.solution
new file mode 100644
index 0000000000..46ef148b20
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000021.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(2 --> true)
+letting b be function(1 --> true, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000022.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000022.solution
new file mode 100644
index 0000000000..2452e99fe4
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000022.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> false)
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000023.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000023.solution
new file mode 100644
index 0000000000..d7ded0c4b6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000023.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> false)
+letting b be function(1 --> false, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000024.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000024.solution
new file mode 100644
index 0000000000..dd8080c849
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000024.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true)
+letting b be function(1 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000025.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000025.solution
new file mode 100644
index 0000000000..270ba7d5b7
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000025.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true)
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000026.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000026.solution
new file mode 100644
index 0000000000..9081271d97
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000026.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true)
+letting b be function(1 --> false, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000027.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000027.solution
new file mode 100644
index 0000000000..75603c59ea
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000027.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true)
+letting b be function(1 --> true, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000028.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000028.solution
new file mode 100644
index 0000000000..3784cc005f
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000028.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true)
+letting b be function(1 --> true, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000029.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000029.solution
new file mode 100644
index 0000000000..3e724ff0d1
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000029.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> false, 2 --> true)
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000030.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000030.solution
new file mode 100644
index 0000000000..e63fb8f776
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000030.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true, 2 --> false)
+letting b be function(1 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000031.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000031.solution
new file mode 100644
index 0000000000..80da5627ce
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000031.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true, 2 --> false)
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000032.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000032.solution
new file mode 100644
index 0000000000..6944fdbfc9
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000032.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true, 2 --> false)
+letting b be function(1 --> false, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000033.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000033.solution
new file mode 100644
index 0000000000..2143a4e6fe
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000033.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true, 2 --> true)
+letting b be function(1 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000034.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000034.solution
new file mode 100644
index 0000000000..e9eb65412b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000034.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true, 2 --> true)
+letting b be function(1 --> false, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000035.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000035.solution
new file mode 100644
index 0000000000..0e6e174af5
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000035.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true, 2 --> true)
+letting b be function(1 --> false, 2 --> true)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000036.solution b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000036.solution
new file mode 100644
index 0000000000..cd636fd528
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model-solution000036.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be function(1 --> true, 2 --> true)
+letting b be function(1 --> true, 2 --> false)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model.eprime b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model.eprime
new file mode 100644
index 0000000000..18f14caf88
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_function_01/expected/model.eprime
@@ -0,0 +1,91 @@
+language ESSENCE' 1.0
+
+find a_Function1DPartial_Flags: matrix indexed by [int(1..2)] of bool
+find a_Function1DPartial_Values: matrix indexed by [int(1..2)] of bool
+find b_Function1DPartial_Flags: matrix indexed by [int(1..2)] of bool
+find b_Function1DPartial_Values: matrix indexed by [int(1..2)] of bool
+branching on
+    [a_Function1DPartial_Flags, a_Function1DPartial_Values, b_Function1DPartial_Flags, b_Function1DPartial_Values]
+such that
+    or([a_Function1DPartial_Flags[q9] /\
+        (sum([toInt(a_Function1DPartial_Flags[q30]) *
+              catchUndef(toInt(q30 = q9 /\ a_Function1DPartial_Values[q30] = a_Function1DPartial_Values[q9]), 0)
+                  | q30 : int(1..2)])
+         <
+         sum([toInt(b_Function1DPartial_Flags[q32]) *
+              catchUndef(toInt(q32 = q9 /\ b_Function1DPartial_Values[q32] = a_Function1DPartial_Values[q9]), 0)
+                  | q32 : int(1..2)])
+         /\
+         (and([a_Function1DPartial_Flags[q33] /\
+               (q33 < q9 \/ q33 = q9 /\ a_Function1DPartial_Values[q33] < a_Function1DPartial_Values[q9])
+               ->
+               sum([toInt(a_Function1DPartial_Flags[q42]) *
+                    catchUndef(toInt(q42 = q33 /\ a_Function1DPartial_Values[q42] = a_Function1DPartial_Values[q33]), 0)
+                        | q42 : int(1..2)])
+               =
+               sum([toInt(b_Function1DPartial_Flags[q44]) *
+                    catchUndef(toInt(q44 = q33 /\ b_Function1DPartial_Values[q44] = a_Function1DPartial_Values[q33]), 0)
+                        | q44 : int(1..2)])
+                   | q33 : int(1..2)])
+          /\
+          and([and([b_Function1DPartial_Flags[q34],
+                    !or([a_Function1DPartial_Flags[q40] /\
+                         (q40 = q34 /\ a_Function1DPartial_Values[q40] = b_Function1DPartial_Values[q34])
+                             | q40 : int(1..2)]),
+                    q34 < q9 \/ q34 = q9 /\ b_Function1DPartial_Values[q34] < a_Function1DPartial_Values[q9];
+                        int(1..3)])
+               ->
+               sum([toInt(a_Function1DPartial_Flags[q36]) *
+                    catchUndef(toInt(q36 = q34 /\ a_Function1DPartial_Values[q36] = b_Function1DPartial_Values[q34]), 0)
+                        | q36 : int(1..2)])
+               =
+               sum([toInt(b_Function1DPartial_Flags[q38]) *
+                    catchUndef(toInt(q38 = q34 /\ b_Function1DPartial_Values[q38] = b_Function1DPartial_Values[q34]), 0)
+                        | q38 : int(1..2)])
+                   | q34 : int(1..2)])))
+            | q9 : int(1..2)])
+    \/
+    or([b_Function1DPartial_Flags[q10] /\
+        !or([a_Function1DPartial_Flags[q28] /\
+             (q28 = q10 /\ a_Function1DPartial_Values[q28] = b_Function1DPartial_Values[q10])
+                 | q28 : int(1..2)])
+        /\
+        (sum([toInt(a_Function1DPartial_Flags[q12]) *
+              catchUndef(toInt(q12 = q10 /\ a_Function1DPartial_Values[q12] = b_Function1DPartial_Values[q10]), 0)
+                  | q12 : int(1..2)])
+         <
+         sum([toInt(b_Function1DPartial_Flags[q14]) *
+              catchUndef(toInt(q14 = q10 /\ b_Function1DPartial_Values[q14] = b_Function1DPartial_Values[q10]), 0)
+                  | q14 : int(1..2)])
+         /\
+         (and([a_Function1DPartial_Flags[q15] /\
+               (q15 < q10 \/ q15 = q10 /\ a_Function1DPartial_Values[q15] < b_Function1DPartial_Values[q10])
+               ->
+               sum([toInt(a_Function1DPartial_Flags[q24]) *
+                    catchUndef(toInt(q24 = q15 /\ a_Function1DPartial_Values[q24] = a_Function1DPartial_Values[q15]), 0)
+                        | q24 : int(1..2)])
+               =
+               sum([toInt(b_Function1DPartial_Flags[q26]) *
+                    catchUndef(toInt(q26 = q15 /\ b_Function1DPartial_Values[q26] = a_Function1DPartial_Values[q15]), 0)
+                        | q26 : int(1..2)])
+                   | q15 : int(1..2)])
+          /\
+          and([and([b_Function1DPartial_Flags[q16],
+                    !or([a_Function1DPartial_Flags[q22] /\
+                         (q22 = q16 /\ a_Function1DPartial_Values[q22] = b_Function1DPartial_Values[q16])
+                             | q22 : int(1..2)]),
+                    q16 < q10 \/ q16 = q10 /\ b_Function1DPartial_Values[q16] < b_Function1DPartial_Values[q10];
+                        int(1..3)])
+               ->
+               sum([toInt(a_Function1DPartial_Flags[q18]) *
+                    catchUndef(toInt(q18 = q16 /\ a_Function1DPartial_Values[q18] = b_Function1DPartial_Values[q16]), 0)
+                        | q18 : int(1..2)])
+               =
+               sum([toInt(b_Function1DPartial_Flags[q20]) *
+                    catchUndef(toInt(q20 = q16 /\ b_Function1DPartial_Values[q20] = b_Function1DPartial_Values[q16]), 0)
+                        | q20 : int(1..2)])
+                   | q16 : int(1..2)])))
+            | q10 : int(1..2)]),
+    and([a_Function1DPartial_Flags[q1] = false -> a_Function1DPartial_Values[q1] = false | q1 : int(1..2)]),
+    and([b_Function1DPartial_Flags[q4] = false -> b_Function1DPartial_Values[q4] = false | q4 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_1_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_2_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_1_3_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_1_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2.eprime
new file mode 100644
index 0000000000..24067a2f5e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_2.eprime
@@ -0,0 +1,66 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on
+    [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_ExplicitWithRepetition_Flag,
+     b_ExplicitWithRepetition_Values]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q34] = a_ExplicitWithRepetition_Values[q13])
+                 | q34 : int(1..3), q34 <= 3])
+        <
+        sum([toInt(b_ExplicitWithRepetition_Values[q36] = a_ExplicitWithRepetition_Values[q13])
+                 | q36 : int(1..3), q36 <= 3])
+        /\
+        (and([a_ExplicitWithRepetition_Values[q37] < a_ExplicitWithRepetition_Values[q13] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q46] = a_ExplicitWithRepetition_Values[q37])
+                       | q46 : int(1..3), q46 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q48] = a_ExplicitWithRepetition_Values[q37])
+                       | q48 : int(1..3), q48 <= 3])
+                  | q37 : int(1..3), q37 <= 3])
+         /\
+         and([!or([a_ExplicitWithRepetition_Values[q40] = b_ExplicitWithRepetition_Values[q38]
+                       | q40 : int(1..3), q40 <= 3])
+              /\ b_ExplicitWithRepetition_Values[q38] < a_ExplicitWithRepetition_Values[q13]
+              ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q42] = b_ExplicitWithRepetition_Values[q38])
+                       | q42 : int(1..3), q42 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q44] = b_ExplicitWithRepetition_Values[q38])
+                       | q44 : int(1..3), q44 <= 3])
+                  | q38 : int(1..3), q38 <= 3]))
+            | q13 : int(1..3), q13 <= 3])
+    \/
+    or([!or([a_ExplicitWithRepetition_Values[q16] = b_ExplicitWithRepetition_Values[q14] | q16 : int(1..3), q16 <= 3])
+        /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q18] = b_ExplicitWithRepetition_Values[q14])
+                  | q18 : int(1..3), q18 <= 3])
+         <
+         sum([toInt(b_ExplicitWithRepetition_Values[q20] = b_ExplicitWithRepetition_Values[q14])
+                  | q20 : int(1..3), q20 <= 3])
+         /\
+         (and([a_ExplicitWithRepetition_Values[q21] < b_ExplicitWithRepetition_Values[q14] ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q30] = a_ExplicitWithRepetition_Values[q21])
+                        | q30 : int(1..3), q30 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q32] = a_ExplicitWithRepetition_Values[q21])
+                        | q32 : int(1..3), q32 <= 3])
+                   | q21 : int(1..3), q21 <= 3])
+          /\
+          and([!or([a_ExplicitWithRepetition_Values[q24] = b_ExplicitWithRepetition_Values[q22]
+                        | q24 : int(1..3), q24 <= 3])
+               /\ b_ExplicitWithRepetition_Values[q22] < b_ExplicitWithRepetition_Values[q14]
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q26] = b_ExplicitWithRepetition_Values[q22])
+                        | q26 : int(1..3), q26 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q28] = b_ExplicitWithRepetition_Values[q22])
+                        | q28 : int(1..3), q28 <= 3])
+                   | q22 : int(1..3), q22 <= 3])))
+            | q14 : int(1..3), q14 <= 3]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    and([b_ExplicitWithRepetition_Values[q6] <= b_ExplicitWithRepetition_Values[q6 + 1] | q6 : int(1..2), q6 + 1 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3.eprime
new file mode 100644
index 0000000000..3c8a938e45
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_2_3.eprime
@@ -0,0 +1,75 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on
+    [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_MOccurrence, b_ExplicitWithRepetition_Flag,
+     b_ExplicitWithRepetition_Values]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q42] = a_ExplicitWithRepetition_Values[q21])
+                 | q42 : int(1..3), q42 <= 3])
+        <
+        sum([toInt(b_ExplicitWithRepetition_Values[q44] = a_ExplicitWithRepetition_Values[q21])
+                 | q44 : int(1..3), q44 <= 3])
+        /\
+        (and([a_ExplicitWithRepetition_Values[q45] < a_ExplicitWithRepetition_Values[q21] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q54] = a_ExplicitWithRepetition_Values[q45])
+                       | q54 : int(1..3), q54 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q56] = a_ExplicitWithRepetition_Values[q45])
+                       | q56 : int(1..3), q56 <= 3])
+                  | q45 : int(1..3), q45 <= 3])
+         /\
+         and([!or([a_ExplicitWithRepetition_Values[q48] = b_ExplicitWithRepetition_Values[q46]
+                       | q48 : int(1..3), q48 <= 3])
+              /\ b_ExplicitWithRepetition_Values[q46] < a_ExplicitWithRepetition_Values[q21]
+              ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q50] = b_ExplicitWithRepetition_Values[q46])
+                       | q50 : int(1..3), q50 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q52] = b_ExplicitWithRepetition_Values[q46])
+                       | q52 : int(1..3), q52 <= 3])
+                  | q46 : int(1..3), q46 <= 3]))
+            | q21 : int(1..3), q21 <= 3])
+    \/
+    or([!or([a_ExplicitWithRepetition_Values[q24] = b_ExplicitWithRepetition_Values[q22] | q24 : int(1..3), q24 <= 3])
+        /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q26] = b_ExplicitWithRepetition_Values[q22])
+                  | q26 : int(1..3), q26 <= 3])
+         <
+         sum([toInt(b_ExplicitWithRepetition_Values[q28] = b_ExplicitWithRepetition_Values[q22])
+                  | q28 : int(1..3), q28 <= 3])
+         /\
+         (and([a_ExplicitWithRepetition_Values[q29] < b_ExplicitWithRepetition_Values[q22] ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q38] = a_ExplicitWithRepetition_Values[q29])
+                        | q38 : int(1..3), q38 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q40] = a_ExplicitWithRepetition_Values[q29])
+                        | q40 : int(1..3), q40 <= 3])
+                   | q29 : int(1..3), q29 <= 3])
+          /\
+          and([!or([a_ExplicitWithRepetition_Values[q32] = b_ExplicitWithRepetition_Values[q30]
+                        | q32 : int(1..3), q32 <= 3])
+               /\ b_ExplicitWithRepetition_Values[q30] < b_ExplicitWithRepetition_Values[q22]
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q34] = b_ExplicitWithRepetition_Values[q30])
+                        | q34 : int(1..3), q34 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q36] = b_ExplicitWithRepetition_Values[q30])
+                        | q36 : int(1..3), q36 <= 3])
+                   | q30 : int(1..3), q30 <= 3])))
+            | q22 : int(1..3), q22 <= 3]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    and([b_ExplicitWithRepetition_Values[q6] <= b_ExplicitWithRepetition_Values[q6 + 1] | q6 : int(1..2), q6 + 1 <= 3]),
+    3 = sum([b_MOccurrence[q11] | q11 : int(1..2)]),
+    and([b_MOccurrence[q13] > 0 ->
+         b_MOccurrence[q13] = sum([toInt(b_ExplicitWithRepetition_Values[q15] = q13) | q15 : int(1..3), q15 <= 3])
+             | q13 : int(1..2)]),
+    and([b_MOccurrence[b_ExplicitWithRepetition_Values[q16]] =
+         sum([toInt(b_ExplicitWithRepetition_Values[q18] = b_ExplicitWithRepetition_Values[q16])
+                  | q18 : int(1..3), q18 <= 3])
+             | q16 : int(1..3), q16 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2.eprime
new file mode 100644
index 0000000000..f152965fd1
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_2.eprime
@@ -0,0 +1,75 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on
+    [a_MOccurrence, a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_ExplicitWithRepetition_Flag,
+     b_ExplicitWithRepetition_Values]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q42] = a_ExplicitWithRepetition_Values[q21])
+                 | q42 : int(1..3), q42 <= 3])
+        <
+        sum([toInt(b_ExplicitWithRepetition_Values[q44] = a_ExplicitWithRepetition_Values[q21])
+                 | q44 : int(1..3), q44 <= 3])
+        /\
+        (and([a_ExplicitWithRepetition_Values[q45] < a_ExplicitWithRepetition_Values[q21] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q54] = a_ExplicitWithRepetition_Values[q45])
+                       | q54 : int(1..3), q54 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q56] = a_ExplicitWithRepetition_Values[q45])
+                       | q56 : int(1..3), q56 <= 3])
+                  | q45 : int(1..3), q45 <= 3])
+         /\
+         and([!or([a_ExplicitWithRepetition_Values[q48] = b_ExplicitWithRepetition_Values[q46]
+                       | q48 : int(1..3), q48 <= 3])
+              /\ b_ExplicitWithRepetition_Values[q46] < a_ExplicitWithRepetition_Values[q21]
+              ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q50] = b_ExplicitWithRepetition_Values[q46])
+                       | q50 : int(1..3), q50 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q52] = b_ExplicitWithRepetition_Values[q46])
+                       | q52 : int(1..3), q52 <= 3])
+                  | q46 : int(1..3), q46 <= 3]))
+            | q21 : int(1..3), q21 <= 3])
+    \/
+    or([!or([a_ExplicitWithRepetition_Values[q24] = b_ExplicitWithRepetition_Values[q22] | q24 : int(1..3), q24 <= 3])
+        /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q26] = b_ExplicitWithRepetition_Values[q22])
+                  | q26 : int(1..3), q26 <= 3])
+         <
+         sum([toInt(b_ExplicitWithRepetition_Values[q28] = b_ExplicitWithRepetition_Values[q22])
+                  | q28 : int(1..3), q28 <= 3])
+         /\
+         (and([a_ExplicitWithRepetition_Values[q29] < b_ExplicitWithRepetition_Values[q22] ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q38] = a_ExplicitWithRepetition_Values[q29])
+                        | q38 : int(1..3), q38 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q40] = a_ExplicitWithRepetition_Values[q29])
+                        | q40 : int(1..3), q40 <= 3])
+                   | q29 : int(1..3), q29 <= 3])
+          /\
+          and([!or([a_ExplicitWithRepetition_Values[q32] = b_ExplicitWithRepetition_Values[q30]
+                        | q32 : int(1..3), q32 <= 3])
+               /\ b_ExplicitWithRepetition_Values[q30] < b_ExplicitWithRepetition_Values[q22]
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q34] = b_ExplicitWithRepetition_Values[q30])
+                        | q34 : int(1..3), q34 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q36] = b_ExplicitWithRepetition_Values[q30])
+                        | q36 : int(1..3), q36 <= 3])
+                   | q30 : int(1..3), q30 <= 3])))
+            | q22 : int(1..3), q22 <= 3]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    and([b_ExplicitWithRepetition_Values[q6] <= b_ExplicitWithRepetition_Values[q6 + 1] | q6 : int(1..2), q6 + 1 <= 3]),
+    3 = sum([a_MOccurrence[q11] | q11 : int(1..2)]),
+    and([a_MOccurrence[q13] > 0 ->
+         a_MOccurrence[q13] = sum([toInt(a_ExplicitWithRepetition_Values[q15] = q13) | q15 : int(1..3), q15 <= 3])
+             | q13 : int(1..2)]),
+    and([a_MOccurrence[a_ExplicitWithRepetition_Values[q16]] =
+         sum([toInt(a_ExplicitWithRepetition_Values[q18] = a_ExplicitWithRepetition_Values[q16])
+                  | q18 : int(1..3), q18 <= 3])
+             | q16 : int(1..3), q16 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3.eprime
new file mode 100644
index 0000000000..bc2ecdfcfe
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_2_3_3.eprime
@@ -0,0 +1,84 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on
+    [a_MOccurrence, a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_MOccurrence,
+     b_ExplicitWithRepetition_Flag, b_ExplicitWithRepetition_Values]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q50] = a_ExplicitWithRepetition_Values[q29])
+                 | q50 : int(1..3), q50 <= 3])
+        <
+        sum([toInt(b_ExplicitWithRepetition_Values[q52] = a_ExplicitWithRepetition_Values[q29])
+                 | q52 : int(1..3), q52 <= 3])
+        /\
+        (and([a_ExplicitWithRepetition_Values[q53] < a_ExplicitWithRepetition_Values[q29] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q62] = a_ExplicitWithRepetition_Values[q53])
+                       | q62 : int(1..3), q62 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q64] = a_ExplicitWithRepetition_Values[q53])
+                       | q64 : int(1..3), q64 <= 3])
+                  | q53 : int(1..3), q53 <= 3])
+         /\
+         and([!or([a_ExplicitWithRepetition_Values[q56] = b_ExplicitWithRepetition_Values[q54]
+                       | q56 : int(1..3), q56 <= 3])
+              /\ b_ExplicitWithRepetition_Values[q54] < a_ExplicitWithRepetition_Values[q29]
+              ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q58] = b_ExplicitWithRepetition_Values[q54])
+                       | q58 : int(1..3), q58 <= 3])
+              =
+              sum([toInt(b_ExplicitWithRepetition_Values[q60] = b_ExplicitWithRepetition_Values[q54])
+                       | q60 : int(1..3), q60 <= 3])
+                  | q54 : int(1..3), q54 <= 3]))
+            | q29 : int(1..3), q29 <= 3])
+    \/
+    or([!or([a_ExplicitWithRepetition_Values[q32] = b_ExplicitWithRepetition_Values[q30] | q32 : int(1..3), q32 <= 3])
+        /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q34] = b_ExplicitWithRepetition_Values[q30])
+                  | q34 : int(1..3), q34 <= 3])
+         <
+         sum([toInt(b_ExplicitWithRepetition_Values[q36] = b_ExplicitWithRepetition_Values[q30])
+                  | q36 : int(1..3), q36 <= 3])
+         /\
+         (and([a_ExplicitWithRepetition_Values[q37] < b_ExplicitWithRepetition_Values[q30] ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q46] = a_ExplicitWithRepetition_Values[q37])
+                        | q46 : int(1..3), q46 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q48] = a_ExplicitWithRepetition_Values[q37])
+                        | q48 : int(1..3), q48 <= 3])
+                   | q37 : int(1..3), q37 <= 3])
+          /\
+          and([!or([a_ExplicitWithRepetition_Values[q40] = b_ExplicitWithRepetition_Values[q38]
+                        | q40 : int(1..3), q40 <= 3])
+               /\ b_ExplicitWithRepetition_Values[q38] < b_ExplicitWithRepetition_Values[q30]
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q42] = b_ExplicitWithRepetition_Values[q38])
+                        | q42 : int(1..3), q42 <= 3])
+               =
+               sum([toInt(b_ExplicitWithRepetition_Values[q44] = b_ExplicitWithRepetition_Values[q38])
+                        | q44 : int(1..3), q44 <= 3])
+                   | q38 : int(1..3), q38 <= 3])))
+            | q30 : int(1..3), q30 <= 3]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    and([b_ExplicitWithRepetition_Values[q6] <= b_ExplicitWithRepetition_Values[q6 + 1] | q6 : int(1..2), q6 + 1 <= 3]),
+    3 = sum([a_MOccurrence[q11] | q11 : int(1..2)]),
+    and([a_MOccurrence[q21] > 0 ->
+         a_MOccurrence[q21] = sum([toInt(a_ExplicitWithRepetition_Values[q23] = q21) | q23 : int(1..3), q23 <= 3])
+             | q21 : int(1..2)]),
+    and([a_MOccurrence[a_ExplicitWithRepetition_Values[q24]] =
+         sum([toInt(a_ExplicitWithRepetition_Values[q26] = a_ExplicitWithRepetition_Values[q24])
+                  | q26 : int(1..3), q26 <= 3])
+             | q24 : int(1..3), q24 <= 3]),
+    3 = sum([b_MOccurrence[q12] | q12 : int(1..2)]),
+    and([b_MOccurrence[q14] > 0 ->
+         b_MOccurrence[q14] = sum([toInt(b_ExplicitWithRepetition_Values[q16] = q14) | q16 : int(1..3), q16 <= 3])
+             | q14 : int(1..2)]),
+    and([b_MOccurrence[b_ExplicitWithRepetition_Values[q17]] =
+         sum([toInt(b_ExplicitWithRepetition_Values[q19] = b_ExplicitWithRepetition_Values[q17])
+                  | q19 : int(1..3), q19 <= 3])
+             | q17 : int(1..3), q17 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2.eprime
new file mode 100644
index 0000000000..d9e532d5b0
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_2.eprime
@@ -0,0 +1,53 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on
+    [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_ExplicitWithRepetition_Flag,
+     b_ExplicitWithRepetition_Values, b_MOccurrence]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q28] = a_ExplicitWithRepetition_Values[q29])
+                 | q28 : int(1..3), q28 <= 3])
+        < b_MOccurrence[a_ExplicitWithRepetition_Values[q29]]
+        /\
+        (and([a_ExplicitWithRepetition_Values[q23] < a_ExplicitWithRepetition_Values[q29] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q22] = a_ExplicitWithRepetition_Values[q23])
+                       | q22 : int(1..3), q22 <= 3])
+              = b_MOccurrence[a_ExplicitWithRepetition_Values[q23]]
+                  | q23 : int(1..3), q23 <= 3])
+         /\
+         and([q26 < a_ExplicitWithRepetition_Values[q29] ->
+              (b_MOccurrence[q26] > 0 /\ !or([a_ExplicitWithRepetition_Values[q25] = q26 | q25 : int(1..3), q25 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q22] = q26) | q22 : int(1..3), q22 <= 3]) =
+               b_MOccurrence[q26])
+                  | q26 : int(1..2)]))
+            | q29 : int(1..3), q29 <= 3])
+    \/
+    or([b_MOccurrence[q32] > 0 /\ !or([a_ExplicitWithRepetition_Values[q31] = q32 | q31 : int(1..3), q31 <= 3]) /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q28] = q32) | q28 : int(1..3), q28 <= 3]) < b_MOccurrence[q32] /\
+         (and([a_ExplicitWithRepetition_Values[q23] < q32 ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q22] = a_ExplicitWithRepetition_Values[q23])
+                        | q22 : int(1..3), q22 <= 3])
+               = b_MOccurrence[a_ExplicitWithRepetition_Values[q23]]
+                   | q23 : int(1..3), q23 <= 3])
+          /\
+          and([b_MOccurrence[q26] > 0 /\ !or([a_ExplicitWithRepetition_Values[q25] = q26 | q25 : int(1..3), q25 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q22] = q26) | q22 : int(1..3), q22 <= 3]) = b_MOccurrence[q26]
+                   | q26 : int(1..2), q26 < q32])))
+            | q32 : int(1..2)]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    3 = sum([b_MOccurrence[q6] | q6 : int(1..2)]),
+    and([b_ExplicitWithRepetition_Values[q7] <= b_ExplicitWithRepetition_Values[q7 + 1] | q7 : int(1..2), q7 + 1 <= 3]),
+    and([sum([toInt(b_ExplicitWithRepetition_Values[q15] = b_ExplicitWithRepetition_Values[q13])
+                  | q15 : int(1..3), q15 <= 3])
+         = b_MOccurrence[b_ExplicitWithRepetition_Values[q13]]
+             | q13 : int(1..3), q13 <= 3]),
+    and([b_MOccurrence[q16] > 0 ->
+         sum([toInt(b_ExplicitWithRepetition_Values[q18] = q16) | q18 : int(1..3), q18 <= 3]) = b_MOccurrence[q16]
+             | q16 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3.eprime
new file mode 100644
index 0000000000..3857dbf52e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_2_3.eprime
@@ -0,0 +1,41 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_MOccurrence]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q16] = a_ExplicitWithRepetition_Values[q17])
+                 | q16 : int(1..3), q16 <= 3])
+        < b_MOccurrence[a_ExplicitWithRepetition_Values[q17]]
+        /\
+        (and([a_ExplicitWithRepetition_Values[q11] < a_ExplicitWithRepetition_Values[q17] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q10] = a_ExplicitWithRepetition_Values[q11])
+                       | q10 : int(1..3), q10 <= 3])
+              = b_MOccurrence[a_ExplicitWithRepetition_Values[q11]]
+                  | q11 : int(1..3), q11 <= 3])
+         /\
+         and([q14 < a_ExplicitWithRepetition_Values[q17] ->
+              (b_MOccurrence[q14] > 0 /\ !or([a_ExplicitWithRepetition_Values[q13] = q14 | q13 : int(1..3), q13 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q10] = q14) | q10 : int(1..3), q10 <= 3]) =
+               b_MOccurrence[q14])
+                  | q14 : int(1..2)]))
+            | q17 : int(1..3), q17 <= 3])
+    \/
+    or([b_MOccurrence[q20] > 0 /\ !or([a_ExplicitWithRepetition_Values[q19] = q20 | q19 : int(1..3), q19 <= 3]) /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q16] = q20) | q16 : int(1..3), q16 <= 3]) < b_MOccurrence[q20] /\
+         (and([a_ExplicitWithRepetition_Values[q11] < q20 ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q10] = a_ExplicitWithRepetition_Values[q11])
+                        | q10 : int(1..3), q10 <= 3])
+               = b_MOccurrence[a_ExplicitWithRepetition_Values[q11]]
+                   | q11 : int(1..3), q11 <= 3])
+          /\
+          and([b_MOccurrence[q14] > 0 /\ !or([a_ExplicitWithRepetition_Values[q13] = q14 | q13 : int(1..3), q13 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q10] = q14) | q10 : int(1..3), q10 <= 3]) = b_MOccurrence[q14]
+                   | q14 : int(1..2), q14 < q20])))
+            | q20 : int(1..2)]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    3 = sum([b_MOccurrence[q6] | q6 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2.eprime
new file mode 100644
index 0000000000..f5bfe69d73
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_2.eprime
@@ -0,0 +1,62 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on
+    [a_MOccurrence, a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_ExplicitWithRepetition_Flag,
+     b_ExplicitWithRepetition_Values, b_MOccurrence]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q36] = a_ExplicitWithRepetition_Values[q37])
+                 | q36 : int(1..3), q36 <= 3])
+        < b_MOccurrence[a_ExplicitWithRepetition_Values[q37]]
+        /\
+        (and([a_ExplicitWithRepetition_Values[q31] < a_ExplicitWithRepetition_Values[q37] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q30] = a_ExplicitWithRepetition_Values[q31])
+                       | q30 : int(1..3), q30 <= 3])
+              = b_MOccurrence[a_ExplicitWithRepetition_Values[q31]]
+                  | q31 : int(1..3), q31 <= 3])
+         /\
+         and([q34 < a_ExplicitWithRepetition_Values[q37] ->
+              (b_MOccurrence[q34] > 0 /\ !or([a_ExplicitWithRepetition_Values[q33] = q34 | q33 : int(1..3), q33 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q30] = q34) | q30 : int(1..3), q30 <= 3]) =
+               b_MOccurrence[q34])
+                  | q34 : int(1..2)]))
+            | q37 : int(1..3), q37 <= 3])
+    \/
+    or([b_MOccurrence[q40] > 0 /\ !or([a_ExplicitWithRepetition_Values[q39] = q40 | q39 : int(1..3), q39 <= 3]) /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q36] = q40) | q36 : int(1..3), q36 <= 3]) < b_MOccurrence[q40] /\
+         (and([a_ExplicitWithRepetition_Values[q31] < q40 ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q30] = a_ExplicitWithRepetition_Values[q31])
+                        | q30 : int(1..3), q30 <= 3])
+               = b_MOccurrence[a_ExplicitWithRepetition_Values[q31]]
+                   | q31 : int(1..3), q31 <= 3])
+          /\
+          and([b_MOccurrence[q34] > 0 /\ !or([a_ExplicitWithRepetition_Values[q33] = q34 | q33 : int(1..3), q33 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q30] = q34) | q30 : int(1..3), q30 <= 3]) = b_MOccurrence[q34]
+                   | q34 : int(1..2), q34 < q40])))
+            | q40 : int(1..2)]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    3 = sum([b_MOccurrence[q6] | q6 : int(1..2)]),
+    3 = sum([a_MOccurrence[q7] | q7 : int(1..2)]),
+    and([a_MOccurrence[q21] > 0 ->
+         a_MOccurrence[q21] = sum([toInt(a_ExplicitWithRepetition_Values[q23] = q21) | q23 : int(1..3), q23 <= 3])
+             | q21 : int(1..2)]),
+    and([a_MOccurrence[a_ExplicitWithRepetition_Values[q24]] =
+         sum([toInt(a_ExplicitWithRepetition_Values[q26] = a_ExplicitWithRepetition_Values[q24])
+                  | q26 : int(1..3), q26 <= 3])
+             | q24 : int(1..3), q24 <= 3]),
+    and([b_ExplicitWithRepetition_Values[q8] <= b_ExplicitWithRepetition_Values[q8 + 1] | q8 : int(1..2), q8 + 1 <= 3]),
+    and([sum([toInt(b_ExplicitWithRepetition_Values[q16] = b_ExplicitWithRepetition_Values[q14])
+                  | q16 : int(1..3), q16 <= 3])
+         = b_MOccurrence[b_ExplicitWithRepetition_Values[q14]]
+             | q14 : int(1..3), q14 <= 3]),
+    and([b_MOccurrence[q17] > 0 ->
+         sum([toInt(b_ExplicitWithRepetition_Values[q19] = q17) | q19 : int(1..3), q19 <= 3]) = b_MOccurrence[q17]
+             | q17 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3.eprime
new file mode 100644
index 0000000000..f51cd8c9ab
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_2_3_3_3.eprime
@@ -0,0 +1,50 @@
+language ESSENCE' 1.0
+
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on [a_MOccurrence, a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, b_MOccurrence]
+such that
+    or([sum([toInt(a_ExplicitWithRepetition_Values[q24] = a_ExplicitWithRepetition_Values[q25])
+                 | q24 : int(1..3), q24 <= 3])
+        < b_MOccurrence[a_ExplicitWithRepetition_Values[q25]]
+        /\
+        (and([a_ExplicitWithRepetition_Values[q19] < a_ExplicitWithRepetition_Values[q25] ->
+              sum([toInt(a_ExplicitWithRepetition_Values[q18] = a_ExplicitWithRepetition_Values[q19])
+                       | q18 : int(1..3), q18 <= 3])
+              = b_MOccurrence[a_ExplicitWithRepetition_Values[q19]]
+                  | q19 : int(1..3), q19 <= 3])
+         /\
+         and([q22 < a_ExplicitWithRepetition_Values[q25] ->
+              (b_MOccurrence[q22] > 0 /\ !or([a_ExplicitWithRepetition_Values[q21] = q22 | q21 : int(1..3), q21 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q18] = q22) | q18 : int(1..3), q18 <= 3]) =
+               b_MOccurrence[q22])
+                  | q22 : int(1..2)]))
+            | q25 : int(1..3), q25 <= 3])
+    \/
+    or([b_MOccurrence[q28] > 0 /\ !or([a_ExplicitWithRepetition_Values[q27] = q28 | q27 : int(1..3), q27 <= 3]) /\
+        (sum([toInt(a_ExplicitWithRepetition_Values[q24] = q28) | q24 : int(1..3), q24 <= 3]) < b_MOccurrence[q28] /\
+         (and([a_ExplicitWithRepetition_Values[q19] < q28 ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q18] = a_ExplicitWithRepetition_Values[q19])
+                        | q18 : int(1..3), q18 <= 3])
+               = b_MOccurrence[a_ExplicitWithRepetition_Values[q19]]
+                   | q19 : int(1..3), q19 <= 3])
+          /\
+          and([b_MOccurrence[q22] > 0 /\ !or([a_ExplicitWithRepetition_Values[q21] = q22 | q21 : int(1..3), q21 <= 3])
+               ->
+               sum([toInt(a_ExplicitWithRepetition_Values[q18] = q22) | q18 : int(1..3), q18 <= 3]) = b_MOccurrence[q22]
+                   | q22 : int(1..2), q22 < q28])))
+            | q28 : int(1..2)]),
+    and([a_ExplicitWithRepetition_Values[q1] <= a_ExplicitWithRepetition_Values[q1 + 1] | q1 : int(1..2), q1 + 1 <= 3]),
+    3 = sum([b_MOccurrence[q6] | q6 : int(1..2)]),
+    3 = sum([a_MOccurrence[q7] | q7 : int(1..2)]),
+    and([a_MOccurrence[q9] > 0 ->
+         a_MOccurrence[q9] = sum([toInt(a_ExplicitWithRepetition_Values[q11] = q9) | q11 : int(1..3), q11 <= 3])
+             | q9 : int(1..2)]),
+    and([a_MOccurrence[a_ExplicitWithRepetition_Values[q12]] =
+         sum([toInt(a_ExplicitWithRepetition_Values[q14] = a_ExplicitWithRepetition_Values[q12])
+                  | q14 : int(1..3), q14 <= 3])
+             | q12 : int(1..3), q12 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_1_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2.eprime
new file mode 100644
index 0000000000..559348a46a
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_2.eprime
@@ -0,0 +1,56 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on
+    [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, a_MOccurrence, b_ExplicitWithRepetition_Flag,
+     b_ExplicitWithRepetition_Values]
+such that
+    or([a_MOccurrence[q32] > 0 /\
+        (a_MOccurrence[q32] < sum([toInt(b_ExplicitWithRepetition_Values[q22] = q32) | q22 : int(1..3), q22 <= 3]) /\
+         (and([a_MOccurrence[q28] > 0 ->
+               a_MOccurrence[q28] = sum([toInt(b_ExplicitWithRepetition_Values[q24] = q28) | q24 : int(1..3), q24 <= 3])
+                   | q28 : int(1..2), q28 < q32])
+          /\
+          and([!or([a_MOccurrence[q27] > 0 /\ q27 = b_ExplicitWithRepetition_Values[q25] | q27 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q25] < q32
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q25]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q24] = b_ExplicitWithRepetition_Values[q25])
+                        | q24 : int(1..3), q24 <= 3])
+                   | q25 : int(1..3), q25 <= 3])))
+            | q32 : int(1..2)])
+    \/
+    or([!or([a_MOccurrence[q31] > 0 /\ q31 = b_ExplicitWithRepetition_Values[q29] | q31 : int(1..2)]) /\
+        (a_MOccurrence[b_ExplicitWithRepetition_Values[q29]] <
+         sum([toInt(b_ExplicitWithRepetition_Values[q22] = b_ExplicitWithRepetition_Values[q29])
+                  | q22 : int(1..3), q22 <= 3])
+         /\
+         (and([q28 < b_ExplicitWithRepetition_Values[q29] ->
+               (a_MOccurrence[q28] > 0 ->
+                a_MOccurrence[q28] =
+                sum([toInt(b_ExplicitWithRepetition_Values[q24] = q28) | q24 : int(1..3), q24 <= 3]))
+                   | q28 : int(1..2)])
+          /\
+          and([!or([a_MOccurrence[q27] > 0 /\ q27 = b_ExplicitWithRepetition_Values[q25] | q27 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q25] < b_ExplicitWithRepetition_Values[q29]
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q25]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q24] = b_ExplicitWithRepetition_Values[q25])
+                        | q24 : int(1..3), q24 <= 3])
+                   | q25 : int(1..3), q25 <= 3])))
+            | q29 : int(1..3), q29 <= 3]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    and([b_ExplicitWithRepetition_Values[q2] <= b_ExplicitWithRepetition_Values[q2 + 1] | q2 : int(1..2), q2 + 1 <= 3]),
+    and([a_ExplicitWithRepetition_Values[q7] <= a_ExplicitWithRepetition_Values[q7 + 1] | q7 : int(1..2), q7 + 1 <= 3]),
+    and([sum([toInt(a_ExplicitWithRepetition_Values[q15] = a_ExplicitWithRepetition_Values[q13])
+                  | q15 : int(1..3), q15 <= 3])
+         = a_MOccurrence[a_ExplicitWithRepetition_Values[q13]]
+             | q13 : int(1..3), q13 <= 3]),
+    and([a_MOccurrence[q16] > 0 ->
+         sum([toInt(a_ExplicitWithRepetition_Values[q18] = q16) | q18 : int(1..3), q18 <= 3]) = a_MOccurrence[q16]
+             | q16 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3.eprime
new file mode 100644
index 0000000000..86fe846f2a
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_2_3.eprime
@@ -0,0 +1,65 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on
+    [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, a_MOccurrence, b_MOccurrence,
+     b_ExplicitWithRepetition_Flag, b_ExplicitWithRepetition_Values]
+such that
+    or([a_MOccurrence[q40] > 0 /\
+        (a_MOccurrence[q40] < sum([toInt(b_ExplicitWithRepetition_Values[q30] = q40) | q30 : int(1..3), q30 <= 3]) /\
+         (and([a_MOccurrence[q36] > 0 ->
+               a_MOccurrence[q36] = sum([toInt(b_ExplicitWithRepetition_Values[q32] = q36) | q32 : int(1..3), q32 <= 3])
+                   | q36 : int(1..2), q36 < q40])
+          /\
+          and([!or([a_MOccurrence[q35] > 0 /\ q35 = b_ExplicitWithRepetition_Values[q33] | q35 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q33] < q40
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q33]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q32] = b_ExplicitWithRepetition_Values[q33])
+                        | q32 : int(1..3), q32 <= 3])
+                   | q33 : int(1..3), q33 <= 3])))
+            | q40 : int(1..2)])
+    \/
+    or([!or([a_MOccurrence[q39] > 0 /\ q39 = b_ExplicitWithRepetition_Values[q37] | q39 : int(1..2)]) /\
+        (a_MOccurrence[b_ExplicitWithRepetition_Values[q37]] <
+         sum([toInt(b_ExplicitWithRepetition_Values[q30] = b_ExplicitWithRepetition_Values[q37])
+                  | q30 : int(1..3), q30 <= 3])
+         /\
+         (and([q36 < b_ExplicitWithRepetition_Values[q37] ->
+               (a_MOccurrence[q36] > 0 ->
+                a_MOccurrence[q36] =
+                sum([toInt(b_ExplicitWithRepetition_Values[q32] = q36) | q32 : int(1..3), q32 <= 3]))
+                   | q36 : int(1..2)])
+          /\
+          and([!or([a_MOccurrence[q35] > 0 /\ q35 = b_ExplicitWithRepetition_Values[q33] | q35 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q33] < b_ExplicitWithRepetition_Values[q37]
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q33]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q32] = b_ExplicitWithRepetition_Values[q33])
+                        | q32 : int(1..3), q32 <= 3])
+                   | q33 : int(1..3), q33 <= 3])))
+            | q37 : int(1..3), q37 <= 3]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    and([b_ExplicitWithRepetition_Values[q2] <= b_ExplicitWithRepetition_Values[q2 + 1] | q2 : int(1..2), q2 + 1 <= 3]),
+    and([a_ExplicitWithRepetition_Values[q7] <= a_ExplicitWithRepetition_Values[q7 + 1] | q7 : int(1..2), q7 + 1 <= 3]),
+    and([sum([toInt(a_ExplicitWithRepetition_Values[q15] = a_ExplicitWithRepetition_Values[q13])
+                  | q15 : int(1..3), q15 <= 3])
+         = a_MOccurrence[a_ExplicitWithRepetition_Values[q13]]
+             | q13 : int(1..3), q13 <= 3]),
+    and([a_MOccurrence[q16] > 0 ->
+         sum([toInt(a_ExplicitWithRepetition_Values[q18] = q16) | q18 : int(1..3), q18 <= 3]) = a_MOccurrence[q16]
+             | q16 : int(1..2)]),
+    3 = sum([b_MOccurrence[q19] | q19 : int(1..2)]),
+    and([b_MOccurrence[q21] > 0 ->
+         b_MOccurrence[q21] = sum([toInt(b_ExplicitWithRepetition_Values[q23] = q21) | q23 : int(1..3), q23 <= 3])
+             | q21 : int(1..2)]),
+    and([b_MOccurrence[b_ExplicitWithRepetition_Values[q24]] =
+         sum([toInt(b_ExplicitWithRepetition_Values[q26] = b_ExplicitWithRepetition_Values[q24])
+                  | q26 : int(1..3), q26 <= 3])
+             | q24 : int(1..3), q24 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2.eprime
new file mode 100644
index 0000000000..5fd762ddea
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_2.eprime
@@ -0,0 +1,44 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on [a_MOccurrence, b_ExplicitWithRepetition_Flag, b_ExplicitWithRepetition_Values]
+such that
+    or([a_MOccurrence[q20] > 0 /\
+        (a_MOccurrence[q20] < sum([toInt(b_ExplicitWithRepetition_Values[q10] = q20) | q10 : int(1..3), q10 <= 3]) /\
+         (and([a_MOccurrence[q16] > 0 ->
+               a_MOccurrence[q16] = sum([toInt(b_ExplicitWithRepetition_Values[q12] = q16) | q12 : int(1..3), q12 <= 3])
+                   | q16 : int(1..2), q16 < q20])
+          /\
+          and([!or([a_MOccurrence[q15] > 0 /\ q15 = b_ExplicitWithRepetition_Values[q13] | q15 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q13] < q20
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q13]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q12] = b_ExplicitWithRepetition_Values[q13])
+                        | q12 : int(1..3), q12 <= 3])
+                   | q13 : int(1..3), q13 <= 3])))
+            | q20 : int(1..2)])
+    \/
+    or([!or([a_MOccurrence[q19] > 0 /\ q19 = b_ExplicitWithRepetition_Values[q17] | q19 : int(1..2)]) /\
+        (a_MOccurrence[b_ExplicitWithRepetition_Values[q17]] <
+         sum([toInt(b_ExplicitWithRepetition_Values[q10] = b_ExplicitWithRepetition_Values[q17])
+                  | q10 : int(1..3), q10 <= 3])
+         /\
+         (and([q16 < b_ExplicitWithRepetition_Values[q17] ->
+               (a_MOccurrence[q16] > 0 ->
+                a_MOccurrence[q16] =
+                sum([toInt(b_ExplicitWithRepetition_Values[q12] = q16) | q12 : int(1..3), q12 <= 3]))
+                   | q16 : int(1..2)])
+          /\
+          and([!or([a_MOccurrence[q15] > 0 /\ q15 = b_ExplicitWithRepetition_Values[q13] | q15 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q13] < b_ExplicitWithRepetition_Values[q17]
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q13]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q12] = b_ExplicitWithRepetition_Values[q13])
+                        | q12 : int(1..3), q12 <= 3])
+                   | q13 : int(1..3), q13 <= 3])))
+            | q17 : int(1..3), q17 <= 3]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    and([b_ExplicitWithRepetition_Values[q2] <= b_ExplicitWithRepetition_Values[q2 + 1] | q2 : int(1..2), q2 + 1 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3.eprime
new file mode 100644
index 0000000000..58c3cfbb72
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_2_3_3.eprime
@@ -0,0 +1,53 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on [a_MOccurrence, b_MOccurrence, b_ExplicitWithRepetition_Flag, b_ExplicitWithRepetition_Values]
+such that
+    or([a_MOccurrence[q28] > 0 /\
+        (a_MOccurrence[q28] < sum([toInt(b_ExplicitWithRepetition_Values[q18] = q28) | q18 : int(1..3), q18 <= 3]) /\
+         (and([a_MOccurrence[q24] > 0 ->
+               a_MOccurrence[q24] = sum([toInt(b_ExplicitWithRepetition_Values[q20] = q24) | q20 : int(1..3), q20 <= 3])
+                   | q24 : int(1..2), q24 < q28])
+          /\
+          and([!or([a_MOccurrence[q23] > 0 /\ q23 = b_ExplicitWithRepetition_Values[q21] | q23 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q21] < q28
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q21]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q20] = b_ExplicitWithRepetition_Values[q21])
+                        | q20 : int(1..3), q20 <= 3])
+                   | q21 : int(1..3), q21 <= 3])))
+            | q28 : int(1..2)])
+    \/
+    or([!or([a_MOccurrence[q27] > 0 /\ q27 = b_ExplicitWithRepetition_Values[q25] | q27 : int(1..2)]) /\
+        (a_MOccurrence[b_ExplicitWithRepetition_Values[q25]] <
+         sum([toInt(b_ExplicitWithRepetition_Values[q18] = b_ExplicitWithRepetition_Values[q25])
+                  | q18 : int(1..3), q18 <= 3])
+         /\
+         (and([q24 < b_ExplicitWithRepetition_Values[q25] ->
+               (a_MOccurrence[q24] > 0 ->
+                a_MOccurrence[q24] =
+                sum([toInt(b_ExplicitWithRepetition_Values[q20] = q24) | q20 : int(1..3), q20 <= 3]))
+                   | q24 : int(1..2)])
+          /\
+          and([!or([a_MOccurrence[q23] > 0 /\ q23 = b_ExplicitWithRepetition_Values[q21] | q23 : int(1..2)]) /\
+               b_ExplicitWithRepetition_Values[q21] < b_ExplicitWithRepetition_Values[q25]
+               ->
+               a_MOccurrence[b_ExplicitWithRepetition_Values[q21]] =
+               sum([toInt(b_ExplicitWithRepetition_Values[q20] = b_ExplicitWithRepetition_Values[q21])
+                        | q20 : int(1..3), q20 <= 3])
+                   | q21 : int(1..3), q21 <= 3])))
+            | q25 : int(1..3), q25 <= 3]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    and([b_ExplicitWithRepetition_Values[q2] <= b_ExplicitWithRepetition_Values[q2 + 1] | q2 : int(1..2), q2 + 1 <= 3]),
+    3 = sum([b_MOccurrence[q7] | q7 : int(1..2)]),
+    and([b_MOccurrence[q9] > 0 ->
+         b_MOccurrence[q9] = sum([toInt(b_ExplicitWithRepetition_Values[q11] = q9) | q11 : int(1..3), q11 <= 3])
+             | q9 : int(1..2)]),
+    and([b_MOccurrence[b_ExplicitWithRepetition_Values[q12]] =
+         sum([toInt(b_ExplicitWithRepetition_Values[q14] = b_ExplicitWithRepetition_Values[q12])
+                  | q14 : int(1..3), q14 <= 3])
+             | q12 : int(1..3), q12 <= 3])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000001.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000001.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000003.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_1_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000002.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000003.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000004.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000006.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2.eprime
new file mode 100644
index 0000000000..3433c44d83
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_2.eprime
@@ -0,0 +1,47 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on
+    [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, a_MOccurrence, b_ExplicitWithRepetition_Flag,
+     b_ExplicitWithRepetition_Values, b_MOccurrence]
+such that
+    or([a_MOccurrence[q35] > 0 /\
+        (a_MOccurrence[q35] < b_MOccurrence[q35] /\
+         (and([a_MOccurrence[q31] > 0 -> a_MOccurrence[q31] = b_MOccurrence[q31] | q31 : int(1..2), q31 < q35]) /\
+          and([b_MOccurrence[q32] > 0 /\ !or([a_MOccurrence[q30] > 0 /\ q30 = q32 | q30 : int(1..2)]) ->
+               a_MOccurrence[q32] = b_MOccurrence[q32]
+                   | q32 : int(1..2), q32 < q35])))
+            | q35 : int(1..2)])
+    \/
+    or([b_MOccurrence[q36] > 0 /\ !or([a_MOccurrence[q34] > 0 /\ q34 = q36 | q34 : int(1..2)]) /\
+        (a_MOccurrence[q36] < b_MOccurrence[q36] /\
+         (and([a_MOccurrence[q31] > 0 -> a_MOccurrence[q31] = b_MOccurrence[q31] | q31 : int(1..2), q31 < q36]) /\
+          and([b_MOccurrence[q32] > 0 /\ !or([a_MOccurrence[q30] > 0 /\ q30 = q32 | q30 : int(1..2)]) ->
+               a_MOccurrence[q32] = b_MOccurrence[q32]
+                   | q32 : int(1..2), q32 < q36])))
+            | q36 : int(1..2)]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    3 = sum([b_MOccurrence[q2] | q2 : int(1..2)]),
+    and([a_ExplicitWithRepetition_Values[q3] <= a_ExplicitWithRepetition_Values[q3 + 1] | q3 : int(1..2), q3 + 1 <= 3]),
+    and([sum([toInt(a_ExplicitWithRepetition_Values[q11] = a_ExplicitWithRepetition_Values[q9])
+                  | q11 : int(1..3), q11 <= 3])
+         = a_MOccurrence[a_ExplicitWithRepetition_Values[q9]]
+             | q9 : int(1..3), q9 <= 3]),
+    and([a_MOccurrence[q12] > 0 ->
+         sum([toInt(a_ExplicitWithRepetition_Values[q14] = q12) | q14 : int(1..3), q14 <= 3]) = a_MOccurrence[q12]
+             | q12 : int(1..2)]),
+    and([b_ExplicitWithRepetition_Values[q15] <= b_ExplicitWithRepetition_Values[q15 + 1]
+             | q15 : int(1..2), q15 + 1 <= 3]),
+    and([sum([toInt(b_ExplicitWithRepetition_Values[q23] = b_ExplicitWithRepetition_Values[q21])
+                  | q23 : int(1..3), q23 <= 3])
+         = b_MOccurrence[b_ExplicitWithRepetition_Values[q21]]
+             | q21 : int(1..3), q21 <= 3]),
+    and([b_MOccurrence[q24] > 0 ->
+         sum([toInt(b_ExplicitWithRepetition_Values[q26] = q24) | q26 : int(1..3), q26 <= 3]) = b_MOccurrence[q24]
+             | q24 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000001.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000002.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000003.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000004.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000005.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000006.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3.eprime
new file mode 100644
index 0000000000..fe7f6d1d79
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_2_3.eprime
@@ -0,0 +1,34 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find a_ExplicitWithRepetition_Flag: int(3)
+find a_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on [a_ExplicitWithRepetition_Flag, a_ExplicitWithRepetition_Values, a_MOccurrence, b_MOccurrence]
+such that
+    or([a_MOccurrence[q23] > 0 /\
+        (a_MOccurrence[q23] < b_MOccurrence[q23] /\
+         (and([a_MOccurrence[q19] > 0 -> a_MOccurrence[q19] = b_MOccurrence[q19] | q19 : int(1..2), q19 < q23]) /\
+          and([b_MOccurrence[q20] > 0 /\ !or([a_MOccurrence[q18] > 0 /\ q18 = q20 | q18 : int(1..2)]) ->
+               a_MOccurrence[q20] = b_MOccurrence[q20]
+                   | q20 : int(1..2), q20 < q23])))
+            | q23 : int(1..2)])
+    \/
+    or([b_MOccurrence[q24] > 0 /\ !or([a_MOccurrence[q22] > 0 /\ q22 = q24 | q22 : int(1..2)]) /\
+        (a_MOccurrence[q24] < b_MOccurrence[q24] /\
+         (and([a_MOccurrence[q19] > 0 -> a_MOccurrence[q19] = b_MOccurrence[q19] | q19 : int(1..2), q19 < q24]) /\
+          and([b_MOccurrence[q20] > 0 /\ !or([a_MOccurrence[q18] > 0 /\ q18 = q20 | q18 : int(1..2)]) ->
+               a_MOccurrence[q20] = b_MOccurrence[q20]
+                   | q20 : int(1..2), q20 < q24])))
+            | q24 : int(1..2)]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    3 = sum([b_MOccurrence[q2] | q2 : int(1..2)]),
+    and([a_ExplicitWithRepetition_Values[q3] <= a_ExplicitWithRepetition_Values[q3 + 1] | q3 : int(1..2), q3 + 1 <= 3]),
+    and([sum([toInt(a_ExplicitWithRepetition_Values[q11] = a_ExplicitWithRepetition_Values[q9])
+                  | q11 : int(1..3), q11 <= 3])
+         = a_MOccurrence[a_ExplicitWithRepetition_Values[q9]]
+             | q9 : int(1..3), q9 <= 3]),
+    and([a_MOccurrence[q12] > 0 ->
+         sum([toInt(a_ExplicitWithRepetition_Values[q14] = q12) | q14 : int(1..3), q14 <= 3]) = a_MOccurrence[q12]
+             | q12 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_1-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000001.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000003.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000004.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000005.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2.eprime
new file mode 100644
index 0000000000..fbd4f2c5d9
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_2.eprime
@@ -0,0 +1,34 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_ExplicitWithRepetition_Flag: int(3)
+find b_ExplicitWithRepetition_Values: matrix indexed by [int(1..3)] of int(1..2)
+branching on [a_MOccurrence, b_ExplicitWithRepetition_Flag, b_ExplicitWithRepetition_Values, b_MOccurrence]
+such that
+    or([a_MOccurrence[q23] > 0 /\
+        (a_MOccurrence[q23] < b_MOccurrence[q23] /\
+         (and([a_MOccurrence[q19] > 0 -> a_MOccurrence[q19] = b_MOccurrence[q19] | q19 : int(1..2), q19 < q23]) /\
+          and([b_MOccurrence[q20] > 0 /\ !or([a_MOccurrence[q18] > 0 /\ q18 = q20 | q18 : int(1..2)]) ->
+               a_MOccurrence[q20] = b_MOccurrence[q20]
+                   | q20 : int(1..2), q20 < q23])))
+            | q23 : int(1..2)])
+    \/
+    or([b_MOccurrence[q24] > 0 /\ !or([a_MOccurrence[q22] > 0 /\ q22 = q24 | q22 : int(1..2)]) /\
+        (a_MOccurrence[q24] < b_MOccurrence[q24] /\
+         (and([a_MOccurrence[q19] > 0 -> a_MOccurrence[q19] = b_MOccurrence[q19] | q19 : int(1..2), q19 < q24]) /\
+          and([b_MOccurrence[q20] > 0 /\ !or([a_MOccurrence[q18] > 0 /\ q18 = q20 | q18 : int(1..2)]) ->
+               a_MOccurrence[q20] = b_MOccurrence[q20]
+                   | q20 : int(1..2), q20 < q24])))
+            | q24 : int(1..2)]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    3 = sum([b_MOccurrence[q2] | q2 : int(1..2)]),
+    and([b_ExplicitWithRepetition_Values[q3] <= b_ExplicitWithRepetition_Values[q3 + 1] | q3 : int(1..2), q3 + 1 <= 3]),
+    and([sum([toInt(b_ExplicitWithRepetition_Values[q11] = b_ExplicitWithRepetition_Values[q9])
+                  | q11 : int(1..3), q11 <= 3])
+         = b_MOccurrence[b_ExplicitWithRepetition_Values[q9]]
+             | q9 : int(1..3), q9 <= 3]),
+    and([b_MOccurrence[q12] > 0 ->
+         sum([toInt(b_ExplicitWithRepetition_Values[q14] = q12) | q14 : int(1..3), q14 <= 3]) = b_MOccurrence[q12]
+             | q12 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000001.solution
new file mode 100644
index 0000000000..15472caf03
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000001.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 2, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000002.solution
new file mode 100644
index 0000000000..ff56905e23
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000002.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000003.solution
new file mode 100644
index 0000000000..d56a0bbcdc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000003.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(2, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000004.solution
new file mode 100644
index 0000000000..5e2caa751c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000004.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 2)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000005.solution
new file mode 100644
index 0000000000..1b4b5b08a6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000005.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 2, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000006.solution
new file mode 100644
index 0000000000..621d5f6edc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3-solution000006.solution
@@ -0,0 +1,4 @@
+language Essence 1.3
+
+letting a be mset(1, 1, 2)
+letting b be mset(1, 1, 1)
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3.eprime b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3.eprime
new file mode 100644
index 0000000000..735a032370
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_mset_01/expected/model_3_3_3_3.eprime
@@ -0,0 +1,24 @@
+language ESSENCE' 1.0
+
+find a_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+find b_MOccurrence: matrix indexed by [int(1..2)] of int(0..3)
+branching on [a_MOccurrence, b_MOccurrence]
+such that
+    or([a_MOccurrence[q11] > 0 /\
+        (a_MOccurrence[q11] < b_MOccurrence[q11] /\
+         (and([a_MOccurrence[q7] > 0 -> a_MOccurrence[q7] = b_MOccurrence[q7] | q7 : int(1..2), q7 < q11]) /\
+          and([b_MOccurrence[q8] > 0 /\ !or([a_MOccurrence[q6] > 0 /\ q6 = q8 | q6 : int(1..2)]) ->
+               a_MOccurrence[q8] = b_MOccurrence[q8]
+                   | q8 : int(1..2), q8 < q11])))
+            | q11 : int(1..2)])
+    \/
+    or([b_MOccurrence[q12] > 0 /\ !or([a_MOccurrence[q10] > 0 /\ q10 = q12 | q10 : int(1..2)]) /\
+        (a_MOccurrence[q12] < b_MOccurrence[q12] /\
+         (and([a_MOccurrence[q7] > 0 -> a_MOccurrence[q7] = b_MOccurrence[q7] | q7 : int(1..2), q7 < q12]) /\
+          and([b_MOccurrence[q8] > 0 /\ !or([a_MOccurrence[q6] > 0 /\ q6 = q8 | q6 : int(1..2)]) ->
+               a_MOccurrence[q8] = b_MOccurrence[q8]
+                   | q8 : int(1..2), q8 < q12])))
+            | q12 : int(1..2)]),
+    3 = sum([a_MOccurrence[q1] | q1 : int(1..2)]),
+    3 = sum([b_MOccurrence[q2] | q2 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1.eprime
new file mode 100644
index 0000000000..5999cb42ac
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_1.eprime
@@ -0,0 +1,324 @@
+language ESSENCE' 1.0
+
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
+branching on
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
+such that
+    or([q36 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+        (toInt(or([q95 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q95, q96] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q96]
+                            | q96 : int(1..2)])
+                       | q95 : int(1..2)]))
+         <
+         toInt(or([q100 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q100, q101] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q101]
+                            | q101 : int(1..2)])
+                       | q100 : int(1..2)]))
+         /\
+         (and([q104 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q137] /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q137]) <
+                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q137])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q138] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q138]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q138])
+                               | q138 : int(1..2), q138 < q137])
+                      /\
+                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q138] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q141] /\
+                                q141 = q138
+                                    | q141 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q138]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q138])
+                               | q138 : int(1..2), q138 < q137])))
+                        | q137 : int(1..2)])
+                \/
+                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q137] /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q140] /\ q140 = q137
+                             | q140 : int(1..2)])
+                    /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q137]) <
+                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q137])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q138] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q138]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q138])
+                               | q138 : int(1..2), q138 < q137])
+                      /\
+                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q138] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q139] /\
+                                q139 = q138
+                                    | q139 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q138]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q138])
+                               | q138 : int(1..2), q138 < q137])))
+                        | q137 : int(1..2)]))
+               ->
+               toInt(or([q129 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q129, q130] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q130]
+                                  | q130 : int(1..2)])
+                             | q129 : int(1..2)]))
+               =
+               toInt(or([q134 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q134, q135] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q104, q135]
+                                  | q135 : int(1..2)])
+                             | q134 : int(1..2)]))
+                   | q104 : int(1..2)])
+          /\
+          and([and([q106 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+                    !or([q119 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q119, q120] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q120]
+                                  | q120 : int(1..2)])
+                             | q119 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q122] /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q122]) <
+                         toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q122])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q123] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q123]) =
+                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q123])
+                                   | q123 : int(1..2), q123 < q122])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q123] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q126] /\
+                                    q126 = q123
+                                        | q126 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q123]) =
+                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q123])
+                                   | q123 : int(1..2), q123 < q122])))
+                            | q122 : int(1..2)])
+                    \/
+                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q122] /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q125] /\ q125 = q122
+                                 | q125 : int(1..2)])
+                        /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q122]) <
+                         toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q122])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q123] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q123]) =
+                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q123])
+                                   | q123 : int(1..2), q123 < q122])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q123] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q124] /\
+                                    q124 = q123
+                                        | q124 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q123]) =
+                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q36, q123])
+                                   | q123 : int(1..2), q123 < q122])))
+                            | q122 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q109 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q109, q110] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q110]
+                                  | q110 : int(1..2)])
+                             | q109 : int(1..2)]))
+               =
+               toInt(or([q114 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q114, q115] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q106, q115]
+                                  | q115 : int(1..2)])
+                             | q114 : int(1..2)]))
+                   | q106 : int(1..2)])))
+            | q36 : int(1..2)])
+    \/
+    or([q38 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+        !or([q90 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+             and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q90, q91] =
+                  b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q91]
+                      | q91 : int(1..2)])
+                 | q90 : int(1..2)])
+        /\
+        (toInt(or([q41 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q41, q42] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q42]
+                            | q42 : int(1..2)])
+                       | q41 : int(1..2)]))
+         <
+         toInt(or([q46 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q46, q47] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q47]
+                            | q47 : int(1..2)])
+                       | q46 : int(1..2)]))
+         /\
+         (and([q50 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q83] /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q83]) <
+                     toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q83])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q84] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q84]) =
+                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q84])
+                               | q84 : int(1..2), q84 < q83])
+                      /\
+                      and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q84] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q87] /\ q87 = q84
+                                    | q87 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q84]) =
+                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q84])
+                               | q84 : int(1..2), q84 < q83])))
+                        | q83 : int(1..2)])
+                \/
+                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q83] /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q86] /\ q86 = q83
+                             | q86 : int(1..2)])
+                    /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q83]) <
+                     toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q83])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q84] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q84]) =
+                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q84])
+                               | q84 : int(1..2), q84 < q83])
+                      /\
+                      and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q84] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q85] /\ q85 = q84
+                                    | q85 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q84]) =
+                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q84])
+                               | q84 : int(1..2), q84 < q83])))
+                        | q83 : int(1..2)]))
+               ->
+               toInt(or([q75 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q75, q76] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q76]
+                                  | q76 : int(1..2)])
+                             | q75 : int(1..2)]))
+               =
+               toInt(or([q80 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q80, q81] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q81]
+                                  | q81 : int(1..2)])
+                             | q80 : int(1..2)]))
+                   | q50 : int(1..2)])
+          /\
+          and([and([q52 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+                    !or([q65 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q66] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q66]
+                                  | q66 : int(1..2)])
+                             | q65 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q68] /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q68]) <
+                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q68])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q69] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q69]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q69])
+                                   | q69 : int(1..2), q69 < q68])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q69] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q72] /\
+                                    q72 = q69
+                                        | q72 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q69]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q69])
+                                   | q69 : int(1..2), q69 < q68])))
+                            | q68 : int(1..2)])
+                    \/
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q68] /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q71] /\ q71 = q68
+                                 | q71 : int(1..2)])
+                        /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q68]) <
+                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q68])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q69] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q69]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q69])
+                                   | q69 : int(1..2), q69 < q68])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q69] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q70] /\
+                                    q70 = q69
+                                        | q70 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q69]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q38, q69])
+                                   | q69 : int(1..2), q69 < q68])))
+                            | q68 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q55 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q55, q56] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q56]
+                                  | q56 : int(1..2)])
+                             | q55 : int(1..2)]))
+               =
+               toInt(or([q60 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q60, q61] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q52, q61]
+                                  | q61 : int(1..2)])
+                             | q60 : int(1..2)]))
+                   | q52 : int(1..2)])))
+            | q38 : int(1..2)]),
+    and([1 =
+         sum([toInt(q27 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q27, q1])
+                  | q27 : int(1..2)])
+             | q1 : int(1..2)]),
+    and([q31 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q31, q32]) | q32 : int(1..2)]) >= 1
+             | q31 : int(1..2)]),
+    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q9]) | q9 : int(1..2)] <lex
+    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q10]) | q10 : int(1..2)],
+    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q11] = false | q11 : int(1..2)])
+             | q5 : int(1..2)]),
+    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..2)]) <= 2
+             | q6 : int(1..2)]),
+    2 =
+    sum([toInt(q12 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q12, q13])
+                             | q13 : int(1..2)]),
+                    0)
+             | q12 : int(1..2)]),
+    and([1 =
+         sum([toInt(q28 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q28, q14])
+                  | q28 : int(1..2)])
+             | q14 : int(1..2)]),
+    and([q29 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q29, q30]) | q30 : int(1..2)]) >= 1
+             | q29 : int(1..2)]),
+    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q22]) | q22 : int(1..2)] <lex
+    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q23]) | q23 : int(1..2)],
+    and([q18 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q18, q24] = false | q24 : int(1..2)])
+             | q18 : int(1..2)]),
+    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
+    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q19, q20]) | q20 : int(1..2)]) <= 2
+             | q19 : int(1..2)]),
+    2 =
+    sum([toInt(q25 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q25, q26])
+                             | q26 : int(1..2)]),
+                    0)
+             | q25 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2.eprime
new file mode 100644
index 0000000000..6ac5a9636a
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_2.eprime
@@ -0,0 +1,787 @@
+language ESSENCE' 1.0
+
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
+branching on
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
+such that
+    or([q42 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+        (toInt(or([q164 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q164, q165] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q165]
+                            | q165 : int(1..2)])
+                       | q164 : int(1..2)]))
+         <
+         toInt(or([q169 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q171] != 3
+                         ->
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                             [q42,
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q171]]
+                             | q171 : int(1..2)])
+                    /\
+                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q172] ->
+                         or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q174] !=
+                             3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q174] =
+                             q172
+                                 | q174 : int(1..2)])
+                             | q172 : int(1..2)]))
+                       | q169 : int(1..2)]))
+         /\
+         (and([q176 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q236] /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q236]) <
+                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q236])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q237] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q237]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q237])
+                               | q237 : int(1..2), q237 < q236])
+                      /\
+                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q237] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q240] /\
+                                q240 = q237
+                                    | q240 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q237]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q237])
+                               | q237 : int(1..2), q237 < q236])))
+                        | q236 : int(1..2)])
+                \/
+                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q236] /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q239] /\ q239 = q236
+                             | q239 : int(1..2)])
+                    /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q236]) <
+                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q236])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q237] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q237]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q237])
+                               | q237 : int(1..2), q237 < q236])
+                      /\
+                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q237] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q238] /\
+                                q238 = q237
+                                    | q238 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q237]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q237])
+                               | q237 : int(1..2), q237 < q236])))
+                        | q236 : int(1..2)]))
+               ->
+               toInt(or([q225 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q225, q226] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q226]
+                                  | q226 : int(1..2)])
+                             | q225 : int(1..2)]))
+               =
+               toInt(or([q230 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q230, q232]
+                               != 3
+                               ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q176,
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q230, q232]]
+                                   | q232 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q233] ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q230, q235]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q230, q235]
+                                   = q233
+                                       | q235 : int(1..2)])
+                                   | q233 : int(1..2)]))
+                             | q230 : int(1..2)]))
+                   | q176 : int(1..2)])
+          /\
+          and([and([q178 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+                    !or([q194 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q194, q195] ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q197]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q197]
+                                   = q195
+                                       | q197 : int(1..2)])
+                                   | q195 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q199]
+                               != 3
+                               ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q194,
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q178, q199]]
+                                   | q199 : int(1..2)]))
+                             | q194 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q202] != 3 /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q215]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q215]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q202]
+                                       | q215 : int(1..2)]))
+                         <
+                         toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q42,
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q178, q202]])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q216]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q216]
+                               <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q202]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q222]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q222]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q216]
+                                             | q222 : int(1..2)]))
+                               =
+                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                         [q42,
+                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q178, q216]])
+                                   | q216 : int(1..2)])
+                          /\
+                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q201],
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q220]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q220]
+                                         = q201
+                                             | q220 : int(1..2)]),
+                                    q201 <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q178, q202];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q218]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q218]
+                                         = q201
+                                             | q218 : int(1..2)]))
+                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q201])
+                                   | q201 : int(1..2)])))
+                            | q202 : int(1..2)])
+                    \/
+                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q200] /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q213] !=
+                             3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q213] =
+                             q200
+                                 | q213 : int(1..2)])
+                        /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q204]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q204]
+                                   = q200
+                                       | q204 : int(1..2)]))
+                         < toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q200])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q205]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q205]
+                               < q200
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q211]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q211]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q205]
+                                             | q211 : int(1..2)]))
+                               =
+                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                         [q42,
+                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q178, q205]])
+                                   | q205 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q201] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q178, q209]
+                                    != 3
+                                    /\
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q178, q209]
+                                    = q201
+                                        | q209 : int(1..2)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q207]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q178, q207]
+                                         = q201
+                                             | q207 : int(1..2)]))
+                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q201])
+                                   | q201 : int(1..2), q201 < q200])))
+                            | q200 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q181 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q182] ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q184]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q178, q184]
+                                   = q182
+                                       | q184 : int(1..2)])
+                                   | q182 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q186]
+                               != 3
+                               ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q181,
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q178, q186]]
+                                   | q186 : int(1..2)]))
+                             | q181 : int(1..2)]))
+               =
+               toInt(or([q189 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q189, q190] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q190]
+                                  | q190 : int(1..2)])
+                             | q189 : int(1..2)]))
+                   | q178 : int(1..2)])))
+            | q42 : int(1..2)])
+    \/
+    or([q44 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+        !or([q156 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+             (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q157] ->
+                   or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q159] != 3 /\
+                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q159] = q157
+                           | q159 : int(1..2)])
+                       | q157 : int(1..2)])
+              /\
+              and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q161] != 3 ->
+                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                       [q156, b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q161]]
+                       | q161 : int(1..2)]))
+                 | q156 : int(1..2)])
+        /\
+        (toInt(or([q47 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q47, q48] ->
+                         or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q50] != 3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q50] =
+                             q48 | q50 : int(1..2)])
+                             | q48 : int(1..2)])
+                    /\
+                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q52] != 3 ->
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                             [q47,
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q52]]
+                             | q52 : int(1..2)]))
+                       | q47 : int(1..2)]))
+         <
+         toInt(or([q55 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q55, q56] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q56]
+                            | q56 : int(1..2)])
+                       | q55 : int(1..2)]))
+         /\
+         (and([q59 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q134] /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q134]) <
+                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q147]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q147] =
+                               q134
+                                   | q147 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q135] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q135]) =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q153]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q153]
+                                     = q135
+                                         | q153 : int(1..2)]))
+                               | q135 : int(1..2), q135 < q134])
+                      /\
+                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q148]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q149] /\
+                                     q149 =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q148]
+                                         | q149 : int(1..2)]),
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q148]
+                                < q134;
+                                    int(1..3)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                     [q59,
+                                      b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q44, q148]])
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q151]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q151]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q148]
+                                         | q151 : int(1..2)]))
+                               | q148 : int(1..2)])))
+                        | q134 : int(1..2)])
+                \/
+                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q136] != 3 /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q137] /\
+                         q137 = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q136]
+                             | q137 : int(1..2)])
+                    /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                               [q59,
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                    [q44, q136]])
+                     <
+                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q139]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q139] =
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q136]
+                                   | q139 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q135] /\
+                           q135 <
+                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q136]
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q135]) =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q145]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q145]
+                                     = q135
+                                         | q145 : int(1..2)]))
+                               | q135 : int(1..2)])
+                      /\
+                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q140]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q141] /\
+                                     q141 =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q140]
+                                         | q141 : int(1..2)]),
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q140]
+                                <
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q136];
+                                    int(1..3)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                     [q59,
+                                      b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q44, q140]])
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q143]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q143]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q44, q140]
+                                         | q143 : int(1..2)]))
+                               | q140 : int(1..2)])))
+                        | q136 : int(1..2)]))
+               ->
+               toInt(or([q123 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q123, q124] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q124]
+                                  | q124 : int(1..2)])
+                             | q123 : int(1..2)]))
+               =
+               toInt(or([q128 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q128, q130]
+                               != 3
+                               ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q59,
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q128, q130]]
+                                   | q130 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q131] ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q128, q133]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q128, q133]
+                                   = q131
+                                       | q133 : int(1..2)])
+                                   | q131 : int(1..2)]))
+                             | q128 : int(1..2)]))
+                   | q59 : int(1..2)])
+          /\
+          and([and([q61 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+                    !or([q77 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q77, q78] ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q80]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q80]
+                                   = q78
+                                       | q80 : int(1..2)])
+                                   | q78 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q82] !=
+                               3
+                               ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q77,
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q61, q82]]
+                                   | q82 : int(1..2)]))
+                             | q77 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q85] != 3 /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q106]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q106]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q85]
+                                       | q106 : int(1..2)]))
+                         <
+                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q44, q108]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q44, q108]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q85]
+                                       | q108 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q109]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q109] <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q85]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q118]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q118]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q109]
+                                             | q118 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q120]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q120]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q109]
+                                             | q120 : int(1..2)]))
+                                   | q109 : int(1..2)])
+                          /\
+                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q44, q110]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q112]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q112]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q110]
+                                             | q112 : int(1..2)]),
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q44, q110]
+                                    <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q61, q85];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q114]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q114]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q110]
+                                             | q114 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q116]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q116]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q110]
+                                             | q116 : int(1..2)]))
+                                   | q110 : int(1..2)])))
+                            | q85 : int(1..2)])
+                    \/
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q86] != 3 /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q88] != 3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q88] =
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q86]
+                                 | q88 : int(1..2)])
+                        /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q90]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q90]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q44, q86]
+                                       | q90 : int(1..2)]))
+                         <
+                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q44, q92]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q44, q92]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q44, q86]
+                                       | q92 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q93] !=
+                               3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q93] <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q44, q86]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q102]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q102]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q93]
+                                             | q102 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q104]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q104]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q93]
+                                             | q104 : int(1..2)]))
+                                   | q93 : int(1..2)])
+                          /\
+                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q44, q94]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q96]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q96]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q94]
+                                             | q96 : int(1..2)]),
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q44, q94]
+                                    <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q44, q86];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q98]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q61, q98]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q94]
+                                             | q98 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q100]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q100]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q44, q94]
+                                             | q100 : int(1..2)]))
+                                   | q94 : int(1..2)])))
+                            | q86 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q64 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q64, q65] ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q67]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q61, q67]
+                                   = q65
+                                       | q67 : int(1..2)])
+                                   | q65 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q69] !=
+                               3
+                               ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q64,
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q61, q69]]
+                                   | q69 : int(1..2)]))
+                             | q64 : int(1..2)]))
+               =
+               toInt(or([q72 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q72, q73] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q61, q73]
+                                  | q73 : int(1..2)])
+                             | q72 : int(1..2)]))
+                   | q61 : int(1..2)])))
+            | q44 : int(1..2)]),
+    and([1 =
+         sum([toInt(q30 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q1])
+                  | q30 : int(1..2)])
+             | q1 : int(1..2)]),
+    and([q32 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q32, q33]) | q33 : int(1..2)]) >= 1
+             | q32 : int(1..2)]),
+    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q9]) | q9 : int(1..2)] <lex
+    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q10]) | q10 : int(1..2)],
+    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q11] = false | q11 : int(1..2)])
+             | q5 : int(1..2)]),
+    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..2)]) <= 2
+             | q6 : int(1..2)]),
+    2 =
+    sum([toInt(q12 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q12, q13])
+                             | q13 : int(1..2)]),
+                    0)
+             | q12 : int(1..2)]),
+    alldifferent_except([toInt(q34 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q35] !=
+                               3)
+                         *
+                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q34, q35],
+                                    0)
+                             | q34 : int(1..2), q35 : int(1..2)],
+                        0),
+    and([q36 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q38] != 3)
+                  | q38 : int(1..2)])
+         >= 1
+             | q36 : int(1..2)]),
+    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q25] | q25 : int(1..2)] <lex
+    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q26] | q26 : int(1..2)],
+    and([q18 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q18, q31] = 1
+                  | q31 : int(1..2)])
+             | q18 : int(1..2)]),
+    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
+    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 1] <
+         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 2]
+         \/ b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 1] = 3
+             | q19 : int(1..2)]),
+    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 1] = 3 ->
+          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 2] = 3)
+             | q19 : int(1..2)]),
+    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, q22] != 3)
+                  | q22 : int(1..2)])
+         <= 2
+             | q19 : int(1..2)]),
+    2 =
+    sum([toInt(q27 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q27, q29] !=
+                               3)
+                             | q29 : int(1..2)]),
+                    0)
+             | q27 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3.eprime.orig b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3.eprime.orig
deleted file mode 100644
index 83a08f385a..0000000000
--- a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_3.eprime.orig
+++ /dev/null
@@ -1,856 +0,0 @@
-language ESSENCE' 1.0
-
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-branching on
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    or([q37 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-        (toInt(or([q159 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q159, q160] =
-                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q160]
-                            | q160 : int(1..2)])
-                       | q159 : int(1..2)]))
-         <
-         toInt(or([q164 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (and([q166 <=
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                         ->
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                             [q37,
-                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                  [q164, q166]]
-                             | q166 : int(1..2)])
-                    /\
-                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q167] ->
-                         or([q169 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q164, q169]
-                             = q167
-                                 | q169 : int(1..2)])
-                             | q167 : int(1..2)]))
-                       | q164 : int(1..2)]))
-         /\
-         (and([q171 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q231] /\
-                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q231]) <
-                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q231])
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q232] ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q232]) =
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q232])
-                               | q232 : int(1..2), q232 < q231])
-                      /\
-                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q232] /\
-                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q235] /\
-                                q235 = q232
-                                    | q235 : int(1..2)])
-                           ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q232]) =
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q232])
-                               | q232 : int(1..2), q232 < q231])))
-                        | q231 : int(1..2)])
-                \/
-                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q231] /\
-                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q234] /\ q234 = q231
-                             | q234 : int(1..2)])
-                    /\
-                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q231]) <
-                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q231])
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q232] ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q232]) =
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q232])
-                               | q232 : int(1..2), q232 < q231])
-                      /\
-                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q232] /\
-                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q233] /\
-                                q233 = q232
-                                    | q233 : int(1..2)])
-                           ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q232]) =
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q232])
-                               | q232 : int(1..2), q232 < q231])))
-                        | q231 : int(1..2)]))
-               ->
-               toInt(or([q220 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q220, q221] =
-                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q221]
-                                  | q221 : int(1..2)])
-                             | q220 : int(1..2)]))
-               =
-               toInt(or([q225 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q227 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q225]
-                               ->
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q171,
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q225, q227]]
-                                   | q227 : int(1..2)])
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q171, q228] ->
-                               or([q230 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q225]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q225, q230]
-                                   = q228
-                                       | q230 : int(1..2)])
-                                   | q228 : int(1..2)]))
-                             | q225 : int(1..2)]))
-                   | q171 : int(1..2)])
-          /\
-          and([and([q173 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q189 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q189, q190] ->
-                               or([q192 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q173]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q173, q192]
-                                   = q190
-                                       | q192 : int(1..2)])
-                                   | q190 : int(1..2)])
-                          /\
-                          and([q194 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q173]
-                               ->
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q189,
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q173, q194]]
-                                   | q194 : int(1..2)]))
-                             | q189 : int(1..2)]),
-                    or([q197 <=
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q173]
-                        /\
-                        (toInt(or([q210 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q173]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q173, q210]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q173, q197]
-                                       | q210 : int(1..2)]))
-                         <
-                         toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q37,
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q173, q197]])
-                         /\
-                         (and([q211 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q173]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q173, q211]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q173, q197]
-                               ->
-                               toInt(or([q217 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q173]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q173, q217]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q173, q211]
-                                             | q217 : int(1..2)]))
-                               =
-                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                         [q37,
-                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                              [q173, q211]])
-                                   | q211 : int(1..2)])
-                          /\
-                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q196],
-                                    !or([q215 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q173]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q173, q215]
-                                         = q196
-                                             | q215 : int(1..2)]),
-                                    q196 <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q173, q197];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q213 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q173]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q173, q213]
-                                         = q196
-                                             | q213 : int(1..2)]))
-                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q196])
-                                   | q196 : int(1..2)])))
-                            | q197 : int(1..2)])
-                    \/
-                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q195] /\
-                        !or([q208 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q173]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q173, q208]
-                             = q195
-                                 | q208 : int(1..2)])
-                        /\
-                        (toInt(or([q199 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q173]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q173, q199]
-                                   = q195
-                                       | q199 : int(1..2)]))
-                         < toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q195])
-                         /\
-                         (and([q200 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q173]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q173, q200]
-                               < q195
-                               ->
-                               toInt(or([q206 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q173]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q173, q206]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q173, q200]
-                                             | q206 : int(1..2)]))
-                               =
-                               toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                         [q37,
-                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                              [q173, q200]])
-                                   | q200 : int(1..2)])
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q196] /\
-                               !or([q204 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q173]
-                                    /\
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q173, q204]
-                                    = q196
-                                        | q204 : int(1..2)])
-                               ->
-                               toInt(or([q202 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q173]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q173, q202]
-                                         = q196
-                                             | q202 : int(1..2)]))
-                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q37, q196])
-                                   | q196 : int(1..2), q196 < q195])))
-                            | q195 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q176 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q176, q177] ->
-                               or([q179 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q173]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q173, q179]
-                                   = q177
-                                       | q179 : int(1..2)])
-                                   | q177 : int(1..2)])
-                          /\
-                          and([q181 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q173]
-                               ->
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q176,
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q173, q181]]
-                                   | q181 : int(1..2)]))
-                             | q176 : int(1..2)]))
-               =
-               toInt(or([q184 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q184] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q173]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q184, q185]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q173, q185]
-                                   | q185 : int(1..2)]))
-                             | q184 : int(1..2)]))
-                   | q173 : int(1..2)])))
-            | q37 : int(1..2)])
-    \/
-    or([q39 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        !or([q151 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-             (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q151, q152] ->
-                   or([q154 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39]
-                       /\
-                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q39, q154] =
-                       q152
-                           | q154 : int(1..2)])
-                       | q152 : int(1..2)])
-              /\
-              and([q156 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39] ->
-                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                       [q151,
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q39, q156]]
-                       | q156 : int(1..2)]))
-                 | q151 : int(1..2)])
-        /\
-        (toInt(or([q42 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                   (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q42, q43] ->
-                         or([q45 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q39, q45]
-                             = q43
-                                 | q45 : int(1..2)])
-                             | q43 : int(1..2)])
-                    /\
-                    and([q47 <=
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39]
-                         ->
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                             [q42,
-                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                  [q39, q47]]
-                             | q47 : int(1..2)]))
-                       | q42 : int(1..2)]))
-         <
-         toInt(or([q50 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q50] =
-                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39]
-                    /\
-                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q50, q51]
-                         =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q39, q51]
-                             | q51 : int(1..2)]))
-                       | q50 : int(1..2)]))
-         /\
-         (and([q54 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q129] /\
-                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q129]) <
-                     toInt(or([q142 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q39, q142]
-                               = q129
-                                   | q142 : int(1..2)]))
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q130] ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q130]) =
-                           toInt(or([q148 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q39]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q148]
-                                     = q130
-                                         | q148 : int(1..2)]))
-                               | q130 : int(1..2), q130 < q129])
-                      /\
-                      and([and([q143 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q39],
-                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q146] /\
-                                     q146 =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q143]
-                                         | q146 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q39, q143]
-                                < q129;
-                                    int(1..3)])
-                           ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                     [q54,
-                                      b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                          [q39, q143]])
-                           =
-                           toInt(or([q145 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q39]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q145]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q143]
-                                         | q145 : int(1..2)]))
-                               | q143 : int(1..2)])))
-                        | q129 : int(1..2)])
-                \/
-                or([q131 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39] /\
-                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q140] /\
-                         q140 =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q39, q131]
-                             | q140 : int(1..2)])
-                    /\
-                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                               [q54,
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q39, q131]])
-                     <
-                     toInt(or([q133 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q39, q133]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q39, q131]
-                                   | q133 : int(1..2)]))
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q130] /\
-                           q130 <
-                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q39, q131]
-                           ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q130]) =
-                           toInt(or([q139 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q39]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q139]
-                                     = q130
-                                         | q139 : int(1..2)]))
-                               | q130 : int(1..2)])
-                      /\
-                      and([and([q134 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q39],
-                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q137] /\
-                                     q137 =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q134]
-                                         | q137 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q39, q134]
-                                <
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q39, q131];
-                                    int(1..3)])
-                           ->
-                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                     [q54,
-                                      b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                          [q39, q134]])
-                           =
-                           toInt(or([q136 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q39]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q136]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q39, q134]
-                                         | q136 : int(1..2)]))
-                               | q134 : int(1..2)])))
-                        | q131 : int(1..2)]))
-               ->
-               toInt(or([q118 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q118, q119] =
-                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q119]
-                                  | q119 : int(1..2)])
-                             | q118 : int(1..2)]))
-               =
-               toInt(or([q123 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q125 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q123]
-                               ->
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q54,
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q123, q125]]
-                                   | q125 : int(1..2)])
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q54, q126] ->
-                               or([q128 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q123]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q123, q128]
-                                   = q126
-                                       | q128 : int(1..2)])
-                                   | q126 : int(1..2)]))
-                             | q123 : int(1..2)]))
-                   | q54 : int(1..2)])
-          /\
-          and([and([q56 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q72 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q72, q73] ->
-                               or([q75 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q56]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q56, q75]
-                                   = q73
-                                       | q75 : int(1..2)])
-                                   | q73 : int(1..2)])
-                          /\
-                          and([q77 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q56]
-                               ->
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q72,
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q56, q77]]
-                                   | q77 : int(1..2)]))
-                             | q72 : int(1..2)]),
-                    or([q80 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q56]
-                        /\
-                        (toInt(or([q101 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q56]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q56, q101]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q56, q80]
-                                       | q101 : int(1..2)]))
-                         <
-                         toInt(or([q103 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q39]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q39, q103]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q56, q80]
-                                       | q103 : int(1..2)]))
-                         /\
-                         (and([q104 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q56]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q56, q104]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q56, q80]
-                               ->
-                               toInt(or([q113 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q56]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q113]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q104]
-                                             | q113 : int(1..2)]))
-                               =
-                               toInt(or([q115 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q39]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q115]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q104]
-                                             | q115 : int(1..2)]))
-                                   | q104 : int(1..2)])
-                          /\
-                          and([and([q105 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q39],
-                                    !or([q111 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q56]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q111]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q105]
-                                             | q111 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q39, q105]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q56, q80];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q107 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q56]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q107]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q105]
-                                             | q107 : int(1..2)]))
-                               =
-                               toInt(or([q109 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q39]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q109]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q105]
-                                             | q109 : int(1..2)]))
-                                   | q105 : int(1..2)])))
-                            | q80 : int(1..2)])
-                    \/
-                    or([q81 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39]
-                        /\
-                        !or([q99 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q56]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q56, q99]
-                             =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q39, q81]
-                                 | q99 : int(1..2)])
-                        /\
-                        (toInt(or([q83 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q56]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q56, q83]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q39, q81]
-                                       | q83 : int(1..2)]))
-                         <
-                         toInt(or([q85 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q39]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q39, q85]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q39, q81]
-                                       | q85 : int(1..2)]))
-                         /\
-                         (and([q86 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q56]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q56, q86]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q39, q81]
-                               ->
-                               toInt(or([q95 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q56]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q95]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q86]
-                                             | q95 : int(1..2)]))
-                               =
-                               toInt(or([q97 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q39]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q97]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q86]
-                                             | q97 : int(1..2)]))
-                                   | q86 : int(1..2)])
-                          /\
-                          and([and([q87 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q39],
-                                    !or([q93 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q56]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q93]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q87]
-                                             | q93 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q39, q87]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q39, q81];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q89 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q56]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q56, q89]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q87]
-                                             | q89 : int(1..2)]))
-                               =
-                               toInt(or([q91 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q39]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q91]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q39, q87]
-                                             | q91 : int(1..2)]))
-                                   | q87 : int(1..2)])))
-                            | q81 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q59 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q59, q60] ->
-                               or([q62 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q56]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q56, q62]
-                                   = q60
-                                       | q62 : int(1..2)])
-                                   | q60 : int(1..2)])
-                          /\
-                          and([q64 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q56]
-                               ->
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q59,
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q56, q64]]
-                                   | q64 : int(1..2)]))
-                             | q59 : int(1..2)]))
-               =
-               toInt(or([q67 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q67] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q56]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q67, q68]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q56, q68]
-                                   | q68 : int(1..2)]))
-                             | q67 : int(1..2)]))
-                   | q56 : int(1..2)])))
-            | q39 : int(1..2)]),
-    and([1 =
-         sum([toInt(q27 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q27, q1])
-                  | q27 : int(1..2)])
-             | q1 : int(1..2)]),
-    and([q29 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q29, q30]) | q30 : int(1..2)]) >= 1
-             | q29 : int(1..2)]),
-    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q9]) | q9 : int(1..2)] <lex
-    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q10]) | q10 : int(1..2)],
-    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q11] = false | q11 : int(1..2)])
-             | q5 : int(1..2)]),
-    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..2)]) <= 2
-             | q6 : int(1..2)]),
-    2 =
-    sum([toInt(q12 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
-         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q12, q13])
-                             | q13 : int(1..2)]),
-                    0)
-             | q12 : int(1..2)]),
-    alldifferent_except([toInt(q31 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q32 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q31])
-                         *
-                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q31, q32],
-                                    0)
-                             | q31 : int(1..2), q32 : int(1..2)],
-                        0),
-    and([q33 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q33] >= 1
-             | q33 : int(1..2)]),
-    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q24]
-                  | q24 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q25]
-                  | q25 : int(1..2)];
-                 int(1..2)]),
-    and([q18 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q18] = 0 /\
-         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q18, q28] = 1
-                  | q28 : int(1..2)])
-             | q18 : int(1..2)]),
-    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19] ->
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q19, 1] <
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q19, 2])
-             | q19 : int(1..2)]),
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q21 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19] ->
-              b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q19, q21] = 1
-                  | q21 : int(1..2)])
-             | q19 : int(1..2)]),
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19] <= 2
-             | q19 : int(1..2)]),
-    2 =
-    sum([toInt(q26 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q26], 0)
-             | q26 : int(1..2)])
-
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4.eprime
new file mode 100644
index 0000000000..5e65b4ba3b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_1_4.eprime
@@ -0,0 +1,382 @@
+language ESSENCE' 1.0
+
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
+find b_PartitionOccurrence_NumParts: int(1..2)
+find b_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
+find b_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
+find b_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
+branching on
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence, b_PartitionOccurrence_NumParts,
+     b_PartitionOccurrence_WhichPart, b_PartitionOccurrence_PartSizes, b_PartitionOccurrence_FirstIndex]
+such that
+    or([q30 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+        (toInt(or([q144 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q144, q145] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q145]
+                            | q145 : int(1..2)])
+                       | q144 : int(1..2)]))
+         <
+         toInt(or([q148 <= b_PartitionOccurrence_NumParts /\
+                   (and([b_PartitionOccurrence_WhichPart[q151] = q148 ->
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q151]
+                             | q151 : int(1..2)])
+                    /\
+                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q152] ->
+                         or([b_PartitionOccurrence_WhichPart[q154] = q148 /\ q154 = q152 | q154 : int(1..2)])
+                             | q152 : int(1..2)]))
+                       | q148 : int(1..2)]))
+         /\
+         (and([q156 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q222] /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q222]) <
+                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q222])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q223] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q223]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q223])
+                               | q223 : int(1..2), q223 < q222])
+                      /\
+                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q223] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q226] /\
+                                q226 = q223
+                                    | q226 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q223]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q223])
+                               | q223 : int(1..2), q223 < q222])))
+                        | q222 : int(1..2)])
+                \/
+                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q222] /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q225] /\ q225 = q222
+                             | q225 : int(1..2)])
+                    /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q222]) <
+                     toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q222])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q223] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q223]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q223])
+                               | q223 : int(1..2), q223 < q222])
+                      /\
+                      and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q223] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q224] /\
+                                q224 = q223
+                                    | q224 : int(1..2)])
+                           ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q223]) =
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q223])
+                               | q223 : int(1..2), q223 < q222])))
+                        | q222 : int(1..2)]))
+               ->
+               toInt(or([q211 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q211, q212] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q212]
+                                  | q212 : int(1..2)])
+                             | q211 : int(1..2)]))
+               =
+               toInt(or([q215 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q218] = q215 ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q218]
+                                   | q218 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q156, q219] ->
+                               or([b_PartitionOccurrence_WhichPart[q221] = q215 /\ q221 = q219 | q221 : int(1..2)])
+                                   | q219 : int(1..2)]))
+                             | q215 : int(1..2)]))
+                   | q156 : int(1..2)])
+          /\
+          and([and([q157 <= b_PartitionOccurrence_NumParts,
+                    !or([q172 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q172, q173] ->
+                               or([b_PartitionOccurrence_WhichPart[q175] = q157 /\ q175 = q173 | q175 : int(1..2)])
+                                   | q173 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q177] = q157 ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q172, q177]
+                                   | q177 : int(1..2)]))
+                             | q172 : int(1..2)]),
+                    or([b_PartitionOccurrence_WhichPart[q180] = q157 /\
+                        (sum([toInt(b_PartitionOccurrence_WhichPart[q193] = q157) * catchUndef(toInt(q193 = q180), 0)
+                                  | q193 : int(1..2)])
+                         < toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q180])
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q194] = q157 ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q200] = q157) *
+                                    catchUndef(toInt(q200 = q194), 0)
+                                        | q200 : int(1..2)])
+                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q194])
+                                   | q194 : int(1..2), q194 < q180])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q179] /\
+                               !or([b_PartitionOccurrence_WhichPart[q198] = q157 /\ q198 = q179 | q198 : int(1..2)])
+                               ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q196] = q157) *
+                                    catchUndef(toInt(q196 = q179), 0)
+                                        | q196 : int(1..2)])
+                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q179])
+                                   | q179 : int(1..2), q179 < q180])))
+                            | q180 : int(1..2)])
+                    \/
+                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q178] /\
+                        !or([b_PartitionOccurrence_WhichPart[q191] = q157 /\ q191 = q178 | q191 : int(1..2)])
+                        /\
+                        (sum([toInt(b_PartitionOccurrence_WhichPart[q182] = q157) * catchUndef(toInt(q182 = q178), 0)
+                                  | q182 : int(1..2)])
+                         < toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q178])
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q183] = q157 ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q189] = q157) *
+                                    catchUndef(toInt(q189 = q183), 0)
+                                        | q189 : int(1..2)])
+                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q183])
+                                   | q183 : int(1..2), q183 < q178])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q179] /\
+                               !or([b_PartitionOccurrence_WhichPart[q187] = q157 /\ q187 = q179 | q187 : int(1..2)])
+                               ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q185] = q157) *
+                                    catchUndef(toInt(q185 = q179), 0)
+                                        | q185 : int(1..2)])
+                               = toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q30, q179])
+                                   | q179 : int(1..2), q179 < q178])))
+                            | q178 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q203 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q203, q204] ->
+                               or([b_PartitionOccurrence_WhichPart[q206] = q157 /\ q206 = q204 | q206 : int(1..2)])
+                                   | q204 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q208] = q157 ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q203, q208]
+                                   | q208 : int(1..2)]))
+                             | q203 : int(1..2)]))
+               =
+               toInt(or([q160 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q163] = q160 ->
+                               or([b_PartitionOccurrence_WhichPart[q165] = q157 /\ q165 = q163 | q165 : int(1..2)])
+                                   | q163 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q167] = q157 ->
+                               or([b_PartitionOccurrence_WhichPart[q169] = q160 /\ q169 = q167 | q169 : int(1..2)])
+                                   | q167 : int(1..2)]))
+                             | q160 : int(1..2)]))
+                   | q157 : int(1..2)])))
+            | q30 : int(1..2)])
+    \/
+    or([q31 <= b_PartitionOccurrence_NumParts /\
+        !or([q136 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+             (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q136, q137] ->
+                   or([b_PartitionOccurrence_WhichPart[q139] = q31 /\ q139 = q137 | q139 : int(1..2)])
+                       | q137 : int(1..2)])
+              /\
+              and([b_PartitionOccurrence_WhichPart[q141] = q31 ->
+                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q136, q141]
+                       | q141 : int(1..2)]))
+                 | q136 : int(1..2)])
+        /\
+        (toInt(or([q128 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q128, q129] ->
+                         or([b_PartitionOccurrence_WhichPart[q131] = q31 /\ q131 = q129 | q131 : int(1..2)])
+                             | q129 : int(1..2)])
+                    /\
+                    and([b_PartitionOccurrence_WhichPart[q133] = q31 ->
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q128, q133]
+                             | q133 : int(1..2)]))
+                       | q128 : int(1..2)]))
+         <
+         toInt(or([q34 <= b_PartitionOccurrence_NumParts /\
+                   (and([b_PartitionOccurrence_WhichPart[q37] = q34 ->
+                         or([b_PartitionOccurrence_WhichPart[q39] = q31 /\ q39 = q37 | q39 : int(1..2)])
+                             | q37 : int(1..2)])
+                    /\
+                    and([b_PartitionOccurrence_WhichPart[q41] = q31 ->
+                         or([b_PartitionOccurrence_WhichPart[q43] = q34 /\ q43 = q41 | q43 : int(1..2)])
+                             | q41 : int(1..2)]))
+                       | q34 : int(1..2)]))
+         /\
+         (and([q65 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q44] /\
+                    (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q44]) <
+                     sum([toInt(b_PartitionOccurrence_WhichPart[q57] = q31) * catchUndef(toInt(q57 = q44), 0)
+                              | q57 : int(1..2)])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q45] ->
+                           toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q45]) =
+                           sum([toInt(b_PartitionOccurrence_WhichPart[q63] = q31) * catchUndef(toInt(q63 = q45), 0)
+                                    | q63 : int(1..2)])
+                               | q45 : int(1..2), q45 < q44])
+                      /\
+                      and([!or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q61] /\ q61 = q58
+                                    | q61 : int(1..2)])
+                           ->
+                           (b_PartitionOccurrence_WhichPart[q58] = q31 ->
+                            toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q58]) =
+                            sum([toInt(b_PartitionOccurrence_WhichPart[q60] = q31) * catchUndef(toInt(q60 = q58), 0)
+                                     | q60 : int(1..2)]))
+                               | q58 : int(1..2), q58 < q44])))
+                        | q44 : int(1..2)])
+                \/
+                or([!or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q55] /\ q55 = q46
+                             | q55 : int(1..2)])
+                    /\
+                    (b_PartitionOccurrence_WhichPart[q46] = q31 /\
+                     (toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q46]) <
+                      sum([toInt(b_PartitionOccurrence_WhichPart[q48] = q31) * catchUndef(toInt(q48 = q46), 0)
+                               | q48 : int(1..2)])
+                      /\
+                      (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q45] ->
+                            toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q45]) =
+                            sum([toInt(b_PartitionOccurrence_WhichPart[q54] = q31) * catchUndef(toInt(q54 = q45), 0)
+                                     | q54 : int(1..2)])
+                                | q45 : int(1..2), q45 < q46])
+                       /\
+                       and([!or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q52] /\ q52 = q49
+                                     | q52 : int(1..2)])
+                            ->
+                            (b_PartitionOccurrence_WhichPart[q49] = q31 ->
+                             toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q49]) =
+                             sum([toInt(b_PartitionOccurrence_WhichPart[q51] = q31) * catchUndef(toInt(q51 = q49), 0)
+                                      | q51 : int(1..2)]))
+                                | q49 : int(1..2), q49 < q46]))))
+                        | q46 : int(1..2)]))
+               ->
+               toInt(or([q115 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q115, q116] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q116]
+                                  | q116 : int(1..2)])
+                             | q115 : int(1..2)]))
+               =
+               toInt(or([q119 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q122] = q119 ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q122]
+                                   | q122 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q65, q123] ->
+                               or([b_PartitionOccurrence_WhichPart[q125] = q119 /\ q125 = q123 | q125 : int(1..2)])
+                                   | q123 : int(1..2)]))
+                             | q119 : int(1..2)]))
+                   | q65 : int(1..2)])
+          /\
+          and([and([q66 <= b_PartitionOccurrence_NumParts,
+                    !or([q81 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q81, q82] ->
+                               or([b_PartitionOccurrence_WhichPart[q84] = q66 /\ q84 = q82 | q84 : int(1..2)])
+                                   | q82 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q86] = q66 ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q81, q86]
+                                   | q86 : int(1..2)]))
+                             | q81 : int(1..2)]),
+                    or([b_PartitionOccurrence_WhichPart[q95] = q66 /\
+                        (toInt(or([b_PartitionOccurrence_WhichPart[q88] = q66 /\ q88 = q95 | q88 : int(1..2)])) <
+                         sum([toInt(b_PartitionOccurrence_WhichPart[q57] = q31) * catchUndef(toInt(q57 = q95), 0)
+                                  | q57 : int(1..2)])
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q91] = q66 ->
+                               toInt(or([b_PartitionOccurrence_WhichPart[q90] = q66 /\ q90 = q91 | q90 : int(1..2)])) =
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q63] = q31) * catchUndef(toInt(q63 = q91), 0)
+                                        | q63 : int(1..2)])
+                                   | q91 : int(1..2), q91 < q95])
+                          /\
+                          and([!or([b_PartitionOccurrence_WhichPart[q94] = q66 /\ q94 = q58 | q94 : int(1..2)]) ->
+                               (b_PartitionOccurrence_WhichPart[q58] = q31 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q93] = q66 /\ q93 = q58 | q93 : int(1..2)])) =
+                                sum([toInt(b_PartitionOccurrence_WhichPart[q60] = q31) * catchUndef(toInt(q60 = q58), 0)
+                                         | q60 : int(1..2)]))
+                                   | q58 : int(1..2), q58 < q95])))
+                            | q95 : int(1..2)])
+                    \/
+                    or([!or([b_PartitionOccurrence_WhichPart[q104] = q66 /\ q104 = q46 | q104 : int(1..2)]) /\
+                        (b_PartitionOccurrence_WhichPart[q46] = q31 /\
+                         (toInt(or([b_PartitionOccurrence_WhichPart[q97] = q66 /\ q97 = q46 | q97 : int(1..2)])) <
+                          sum([toInt(b_PartitionOccurrence_WhichPart[q48] = q31) * catchUndef(toInt(q48 = q46), 0)
+                                   | q48 : int(1..2)])
+                          /\
+                          (and([b_PartitionOccurrence_WhichPart[q100] = q66 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q99] = q66 /\ q99 = q100 | q99 : int(1..2)]))
+                                =
+                                sum([toInt(b_PartitionOccurrence_WhichPart[q54] = q31) *
+                                     catchUndef(toInt(q54 = q100), 0)
+                                         | q54 : int(1..2)])
+                                    | q100 : int(1..2), q100 < q46])
+                           /\
+                           and([!or([b_PartitionOccurrence_WhichPart[q103] = q66 /\ q103 = q49 | q103 : int(1..2)]) ->
+                                (b_PartitionOccurrence_WhichPart[q49] = q31 ->
+                                 toInt(or([b_PartitionOccurrence_WhichPart[q102] = q66 /\ q102 = q49
+                                               | q102 : int(1..2)]))
+                                 =
+                                 sum([toInt(b_PartitionOccurrence_WhichPart[q51] = q31) *
+                                      catchUndef(toInt(q51 = q49), 0)
+                                          | q51 : int(1..2)]))
+                                    | q49 : int(1..2), q49 < q46]))))
+                            | q46 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q107 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q107, q108] ->
+                               or([b_PartitionOccurrence_WhichPart[q110] = q66 /\ q110 = q108 | q110 : int(1..2)])
+                                   | q108 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q112] = q66 ->
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q107, q112]
+                                   | q112 : int(1..2)]))
+                             | q107 : int(1..2)]))
+               =
+               toInt(or([q69 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q72] = q69 ->
+                               or([b_PartitionOccurrence_WhichPart[q74] = q66 /\ q74 = q72 | q74 : int(1..2)])
+                                   | q72 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q76] = q66 ->
+                               or([b_PartitionOccurrence_WhichPart[q78] = q69 /\ q78 = q76 | q78 : int(1..2)])
+                                   | q76 : int(1..2)]))
+                             | q69 : int(1..2)]))
+                   | q66 : int(1..2)])))
+            | q31 : int(1..2)]),
+    and([1 =
+         sum([toInt(q24 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q24, q1])
+                  | q24 : int(1..2)])
+             | q1 : int(1..2)]),
+    and([q25 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q25, q26]) | q26 : int(1..2)]) >= 1
+             | q25 : int(1..2)]),
+    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q9]) | q9 : int(1..2)] <lex
+    [-toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q10]) | q10 : int(1..2)],
+    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q5, q11] = false | q11 : int(1..2)])
+             | q5 : int(1..2)]),
+    a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, q7]) | q7 : int(1..2)]) <= 2
+             | q6 : int(1..2)]),
+    2 =
+    sum([toInt(q12 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q12, q13])
+                             | q13 : int(1..2)]),
+                    0)
+             | q12 : int(1..2)]),
+    and([q14 <= b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q14] <= 2 | q14 : int(1..2)]),
+    and([q14 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q14] = 0 | q14 : int(1..2)]),
+    b_PartitionOccurrence_NumParts <= 2,
+    b_PartitionOccurrence_NumParts = max([b_PartitionOccurrence_WhichPart[q17] | q17 : int(1..2)]),
+    and([b_PartitionOccurrence_PartSizes[q18] =
+         sum([toInt(b_PartitionOccurrence_WhichPart[q19] = q18) | q19 : int(1..2)])
+             | q18 : int(1..2)]),
+    and([q20 <= b_PartitionOccurrence_NumParts ->
+         and([b_PartitionOccurrence_WhichPart[q21] = q20 -> b_PartitionOccurrence_FirstIndex[q20] <= q21
+                  | q21 : int(1..2)])
+             | q20 : int(1..2)]),
+    and([q20 <= b_PartitionOccurrence_NumParts ->
+         or([b_PartitionOccurrence_WhichPart[q21] = q20 /\ b_PartitionOccurrence_FirstIndex[q20] = q21
+                 | q21 : int(1..2)])
+             | q20 : int(1..2)]),
+    and([q20 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_FirstIndex[q20] = 1 | q20 : int(1..2)]),
+    and([q22 <= b_PartitionOccurrence_NumParts /\ q23 <= b_PartitionOccurrence_NumParts ->
+         (q22 < q23 <-> b_PartitionOccurrence_FirstIndex[q22] < b_PartitionOccurrence_FirstIndex[q23])
+             | q22 : int(1..2), q23 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1.eprime
new file mode 100644
index 0000000000..917ebeb2c9
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_1.eprime
@@ -0,0 +1,761 @@
+language ESSENCE' 1.0
+
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
+branching on
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
+such that
+    or([q42 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+        (toInt(or([q134 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q134, q135] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q135]
+                            | q135 : int(1..2)])
+                       | q134 : int(1..2)]))
+         <
+         toInt(or([q139 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q139, q140] ->
+                         or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q142] !=
+                             3
+                             /\
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q142] =
+                             q140
+                                 | q142 : int(1..2)])
+                             | q140 : int(1..2)])
+                    /\
+                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q144] != 3 ->
+                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                             [q139,
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q144]]
+                             | q144 : int(1..2)]))
+                       | q139 : int(1..2)]))
+         /\
+         (and([q146 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q205] != 3 /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q226]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q226]
+                               =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q205]
+                                   | q226 : int(1..2)]))
+                     <
+                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q228]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q228] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q205]
+                                   | q228 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q229] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q229] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q205]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q238]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q238]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q229]
+                                         | q238 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q240]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q240]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q229]
+                                         | q240 : int(1..2)]))
+                               | q229 : int(1..2)])
+                      /\
+                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q230]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q232]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q232]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q230]
+                                         | q232 : int(1..2)]),
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q230]
+                                <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                    [q146, q205];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q234]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q234]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q230]
+                                         | q234 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q236]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q236]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q230]
+                                         | q236 : int(1..2)]))
+                               | q230 : int(1..2)])))
+                        | q205 : int(1..2)])
+                \/
+                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q206] != 3 /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q208] != 3
+                         /\
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q208] =
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q206]
+                             | q208 : int(1..2)])
+                    /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q210]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q210]
+                               = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q206]
+                                   | q210 : int(1..2)]))
+                     <
+                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q212]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q212] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q206]
+                                   | q212 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q213] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q213] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q206]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q222]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q222]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q213]
+                                         | q222 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q224]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q224]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q213]
+                                         | q224 : int(1..2)]))
+                               | q213 : int(1..2)])
+                      /\
+                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q214]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q216]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q216]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q214]
+                                         | q216 : int(1..2)]),
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q214]
+                                <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q206];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q218]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q146, q218]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q214]
+                                         | q218 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q220]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q220]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q42, q214]
+                                         | q220 : int(1..2)]))
+                               | q214 : int(1..2)])))
+                        | q206 : int(1..2)]))
+               ->
+               toInt(or([q192 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q192, q193] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q193]
+                                  | q193 : int(1..2)])
+                             | q192 : int(1..2)]))
+               =
+               toInt(or([q197 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q197, q198] ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q146, q200]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q146, q200]
+                                   = q198
+                                       | q200 : int(1..2)])
+                                   | q198 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q146, q202]
+                               != 3
+                               ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q197,
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q146, q202]]
+                                   | q202 : int(1..2)]))
+                             | q197 : int(1..2)]))
+                   | q146 : int(1..2)])
+          /\
+          and([and([q148 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+                    !or([q164 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q164, q166]
+                               != 3
+                               ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q148,
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q164, q166]]
+                                   | q166 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q167] ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q164, q169]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q164, q169]
+                                   = q167
+                                       | q169 : int(1..2)])
+                                   | q167 : int(1..2)]))
+                             | q164 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q170] /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q170]) <
+                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q42, q183]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q42, q183]
+                                   = q170
+                                       | q183 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q171] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q171]) =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q189]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q189]
+                                         = q171
+                                             | q189 : int(1..2)]))
+                                   | q171 : int(1..2), q171 < q170])
+                          /\
+                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q42, q184]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q185] /\
+                                         q185 =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q184]
+                                             | q185 : int(1..2)]),
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q42, q184]
+                                    < q170;
+                                        int(1..3)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                         [q148,
+                                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q42, q184]])
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q187]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q187]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q184]
+                                             | q187 : int(1..2)]))
+                                   | q184 : int(1..2)])))
+                            | q170 : int(1..2)])
+                    \/
+                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q172] != 3 /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q173] /\
+                             q173 =
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q172]
+                                 | q173 : int(1..2)])
+                        /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q148,
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q42, q172]])
+                         <
+                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q42, q175]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q42, q175]
+                                   =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q42, q172]
+                                       | q175 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q171] /\
+                               q171 <
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q172]
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q171]) =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q181]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q181]
+                                         = q171
+                                             | q181 : int(1..2)]))
+                                   | q171 : int(1..2)])
+                          /\
+                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q42, q176]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q177] /\
+                                         q177 =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q176]
+                                             | q177 : int(1..2)]),
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q42, q176]
+                                    <
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q42, q172];
+                                        int(1..3)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                         [q148,
+                                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q42, q176]])
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q179]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q179]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q42, q176]
+                                             | q179 : int(1..2)]))
+                                   | q176 : int(1..2)])))
+                            | q172 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q151 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q151, q153]
+                               != 3
+                               ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q148,
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q151, q153]]
+                                   | q153 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q154] ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q151, q156]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q151, q156]
+                                   = q154
+                                       | q156 : int(1..2)])
+                                   | q154 : int(1..2)]))
+                             | q151 : int(1..2)]))
+               =
+               toInt(or([q159 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q159, q160] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q148, q160]
+                                  | q160 : int(1..2)])
+                             | q159 : int(1..2)]))
+                   | q148 : int(1..2)])))
+            | q42 : int(1..2)])
+    \/
+    or([q44 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+        !or([q126 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+             (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q126, q128] != 3 ->
+                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                       [q44, a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q126, q128]]
+                       | q128 : int(1..2)])
+              /\
+              and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q129] ->
+                   or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q126, q131] != 3 /\
+                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q126, q131] = q129
+                           | q131 : int(1..2)])
+                       | q129 : int(1..2)]))
+                 | q126 : int(1..2)])
+        /\
+        (toInt(or([q47 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q49] != 3 ->
+                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                             [q44,
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q49]]
+                             | q49 : int(1..2)])
+                    /\
+                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q50] ->
+                         or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q52] != 3
+                             /\
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q47, q52] =
+                             q50 | q52 : int(1..2)])
+                             | q50 : int(1..2)]))
+                       | q47 : int(1..2)]))
+         <
+         toInt(or([q55 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q55, q56] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q56]
+                            | q56 : int(1..2)])
+                       | q55 : int(1..2)]))
+         /\
+         (and([q59 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q103] != 3 /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q116]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q116] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q103]
+                                   | q116 : int(1..2)]))
+                     <
+                     toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                               [q44,
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                    [q59, q103]])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q117] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q117] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q103]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q123]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q123]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q117]
+                                         | q123 : int(1..2)]))
+                           =
+                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                     [q44,
+                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q59, q117]])
+                               | q117 : int(1..2)])
+                      /\
+                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q102],
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q121]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q121]
+                                     = q102
+                                         | q121 : int(1..2)]),
+                                q102 <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q103];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q119]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q119]
+                                     = q102
+                                         | q119 : int(1..2)]))
+                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q102])
+                               | q102 : int(1..2)])))
+                        | q103 : int(1..2)])
+                \/
+                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q101] /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q114] != 3 /\
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q114] = q101
+                             | q114 : int(1..2)])
+                    /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q105]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q105] =
+                               q101
+                                   | q105 : int(1..2)]))
+                     < toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q101])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q106] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q106] <
+                           q101
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q112]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q112]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q106]
+                                         | q112 : int(1..2)]))
+                           =
+                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                     [q44,
+                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q59, q106]])
+                               | q106 : int(1..2)])
+                      /\
+                      and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q102] /\
+                           !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q110]
+                                != 3
+                                /\
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q110]
+                                = q102
+                                    | q110 : int(1..2)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q108]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q59, q108]
+                                     = q102
+                                         | q108 : int(1..2)]))
+                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q102])
+                               | q102 : int(1..2), q102 < q101])))
+                        | q101 : int(1..2)]))
+               ->
+               toInt(or([q90 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q90, q91] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q91]
+                                  | q91 : int(1..2)])
+                             | q90 : int(1..2)]))
+               =
+               toInt(or([q95 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q95, q96] ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q59, q98]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q59, q98]
+                                   = q96
+                                       | q98 : int(1..2)])
+                                   | q96 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q100]
+                               != 3
+                               ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q95,
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q59, q100]]
+                                   | q100 : int(1..2)]))
+                             | q95 : int(1..2)]))
+                   | q59 : int(1..2)])
+          /\
+          and([and([q61 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+                    !or([q77 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q77, q79] !=
+                               3
+                               ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q61,
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q77, q79]]
+                                   | q79 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q80] ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q77, q82]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q77, q82]
+                                   = q80
+                                       | q82 : int(1..2)])
+                                   | q80 : int(1..2)]))
+                             | q77 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q83] /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q83]) <
+                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q83])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q84] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q84]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q84])
+                                   | q84 : int(1..2), q84 < q83])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q84] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q87] /\
+                                    q87 = q84
+                                        | q87 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q84]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q84])
+                                   | q84 : int(1..2), q84 < q83])))
+                            | q83 : int(1..2)])
+                    \/
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q83] /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q86] /\ q86 = q83
+                                 | q86 : int(1..2)])
+                        /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q83]) <
+                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q83])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q84] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q84]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q84])
+                                   | q84 : int(1..2), q84 < q83])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q84] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q85] /\
+                                    q85 = q84
+                                        | q85 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q84]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q44, q84])
+                                   | q84 : int(1..2), q84 < q83])))
+                            | q83 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q64 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q66] !=
+                               3
+                               ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
+                                   [q61,
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q64, q66]]
+                                   | q66 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q67] ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q69]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q69]
+                                   = q67
+                                       | q69 : int(1..2)])
+                                   | q67 : int(1..2)]))
+                             | q64 : int(1..2)]))
+               =
+               toInt(or([q72 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q72, q73] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q61, q73]
+                                  | q73 : int(1..2)])
+                             | q72 : int(1..2)]))
+                   | q61 : int(1..2)])))
+            | q44 : int(1..2)]),
+    alldifferent_except([toInt(q34 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q35] !=
+                               3)
+                         *
+                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q34, q35],
+                                    0)
+                             | q34 : int(1..2), q35 : int(1..2)],
+                        0),
+    and([q36 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q38] != 3)
+                  | q38 : int(1..2)])
+         >= 1
+             | q36 : int(1..2)]),
+    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q12] | q12 : int(1..2)] <lex
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q13] | q13 : int(1..2)],
+    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q30] = 1
+                  | q30 : int(1..2)])
+             | q5 : int(1..2)]),
+    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] <
+         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2]
+         \/ a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3
+             | q6 : int(1..2)]),
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3 ->
+          a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2] = 3)
+             | q6 : int(1..2)]),
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != 3)
+                  | q9 : int(1..2)])
+         <= 2
+             | q6 : int(1..2)]),
+    2 =
+    sum([toInt(q14 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q16] !=
+                               3)
+                             | q16 : int(1..2)]),
+                    0)
+             | q14 : int(1..2)]),
+    and([1 =
+         sum([toInt(q31 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q31, q17])
+                  | q31 : int(1..2)])
+             | q17 : int(1..2)]),
+    and([q32 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q32, q33]) | q33 : int(1..2)]) >= 1
+             | q32 : int(1..2)]),
+    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q25]) | q25 : int(1..2)] <lex
+    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q26]) | q26 : int(1..2)],
+    and([q21 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q21, q27] = false | q27 : int(1..2)])
+             | q21 : int(1..2)]),
+    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
+    and([q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q22, q23]) | q23 : int(1..2)]) <= 2
+             | q22 : int(1..2)]),
+    2 =
+    sum([toInt(q28 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q28, q29])
+                             | q29 : int(1..2)]),
+                    0)
+             | q28 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2.eprime
new file mode 100644
index 0000000000..2f788f30c5
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_2.eprime
@@ -0,0 +1,949 @@
+language ESSENCE' 1.0
+
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
+branching on
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
+such that
+    or([q48 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+        (toInt(or([q173 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q173, q174] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q174]
+                            | q174 : int(1..2)])
+                       | q173 : int(1..2)]))
+         <
+         toInt(or([q178 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q178, q179] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q179]
+                            | q179 : int(1..2)])
+                       | q178 : int(1..2)]))
+         /\
+         (and([q182 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q250] != 3 /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q271]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q271]
+                               =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q250]
+                                   | q271 : int(1..2)]))
+                     <
+                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q273]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q273] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q250]
+                                   | q273 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q274] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q274] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q250]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q283]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q283]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q274]
+                                         | q283 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q285]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q285]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q274]
+                                         | q285 : int(1..2)]))
+                               | q274 : int(1..2)])
+                      /\
+                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q275]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q277]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q277]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q275]
+                                         | q277 : int(1..2)]),
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q275]
+                                <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                    [q182, q250];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q279]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q279]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q275]
+                                         | q279 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q281]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q281]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q275]
+                                         | q281 : int(1..2)]))
+                               | q275 : int(1..2)])))
+                        | q250 : int(1..2)])
+                \/
+                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q251] != 3 /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q253] != 3
+                         /\
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q253] =
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q251]
+                             | q253 : int(1..2)])
+                    /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q255]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q255]
+                               = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q251]
+                                   | q255 : int(1..2)]))
+                     <
+                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q257]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q257] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q251]
+                                   | q257 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q258] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q258] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q251]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q267]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q267]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q258]
+                                         | q267 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q269]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q269]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q258]
+                                         | q269 : int(1..2)]))
+                               | q258 : int(1..2)])
+                      /\
+                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q259]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q261]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q261]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q259]
+                                         | q261 : int(1..2)]),
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q259]
+                                <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q251];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q263]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q182, q263]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q259]
+                                         | q263 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q265]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q265]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q48, q259]
+                                         | q265 : int(1..2)]))
+                               | q259 : int(1..2)])))
+                        | q251 : int(1..2)]))
+               ->
+               toInt(or([q240 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q240, q241] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q241]
+                                  | q241 : int(1..2)])
+                             | q240 : int(1..2)]))
+               =
+               toInt(or([q245 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q245, q246] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q182, q246]
+                                  | q246 : int(1..2)])
+                             | q245 : int(1..2)]))
+                   | q182 : int(1..2)])
+          /\
+          and([and([q184 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+                    !or([q197 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q197, q198] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q198]
+                                  | q198 : int(1..2)])
+                             | q197 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q202] != 3 /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q184, q223]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q184, q223]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q184, q202]
+                                       | q223 : int(1..2)]))
+                         <
+                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q48, q225]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q48, q225]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q184, q202]
+                                       | q225 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q226]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q226]
+                               <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q202]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q235]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q235]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q226]
+                                             | q235 : int(1..2)]))
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q237]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q237]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q226]
+                                             | q237 : int(1..2)]))
+                                   | q226 : int(1..2)])
+                          /\
+                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q48, q227]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q229]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q229]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q227]
+                                             | q229 : int(1..2)]),
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q48, q227]
+                                    <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q184, q202];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q231]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q231]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q227]
+                                             | q231 : int(1..2)]))
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q233]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q233]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q227]
+                                             | q233 : int(1..2)]))
+                                   | q227 : int(1..2)])))
+                            | q202 : int(1..2)])
+                    \/
+                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q203] != 3 /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q205] !=
+                             3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q205] =
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q203]
+                                 | q205 : int(1..2)])
+                        /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q184, q207]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q184, q207]
+                                   =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q48, q203]
+                                       | q207 : int(1..2)]))
+                         <
+                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q48, q209]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q48, q209]
+                                   =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q48, q203]
+                                       | q209 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q210]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q210]
+                               < a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q203]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q219]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q219]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q210]
+                                             | q219 : int(1..2)]))
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q221]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q221]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q210]
+                                             | q221 : int(1..2)]))
+                                   | q210 : int(1..2)])
+                          /\
+                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q48, q211]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q213]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q213]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q211]
+                                             | q213 : int(1..2)]),
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q48, q211]
+                                    <
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q48, q203];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q215]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q184, q215]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q211]
+                                             | q215 : int(1..2)]))
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q217]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q217]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q48, q211]
+                                             | q217 : int(1..2)]))
+                                   | q211 : int(1..2)])))
+                            | q203 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q187 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q187, q188] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q188]
+                                  | q188 : int(1..2)])
+                             | q187 : int(1..2)]))
+               =
+               toInt(or([q192 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q192, q193] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q184, q193]
+                                  | q193 : int(1..2)])
+                             | q192 : int(1..2)]))
+                   | q184 : int(1..2)])))
+            | q48 : int(1..2)])
+    \/
+    or([q50 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+        !or([q168 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+             and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q168, q169] =
+                  b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q169]
+                      | q169 : int(1..2)])
+                 | q168 : int(1..2)])
+        /\
+        (toInt(or([q53 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q53, q54] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q54]
+                            | q54 : int(1..2)])
+                       | q53 : int(1..2)]))
+         <
+         toInt(or([q58 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q58, q59] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q59]
+                            | q59 : int(1..2)])
+                       | q58 : int(1..2)]))
+         /\
+         (and([q62 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q130] != 3 /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q151]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q151] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q130]
+                                   | q151 : int(1..2)]))
+                     <
+                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q153]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q153] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q130]
+                                   | q153 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q154] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q154] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q130]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q163]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q163]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q154]
+                                         | q163 : int(1..2)]))
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q165]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q165]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q154]
+                                         | q165 : int(1..2)]))
+                               | q154 : int(1..2)])
+                      /\
+                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q155]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q157]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q157]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q155]
+                                         | q157 : int(1..2)]),
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q155]
+                                <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q130];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q159]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q159]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q155]
+                                         | q159 : int(1..2)]))
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q161]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q161]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q155]
+                                         | q161 : int(1..2)]))
+                               | q155 : int(1..2)])))
+                        | q130 : int(1..2)])
+                \/
+                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q131] != 3 /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q133] != 3 /\
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q133] =
+                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q131]
+                             | q133 : int(1..2)])
+                    /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q135]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q135] =
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q131]
+                                   | q135 : int(1..2)]))
+                     <
+                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q137]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q137] =
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q131]
+                                   | q137 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q138] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q138] <
+                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q131]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q147]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q147]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q138]
+                                         | q147 : int(1..2)]))
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q149]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q149]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q138]
+                                         | q149 : int(1..2)]))
+                               | q138 : int(1..2)])
+                      /\
+                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q139]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q141]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q141]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q139]
+                                         | q141 : int(1..2)]),
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q139]
+                                <
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q131];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q143]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q62, q143]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q139]
+                                         | q143 : int(1..2)]))
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q145]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q145]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q50, q139]
+                                         | q145 : int(1..2)]))
+                               | q139 : int(1..2)])))
+                        | q131 : int(1..2)]))
+               ->
+               toInt(or([q120 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q120, q121] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q121]
+                                  | q121 : int(1..2)])
+                             | q120 : int(1..2)]))
+               =
+               toInt(or([q125 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q125, q126] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q62, q126]
+                                  | q126 : int(1..2)])
+                             | q125 : int(1..2)]))
+                   | q62 : int(1..2)])
+          /\
+          and([and([q64 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+                    !or([q77 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q77, q78] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q78]
+                                  | q78 : int(1..2)])
+                             | q77 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q82] != 3 /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q103]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q103]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q82]
+                                       | q103 : int(1..2)]))
+                         <
+                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q50, q105]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q50, q105]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q82]
+                                       | q105 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q106]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q106] <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q82]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q115]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q115]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q106]
+                                             | q115 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q117]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q117]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q106]
+                                             | q117 : int(1..2)]))
+                                   | q106 : int(1..2)])
+                          /\
+                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q50, q107]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q109]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q109]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q107]
+                                             | q109 : int(1..2)]),
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q50, q107]
+                                    <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q64, q82];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q111]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q111]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q107]
+                                             | q111 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q113]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q113]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q107]
+                                             | q113 : int(1..2)]))
+                                   | q107 : int(1..2)])))
+                            | q82 : int(1..2)])
+                    \/
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q83] != 3 /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q85] != 3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q85] =
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q83]
+                                 | q85 : int(1..2)])
+                        /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q87]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q64, q87]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q50, q83]
+                                       | q87 : int(1..2)]))
+                         <
+                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q50, q89]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q50, q89]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q50, q83]
+                                       | q89 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q90] !=
+                               3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q90] <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q50, q83]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q99]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q99]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q90]
+                                             | q99 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q101]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q101]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q90]
+                                             | q101 : int(1..2)]))
+                                   | q90 : int(1..2)])
+                          /\
+                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q50, q91]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q93]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q93]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q91]
+                                             | q93 : int(1..2)]),
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q50, q91]
+                                    <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q50, q83];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q95]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q64, q95]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q91]
+                                             | q95 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q97]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q97]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q50, q91]
+                                             | q97 : int(1..2)]))
+                                   | q91 : int(1..2)])))
+                            | q83 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q67 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q67, q68] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q68]
+                                  | q68 : int(1..2)])
+                             | q67 : int(1..2)]))
+               =
+               toInt(or([q72 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q72, q73] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q64, q73]
+                                  | q73 : int(1..2)])
+                             | q72 : int(1..2)]))
+                   | q64 : int(1..2)])))
+            | q50 : int(1..2)]),
+    alldifferent_except([toInt(q35 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q35, q36] !=
+                               3)
+                         *
+                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q35, q36],
+                                    0)
+                             | q35 : int(1..2), q36 : int(1..2)],
+                        0),
+    and([q37 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q37, q39] != 3)
+                  | q39 : int(1..2)])
+         >= 1
+             | q37 : int(1..2)]),
+    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q12] | q12 : int(1..2)] <lex
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q13] | q13 : int(1..2)],
+    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q33] = 1
+                  | q33 : int(1..2)])
+             | q5 : int(1..2)]),
+    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] <
+         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2]
+         \/ a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3
+             | q6 : int(1..2)]),
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3 ->
+          a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2] = 3)
+             | q6 : int(1..2)]),
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != 3)
+                  | q9 : int(1..2)])
+         <= 2
+             | q6 : int(1..2)]),
+    2 =
+    sum([toInt(q14 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q16] !=
+                               3)
+                             | q16 : int(1..2)]),
+                    0)
+             | q14 : int(1..2)]),
+    alldifferent_except([toInt(q40 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q40, q41] !=
+                               3)
+                         *
+                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q40, q41],
+                                    0)
+                             | q40 : int(1..2), q41 : int(1..2)],
+                        0),
+    and([q42 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q42, q44] != 3)
+                  | q44 : int(1..2)])
+         >= 1
+             | q42 : int(1..2)]),
+    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q28] | q28 : int(1..2)] <lex
+    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q29] | q29 : int(1..2)],
+    and([q21 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q21, q34] = 1
+                  | q34 : int(1..2)])
+             | q21 : int(1..2)]),
+    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
+    and([q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q22, 1] <
+         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q22, 2]
+         \/ b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q22, 1] = 3
+             | q22 : int(1..2)]),
+    and([q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q22, 1] = 3 ->
+          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q22, 2] = 3)
+             | q22 : int(1..2)]),
+    and([q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q22, q25] != 3)
+                  | q25 : int(1..2)])
+         <= 2
+             | q22 : int(1..2)]),
+    2 =
+    sum([toInt(q30 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q32] !=
+                               3)
+                             | q32 : int(1..2)]),
+                    0)
+             | q30 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3.eprime.orig b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3.eprime.orig
deleted file mode 100644
index bf1e91cfd4..0000000000
--- a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_3.eprime.orig
+++ /dev/null
@@ -1,1208 +0,0 @@
-language ESSENCE' 1.0
-
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-branching on
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    or([q43 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-        (toInt(or([q198 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q199] =
-                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q199]
-                            | q199 : int(1..2)])
-                       | q198 : int(1..2)]))
-         <
-         toInt(or([q203 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (and([q205 <=
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q203]
-                         ->
-                         or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q207] !=
-                             3
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q207] =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q203, q205]
-                                 | q207 : int(1..2)])
-                             | q205 : int(1..2)])
-                    /\
-                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q209] != 3 ->
-                         or([q211 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q203]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q203, q211]
-                             = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q209]
-                                 | q211 : int(1..2)])
-                             | q209 : int(1..2)]))
-                       | q203 : int(1..2)]))
-         /\
-         (and([q213 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q299] != 3 /\
-                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q320]
-                               != 3
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q320]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q299]
-                                   | q320 : int(1..2)]))
-                     <
-                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q322]
-                               != 3
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q322] =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q299]
-                                   | q322 : int(1..2)]))
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q323] != 3
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q323] <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q299]
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q332]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q332]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q323]
-                                         | q332 : int(1..2)]))
-                           =
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q334]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q334]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q323]
-                                         | q334 : int(1..2)]))
-                               | q323 : int(1..2)])
-                      /\
-                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q324]
-                                != 3,
-                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q326]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q326]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q324]
-                                         | q326 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q324]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                    [q213, q299];
-                                    int(1..3)])
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q328]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q328]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q324]
-                                         | q328 : int(1..2)]))
-                           =
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q330]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q330]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q324]
-                                         | q330 : int(1..2)]))
-                               | q324 : int(1..2)])))
-                        | q299 : int(1..2)])
-                \/
-                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q300] != 3 /\
-                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q302] != 3
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q302] =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q300]
-                             | q302 : int(1..2)])
-                    /\
-                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q304]
-                               != 3
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q304]
-                               = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q300]
-                                   | q304 : int(1..2)]))
-                     <
-                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q306]
-                               != 3
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q306] =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q300]
-                                   | q306 : int(1..2)]))
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q307] != 3
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q307] <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q300]
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q316]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q316]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q307]
-                                         | q316 : int(1..2)]))
-                           =
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q318]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q318]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q307]
-                                         | q318 : int(1..2)]))
-                               | q307 : int(1..2)])
-                      /\
-                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q308]
-                                != 3,
-                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q310]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q310]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q308]
-                                         | q310 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q308]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q300];
-                                    int(1..3)])
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q312]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q213, q312]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q308]
-                                         | q312 : int(1..2)]))
-                           =
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q314]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q314]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q43, q308]
-                                         | q314 : int(1..2)]))
-                               | q308 : int(1..2)])))
-                        | q300 : int(1..2)]))
-               ->
-               toInt(or([q283 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q283, q284] =
-                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q284]
-                                  | q284 : int(1..2)])
-                             | q283 : int(1..2)]))
-               =
-               toInt(or([q288 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q290 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q288]
-                               ->
-                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q213, q292]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q213, q292]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q288, q290]
-                                       | q292 : int(1..2)])
-                                   | q290 : int(1..2)])
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q213, q294]
-                               != 3
-                               ->
-                               or([q296 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q288]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q288, q296]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q213, q294]
-                                       | q296 : int(1..2)])
-                                   | q294 : int(1..2)]))
-                             | q288 : int(1..2)]))
-                   | q213 : int(1..2)])
-          /\
-          and([and([q215 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q234 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q234, q236]
-                               != 3
-                               ->
-                               or([q238 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q215]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q238]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q234, q236]
-                                       | q238 : int(1..2)])
-                                   | q236 : int(1..2)])
-                          /\
-                          and([q240 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q215]
-                               ->
-                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q234, q242]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q234, q242]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q240]
-                                       | q242 : int(1..2)])
-                                   | q240 : int(1..2)]))
-                             | q234 : int(1..2)]),
-                    or([q245 <=
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q215]
-                        /\
-                        (toInt(or([q266 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q215]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q266]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q245]
-                                       | q266 : int(1..2)]))
-                         <
-                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q43, q268]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q43, q268]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q245]
-                                       | q268 : int(1..2)]))
-                         /\
-                         (and([q269 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q215]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q215, q269]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q215, q245]
-                               ->
-                               toInt(or([q278 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q215]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q278]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q269]
-                                             | q278 : int(1..2)]))
-                               =
-                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q280]
-                                         != 3
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q280]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q269]
-                                             | q280 : int(1..2)]))
-                                   | q269 : int(1..2)])
-                          /\
-                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q43, q270]
-                                    != 3,
-                                    !or([q272 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q215]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q272]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q270]
-                                             | q272 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q43, q270]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q215, q245];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q274 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q215]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q274]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q270]
-                                             | q274 : int(1..2)]))
-                               =
-                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q276]
-                                         != 3
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q276]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q270]
-                                             | q276 : int(1..2)]))
-                                   | q270 : int(1..2)])))
-                            | q245 : int(1..2)])
-                    \/
-                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q246] != 3 /\
-                        !or([q248 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q215]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q215, q248]
-                             = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q246]
-                                 | q248 : int(1..2)])
-                        /\
-                        (toInt(or([q250 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q215]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q250]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q43, q246]
-                                       | q250 : int(1..2)]))
-                         <
-                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q43, q252]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q43, q252]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q43, q246]
-                                       | q252 : int(1..2)]))
-                         /\
-                         (and([q253 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q215]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q215, q253]
-                               < a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q43, q246]
-                               ->
-                               toInt(or([q262 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q215]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q262]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q253]
-                                             | q262 : int(1..2)]))
-                               =
-                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q264]
-                                         != 3
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q264]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q253]
-                                             | q264 : int(1..2)]))
-                                   | q253 : int(1..2)])
-                          /\
-                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q43, q254]
-                                    != 3,
-                                    !or([q256 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q215]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q256]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q254]
-                                             | q256 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q43, q254]
-                                    <
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q43, q246];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q258 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q215]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q215, q258]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q254]
-                                             | q258 : int(1..2)]))
-                               =
-                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q260]
-                                         != 3
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q260]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q43, q254]
-                                             | q260 : int(1..2)]))
-                                   | q254 : int(1..2)])))
-                            | q246 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q218 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q218, q220]
-                               != 3
-                               ->
-                               or([q222 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q215]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q222]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q218, q220]
-                                       | q222 : int(1..2)])
-                                   | q220 : int(1..2)])
-                          /\
-                          and([q224 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q215]
-                               ->
-                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q218, q226]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q218, q226]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q215, q224]
-                                       | q226 : int(1..2)])
-                                   | q224 : int(1..2)]))
-                             | q218 : int(1..2)]))
-               =
-               toInt(or([q229 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q229] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q215]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q229, q230]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q215, q230]
-                                   | q230 : int(1..2)]))
-                             | q229 : int(1..2)]))
-                   | q215 : int(1..2)])))
-            | q43 : int(1..2)])
-    \/
-    or([q45 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        !or([q187 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-             (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q187, q189] != 3 ->
-                   or([q191 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45]
-                       /\
-                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q45, q191] =
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q187, q189]
-                           | q191 : int(1..2)])
-                       | q189 : int(1..2)])
-              /\
-              and([q193 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45] ->
-                   or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q187, q195] != 3 /\
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q187, q195] =
-                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q45, q193]
-                           | q195 : int(1..2)])
-                       | q193 : int(1..2)]))
-                 | q187 : int(1..2)])
-        /\
-        (toInt(or([q48 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                   (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q50] != 3 ->
-                         or([q52 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q45, q52]
-                             = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q50]
-                                 | q52 : int(1..2)])
-                             | q50 : int(1..2)])
-                    /\
-                    and([q54 <=
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45]
-                         ->
-                         or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q56] != 3
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q48, q56] =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q45, q54]
-                                 | q56 : int(1..2)])
-                             | q54 : int(1..2)]))
-                       | q48 : int(1..2)]))
-         <
-         toInt(or([q59 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q59] =
-                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45]
-                    /\
-                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q59, q60]
-                         =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q45, q60]
-                             | q60 : int(1..2)]))
-                       | q59 : int(1..2)]))
-         /\
-         (and([q63 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q149] != 3 /\
-                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q170]
-                               != 3
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q170] =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q149]
-                                   | q170 : int(1..2)]))
-                     <
-                     toInt(or([q172 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q45, q172]
-                               = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q149]
-                                   | q172 : int(1..2)]))
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q173] != 3
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q173] <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q149]
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q182]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q182]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q173]
-                                         | q182 : int(1..2)]))
-                           =
-                           toInt(or([q184 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q45]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q184]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q173]
-                                         | q184 : int(1..2)]))
-                               | q173 : int(1..2)])
-                      /\
-                      and([and([q174 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q45],
-                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q180]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q180]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q174]
-                                         | q180 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q45, q174]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q149];
-                                    int(1..3)])
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q176]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q176]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q174]
-                                         | q176 : int(1..2)]))
-                           =
-                           toInt(or([q178 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q45]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q178]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q174]
-                                         | q178 : int(1..2)]))
-                               | q174 : int(1..2)])))
-                        | q149 : int(1..2)])
-                \/
-                or([q150 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45] /\
-                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q168] != 3 /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q168] =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q45, q150]
-                             | q168 : int(1..2)])
-                    /\
-                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q152]
-                               != 3
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q152] =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q45, q150]
-                                   | q152 : int(1..2)]))
-                     <
-                     toInt(or([q154 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q45, q154]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q45, q150]
-                                   | q154 : int(1..2)]))
-                     /\
-                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q155] != 3
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q155] <
-                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q45, q150]
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q164]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q164]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q155]
-                                         | q164 : int(1..2)]))
-                           =
-                           toInt(or([q166 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q45]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q166]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q155]
-                                         | q166 : int(1..2)]))
-                               | q155 : int(1..2)])
-                      /\
-                      and([and([q156 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q45],
-                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q162]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q162]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q156]
-                                         | q162 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q45, q156]
-                                <
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q45, q150];
-                                    int(1..3)])
-                           ->
-                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q158]
-                                     != 3
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q63, q158]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q156]
-                                         | q158 : int(1..2)]))
-                           =
-                           toInt(or([q160 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q45]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q160]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q45, q156]
-                                         | q160 : int(1..2)]))
-                               | q156 : int(1..2)])))
-                        | q150 : int(1..2)]))
-               ->
-               toInt(or([q133 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q133, q134] =
-                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q134]
-                                  | q134 : int(1..2)])
-                             | q133 : int(1..2)]))
-               =
-               toInt(or([q138 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q140 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q138]
-                               ->
-                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q63, q142]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q63, q142]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q138, q140]
-                                       | q142 : int(1..2)])
-                                   | q140 : int(1..2)])
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q63, q144]
-                               != 3
-                               ->
-                               or([q146 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q138]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q138, q146]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q63, q144]
-                                       | q146 : int(1..2)])
-                                   | q144 : int(1..2)]))
-                             | q138 : int(1..2)]))
-                   | q63 : int(1..2)])
-          /\
-          and([and([q65 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q84 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q84, q86] !=
-                               3
-                               ->
-                               or([q88 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q65]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q88]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q84, q86]
-                                       | q88 : int(1..2)])
-                                   | q86 : int(1..2)])
-                          /\
-                          and([q90 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q65]
-                               ->
-                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q84, q92]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q84, q92]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q90]
-                                       | q92 : int(1..2)])
-                                   | q90 : int(1..2)]))
-                             | q84 : int(1..2)]),
-                    or([q95 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q65]
-                        /\
-                        (toInt(or([q116 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q65]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q116]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q95]
-                                       | q116 : int(1..2)]))
-                         <
-                         toInt(or([q118 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q45]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q45, q118]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q95]
-                                       | q118 : int(1..2)]))
-                         /\
-                         (and([q119 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q65]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q65, q119]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q65, q95]
-                               ->
-                               toInt(or([q128 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q65]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q128]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q119]
-                                             | q128 : int(1..2)]))
-                               =
-                               toInt(or([q130 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q45]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q130]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q119]
-                                             | q130 : int(1..2)]))
-                                   | q119 : int(1..2)])
-                          /\
-                          and([and([q120 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q45],
-                                    !or([q126 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q65]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q126]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q120]
-                                             | q126 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q45, q120]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q65, q95];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q122 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q65]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q122]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q120]
-                                             | q122 : int(1..2)]))
-                               =
-                               toInt(or([q124 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q45]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q124]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q120]
-                                             | q124 : int(1..2)]))
-                                   | q120 : int(1..2)])))
-                            | q95 : int(1..2)])
-                    \/
-                    or([q96 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q45]
-                        /\
-                        !or([q114 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q65]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q65, q114]
-                             =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q45, q96]
-                                 | q114 : int(1..2)])
-                        /\
-                        (toInt(or([q98 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q65]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q98]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q45, q96]
-                                       | q98 : int(1..2)]))
-                         <
-                         toInt(or([q100 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q45]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q45, q100]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q45, q96]
-                                       | q100 : int(1..2)]))
-                         /\
-                         (and([q101 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q65]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q65, q101]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q45, q96]
-                               ->
-                               toInt(or([q110 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q65]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q110]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q101]
-                                             | q110 : int(1..2)]))
-                               =
-                               toInt(or([q112 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q45]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q112]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q101]
-                                             | q112 : int(1..2)]))
-                                   | q101 : int(1..2)])
-                          /\
-                          and([and([q102 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q45],
-                                    !or([q108 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q65]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q108]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q102]
-                                             | q108 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q45, q102]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q45, q96];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q104 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q65]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q65, q104]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q102]
-                                             | q104 : int(1..2)]))
-                               =
-                               toInt(or([q106 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q45]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q106]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q45, q102]
-                                             | q106 : int(1..2)]))
-                                   | q102 : int(1..2)])))
-                            | q96 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q68 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q68, q70] !=
-                               3
-                               ->
-                               or([q72 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q65]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q72]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q68, q70]
-                                       | q72 : int(1..2)])
-                                   | q70 : int(1..2)])
-                          /\
-                          and([q74 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q65]
-                               ->
-                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q68, q76]
-                                   != 3
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q68, q76]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q65, q74]
-                                       | q76 : int(1..2)])
-                                   | q74 : int(1..2)]))
-                             | q68 : int(1..2)]))
-               =
-               toInt(or([q79 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q79] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q65]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q79, q80]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q65, q80]
-                                   | q80 : int(1..2)]))
-                             | q79 : int(1..2)]))
-                   | q65 : int(1..2)])))
-            | q45 : int(1..2)]),
-    alldifferent_except([toInt(q32 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q32, q33] !=
-                               3)
-                         *
-                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q32, q33],
-                                    0)
-                             | q32 : int(1..2), q33 : int(1..2)],
-                        0),
-    and([q34 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q34, q36] != 3)
-                  | q36 : int(1..2)])
-         >= 1
-             | q34 : int(1..2)]),
-    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q12] | q12 : int(1..2)] <lex
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q13] | q13 : int(1..2)],
-    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q30] = 1
-                  | q30 : int(1..2)])
-             | q5 : int(1..2)]),
-    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] <
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2]
-         \/ a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3 ->
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2] = 3)
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != 3)
-                  | q9 : int(1..2)])
-         <= 2
-             | q6 : int(1..2)]),
-    2 =
-    sum([toInt(q14 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
-         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q16] !=
-                               3)
-                             | q16 : int(1..2)]),
-                    0)
-             | q14 : int(1..2)]),
-    alldifferent_except([toInt(q37 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q38 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q37])
-                         *
-                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q37, q38],
-                                    0)
-                             | q37 : int(1..2), q38 : int(1..2)],
-                        0),
-    and([q39 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q39] >= 1
-             | q39 : int(1..2)]),
-    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q27]
-                  | q27 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q28]
-                  | q28 : int(1..2)];
-                 int(1..2)]),
-    and([q21 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q21] = 0 /\
-         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q21, q31] = 1
-                  | q31 : int(1..2)])
-             | q21 : int(1..2)]),
-    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q22] ->
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q22, 1] <
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q22, 2])
-             | q22 : int(1..2)]),
-    and([q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q24 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q22] ->
-              b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q22, q24] = 1
-                  | q24 : int(1..2)])
-             | q22 : int(1..2)]),
-    and([q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q22] <= 2
-             | q22 : int(1..2)]),
-    2 =
-    sum([toInt(q29 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q29], 0)
-             | q29 : int(1..2)])
-
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4.eprime
new file mode 100644
index 0000000000..99d329b649
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_2_4.eprime
@@ -0,0 +1,809 @@
+language ESSENCE' 1.0
+
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
+find a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
+find b_PartitionOccurrence_NumParts: int(1..2)
+find b_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
+find b_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
+find b_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
+branching on
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy, b_PartitionOccurrence_NumParts,
+     b_PartitionOccurrence_WhichPart, b_PartitionOccurrence_PartSizes, b_PartitionOccurrence_FirstIndex]
+such that
+    or([q36 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+        (toInt(or([q183 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q183, q184] =
+                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q184]
+                            | q184 : int(1..2)])
+                       | q183 : int(1..2)]))
+         <
+         toInt(or([q187 <= b_PartitionOccurrence_NumParts /\
+                   (and([b_PartitionOccurrence_WhichPart[q190] = q187 ->
+                         or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q192] !=
+                             3
+                             /\
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q192] =
+                             q190
+                                 | q192 : int(1..2)])
+                             | q190 : int(1..2)])
+                    /\
+                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q194] != 3 ->
+                         or([b_PartitionOccurrence_WhichPart[q196] = q187 /\
+                             q196 =
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q194]
+                                 | q196 : int(1..2)])
+                             | q194 : int(1..2)]))
+                       | q187 : int(1..2)]))
+         /\
+         (and([q198 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q290] != 3 /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q311]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q311]
+                               =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q290]
+                                   | q311 : int(1..2)]))
+                     <
+                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q313]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q313] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q290]
+                                   | q313 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q314] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q314] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q290]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q323]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q323]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q314]
+                                         | q323 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q325]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q325]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q314]
+                                         | q325 : int(1..2)]))
+                               | q314 : int(1..2)])
+                      /\
+                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q315]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q317]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q317]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q315]
+                                         | q317 : int(1..2)]),
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q315]
+                                <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                    [q198, q290];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q319]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q319]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q315]
+                                         | q319 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q321]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q321]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q315]
+                                         | q321 : int(1..2)]))
+                               | q315 : int(1..2)])))
+                        | q290 : int(1..2)])
+                \/
+                or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q291] != 3 /\
+                    !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q293] != 3
+                         /\
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q293] =
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q291]
+                             | q293 : int(1..2)])
+                    /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q295]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q295]
+                               = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q291]
+                                   | q295 : int(1..2)]))
+                     <
+                     toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q297]
+                               != 3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q297] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q291]
+                                   | q297 : int(1..2)]))
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q298] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q298] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q291]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q307]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q307]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q298]
+                                         | q307 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q309]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q309]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q298]
+                                         | q309 : int(1..2)]))
+                               | q298 : int(1..2)])
+                      /\
+                      and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q299]
+                                != 3,
+                                !or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q301]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q301]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q299]
+                                         | q301 : int(1..2)]),
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q299]
+                                <
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q291];
+                                    int(1..3)])
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q303]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q198, q303]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q299]
+                                         | q303 : int(1..2)]))
+                           =
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q305]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q305]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q36, q299]
+                                         | q305 : int(1..2)]))
+                               | q299 : int(1..2)])))
+                        | q291 : int(1..2)]))
+               ->
+               toInt(or([q274 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q274, q275] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q275]
+                                  | q275 : int(1..2)])
+                             | q274 : int(1..2)]))
+               =
+               toInt(or([q278 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q281] = q278 ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q198, q283]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q198, q283]
+                                   = q281
+                                       | q283 : int(1..2)])
+                                   | q281 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q198, q285]
+                               != 3
+                               ->
+                               or([b_PartitionOccurrence_WhichPart[q287] = q278 /\
+                                   q287 =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q198, q285]
+                                       | q287 : int(1..2)])
+                                   | q285 : int(1..2)]))
+                             | q278 : int(1..2)]))
+                   | q198 : int(1..2)])
+          /\
+          and([and([q199 <= b_PartitionOccurrence_NumParts,
+                    !or([q214 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q214, q216]
+                               != 3
+                               ->
+                               or([b_PartitionOccurrence_WhichPart[q218] = q199 /\
+                                   q218 =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q214, q216]
+                                       | q218 : int(1..2)])
+                                   | q216 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q220] = q199 ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q214, q222]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q214, q222]
+                                   = q220
+                                       | q222 : int(1..2)])
+                                   | q220 : int(1..2)]))
+                             | q214 : int(1..2)]),
+                    or([b_PartitionOccurrence_WhichPart[q225] = q199 /\
+                        (sum([toInt(b_PartitionOccurrence_WhichPart[q246] = q199) * catchUndef(toInt(q246 = q225), 0)
+                                  | q246 : int(1..2)])
+                         <
+                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q36, q248]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q36, q248]
+                                   = q225
+                                       | q248 : int(1..2)]))
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q249] = q199 ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q258] = q199) *
+                                    catchUndef(toInt(q258 = q249), 0)
+                                        | q258 : int(1..2)])
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q260]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q260]
+                                         = q249
+                                             | q260 : int(1..2)]))
+                                   | q249 : int(1..2), q249 < q225])
+                          /\
+                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q36, q250]
+                                    != 3,
+                                    !or([b_PartitionOccurrence_WhichPart[q252] = q199 /\
+                                         q252 =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q250]
+                                             | q252 : int(1..2)]),
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q36, q250]
+                                    < q225;
+                                        int(1..3)])
+                               ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q254] = q199) *
+                                    catchUndef(toInt(q254 =
+                                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                         [q36, q250]),
+                                               0)
+                                        | q254 : int(1..2)])
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q256]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q256]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q250]
+                                             | q256 : int(1..2)]))
+                                   | q250 : int(1..2)])))
+                            | q225 : int(1..2)])
+                    \/
+                    or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q226] != 3 /\
+                        !or([b_PartitionOccurrence_WhichPart[q228] = q199 /\
+                             q228 =
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q226]
+                                 | q228 : int(1..2)])
+                        /\
+                        (sum([toInt(b_PartitionOccurrence_WhichPart[q230] = q199) *
+                              catchUndef(toInt(q230 =
+                                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                   [q36, q226]),
+                                         0)
+                                  | q230 : int(1..2)])
+                         <
+                         toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q36, q232]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q36, q232]
+                                   =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q36, q226]
+                                       | q232 : int(1..2)]))
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q233] = q199 /\
+                               q233 <
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q36, q226]
+                               ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q242] = q199) *
+                                    catchUndef(toInt(q242 = q233), 0)
+                                        | q242 : int(1..2)])
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q244]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q244]
+                                         = q233
+                                             | q244 : int(1..2)]))
+                                   | q233 : int(1..2)])
+                          /\
+                          and([and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q36, q234]
+                                    != 3,
+                                    !or([b_PartitionOccurrence_WhichPart[q236] = q199 /\
+                                         q236 =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q234]
+                                             | q236 : int(1..2)]),
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q36, q234]
+                                    <
+                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q36, q226];
+                                        int(1..3)])
+                               ->
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q238] = q199) *
+                                    catchUndef(toInt(q238 =
+                                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                         [q36, q234]),
+                                               0)
+                                        | q238 : int(1..2)])
+                               =
+                               toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q240]
+                                         != 3
+                                         /\
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q240]
+                                         =
+                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q36, q234]
+                                             | q240 : int(1..2)]))
+                                   | q234 : int(1..2)])))
+                            | q226 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q263 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q263, q265]
+                               != 3
+                               ->
+                               or([b_PartitionOccurrence_WhichPart[q267] = q199 /\
+                                   q267 =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q263, q265]
+                                       | q267 : int(1..2)])
+                                   | q265 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q269] = q199 ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q263, q271]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q263, q271]
+                                   = q269
+                                       | q271 : int(1..2)])
+                                   | q269 : int(1..2)]))
+                             | q263 : int(1..2)]))
+               =
+               toInt(or([q202 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q205] = q202 ->
+                               or([b_PartitionOccurrence_WhichPart[q207] = q199 /\ q207 = q205 | q207 : int(1..2)])
+                                   | q205 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q209] = q199 ->
+                               or([b_PartitionOccurrence_WhichPart[q211] = q202 /\ q211 = q209 | q211 : int(1..2)])
+                                   | q209 : int(1..2)]))
+                             | q202 : int(1..2)]))
+                   | q199 : int(1..2)])))
+            | q36 : int(1..2)])
+    \/
+    or([q37 <= b_PartitionOccurrence_NumParts /\
+        !or([q172 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+             (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q172, q174] != 3 ->
+                   or([b_PartitionOccurrence_WhichPart[q176] = q37 /\
+                       q176 = a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q172, q174]
+                           | q176 : int(1..2)])
+                       | q174 : int(1..2)])
+              /\
+              and([b_PartitionOccurrence_WhichPart[q178] = q37 ->
+                   or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q172, q180] != 3 /\
+                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q172, q180] = q178
+                           | q180 : int(1..2)])
+                       | q178 : int(1..2)]))
+                 | q172 : int(1..2)])
+        /\
+        (toInt(or([q161 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q161, q163] != 3
+                         ->
+                         or([b_PartitionOccurrence_WhichPart[q165] = q37 /\
+                             q165 =
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q161, q163]
+                                 | q165 : int(1..2)])
+                             | q163 : int(1..2)])
+                    /\
+                    and([b_PartitionOccurrence_WhichPart[q167] = q37 ->
+                         or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q161, q169] !=
+                             3
+                             /\
+                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q161, q169] =
+                             q167
+                                 | q169 : int(1..2)])
+                             | q167 : int(1..2)]))
+                       | q161 : int(1..2)]))
+         <
+         toInt(or([q40 <= b_PartitionOccurrence_NumParts /\
+                   (and([b_PartitionOccurrence_WhichPart[q43] = q40 ->
+                         or([b_PartitionOccurrence_WhichPart[q45] = q37 /\ q45 = q43 | q45 : int(1..2)])
+                             | q43 : int(1..2)])
+                    /\
+                    and([b_PartitionOccurrence_WhichPart[q47] = q37 ->
+                         or([b_PartitionOccurrence_WhichPart[q49] = q40 /\ q49 = q47 | q49 : int(1..2)])
+                             | q47 : int(1..2)]))
+                       | q40 : int(1..2)]))
+         /\
+         (and([q71 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+               (or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q72] != 3 /\
+                    (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q80] !=
+                               3
+                               /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q80] =
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q72]
+                                   | q80 : int(1..2)]))
+                     <
+                     sum([toInt(b_PartitionOccurrence_WhichPart[q63] = q37) *
+                          catchUndef(toInt(q63 =
+                                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                               [q71, q72]),
+                                     0)
+                              | q63 : int(1..2)])
+                     /\
+                     (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q73] != 3
+                           /\
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q73] <
+                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q72]
+                           ->
+                           toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q71, q75]
+                                     != 3
+                                     /\
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q71, q75]
+                                     =
+                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q71, q73]
+                                         | q75 : int(1..2)]))
+                           =
+                           sum([toInt(b_PartitionOccurrence_WhichPart[q69] = q37) *
+                                catchUndef(toInt(q69 =
+                                                 a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                     [q71, q73]),
+                                           0)
+                                    | q69 : int(1..2)])
+                               | q73 : int(1..2)])
+                      /\
+                      and([!or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q76]
+                                != 3
+                                /\
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q76] =
+                                q64 | q76 : int(1..2)])
+                           /\
+                           q64 < a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q72]
+                           ->
+                           (b_PartitionOccurrence_WhichPart[q64] = q37 ->
+                            toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q71, q78]
+                                      != 3
+                                      /\
+                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q71, q78]
+                                      = q64
+                                          | q78 : int(1..2)]))
+                            =
+                            sum([toInt(b_PartitionOccurrence_WhichPart[q66] = q37) * catchUndef(toInt(q66 = q64), 0)
+                                     | q66 : int(1..2)]))
+                               | q64 : int(1..2)])))
+                        | q72 : int(1..2)])
+                \/
+                or([!or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q89] != 3 /\
+                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q89] = q52
+                             | q89 : int(1..2)])
+                    /\
+                    (b_PartitionOccurrence_WhichPart[q52] = q37 /\
+                     (toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q88]
+                                != 3
+                                /\
+                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q88] =
+                                q52 | q88 : int(1..2)]))
+                      <
+                      sum([toInt(b_PartitionOccurrence_WhichPart[q54] = q37) * catchUndef(toInt(q54 = q52), 0)
+                               | q54 : int(1..2)])
+                      /\
+                      (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q81] != 3
+                            /\
+                            a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q81] < q52
+                            ->
+                            toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q71, q83]
+                                      != 3
+                                      /\
+                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q71, q83]
+                                      =
+                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                          [q71, q81]
+                                          | q83 : int(1..2)]))
+                            =
+                            sum([toInt(b_PartitionOccurrence_WhichPart[q60] = q37) *
+                                 catchUndef(toInt(q60 =
+                                                  a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                      [q71, q81]),
+                                            0)
+                                     | q60 : int(1..2)])
+                                | q81 : int(1..2)])
+                       /\
+                       and([!or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q84]
+                                 != 3
+                                 /\
+                                 a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q84]
+                                 = q55
+                                     | q84 : int(1..2)])
+                            ->
+                            (b_PartitionOccurrence_WhichPart[q55] = q37 ->
+                             toInt(or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                           [q71, q86]
+                                       != 3
+                                       /\
+                                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                           [q71, q86]
+                                       = q55
+                                           | q86 : int(1..2)]))
+                             =
+                             sum([toInt(b_PartitionOccurrence_WhichPart[q57] = q37) * catchUndef(toInt(q57 = q55), 0)
+                                      | q57 : int(1..2)]))
+                                | q55 : int(1..2), q55 < q52]))))
+                        | q52 : int(1..2)]))
+               ->
+               toInt(or([q145 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q145, q146] =
+                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q146]
+                                  | q146 : int(1..2)])
+                             | q145 : int(1..2)]))
+               =
+               toInt(or([q149 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q152] = q149 ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q71, q154]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q71, q154]
+                                   = q152
+                                       | q154 : int(1..2)])
+                                   | q152 : int(1..2)])
+                          /\
+                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q71, q156]
+                               != 3
+                               ->
+                               or([b_PartitionOccurrence_WhichPart[q158] = q149 /\
+                                   q158 =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q71, q156]
+                                       | q158 : int(1..2)])
+                                   | q156 : int(1..2)]))
+                             | q149 : int(1..2)]))
+                   | q71 : int(1..2)])
+          /\
+          and([and([q90 <= b_PartitionOccurrence_NumParts,
+                    !or([q105 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q105, q107]
+                               != 3
+                               ->
+                               or([b_PartitionOccurrence_WhichPart[q109] = q90 /\
+                                   q109 =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q105, q107]
+                                       | q109 : int(1..2)])
+                                   | q107 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q111] = q90 ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q105, q113]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q105, q113]
+                                   = q111
+                                       | q113 : int(1..2)])
+                                   | q111 : int(1..2)]))
+                             | q105 : int(1..2)]),
+                    or([b_PartitionOccurrence_WhichPart[q122] = q90 /\
+                        (toInt(or([b_PartitionOccurrence_WhichPart[q115] = q90 /\ q115 = q122 | q115 : int(1..2)])) <
+                         sum([toInt(b_PartitionOccurrence_WhichPart[q63] = q37) * catchUndef(toInt(q63 = q122), 0)
+                                  | q63 : int(1..2)])
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q118] = q90 ->
+                               toInt(or([b_PartitionOccurrence_WhichPart[q117] = q90 /\ q117 = q118
+                                             | q117 : int(1..2)]))
+                               =
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q69] = q37) * catchUndef(toInt(q69 = q118), 0)
+                                        | q69 : int(1..2)])
+                                   | q118 : int(1..2), q118 < q122])
+                          /\
+                          and([!or([b_PartitionOccurrence_WhichPart[q121] = q90 /\ q121 = q64 | q121 : int(1..2)]) ->
+                               (b_PartitionOccurrence_WhichPart[q64] = q37 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q120] = q90 /\ q120 = q64
+                                              | q120 : int(1..2)]))
+                                =
+                                sum([toInt(b_PartitionOccurrence_WhichPart[q66] = q37) * catchUndef(toInt(q66 = q64), 0)
+                                         | q66 : int(1..2)]))
+                                   | q64 : int(1..2), q64 < q122])))
+                            | q122 : int(1..2)])
+                    \/
+                    or([!or([b_PartitionOccurrence_WhichPart[q131] = q90 /\ q131 = q52 | q131 : int(1..2)]) /\
+                        (b_PartitionOccurrence_WhichPart[q52] = q37 /\
+                         (toInt(or([b_PartitionOccurrence_WhichPart[q124] = q90 /\ q124 = q52 | q124 : int(1..2)])) <
+                          sum([toInt(b_PartitionOccurrence_WhichPart[q54] = q37) * catchUndef(toInt(q54 = q52), 0)
+                                   | q54 : int(1..2)])
+                          /\
+                          (and([b_PartitionOccurrence_WhichPart[q127] = q90 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q126] = q90 /\ q126 = q127
+                                              | q126 : int(1..2)]))
+                                =
+                                sum([toInt(b_PartitionOccurrence_WhichPart[q60] = q37) *
+                                     catchUndef(toInt(q60 = q127), 0)
+                                         | q60 : int(1..2)])
+                                    | q127 : int(1..2), q127 < q52])
+                           /\
+                           and([!or([b_PartitionOccurrence_WhichPart[q130] = q90 /\ q130 = q55 | q130 : int(1..2)]) ->
+                                (b_PartitionOccurrence_WhichPart[q55] = q37 ->
+                                 toInt(or([b_PartitionOccurrence_WhichPart[q129] = q90 /\ q129 = q55
+                                               | q129 : int(1..2)]))
+                                 =
+                                 sum([toInt(b_PartitionOccurrence_WhichPart[q57] = q37) *
+                                      catchUndef(toInt(q57 = q55), 0)
+                                          | q57 : int(1..2)]))
+                                    | q55 : int(1..2), q55 < q52]))))
+                            | q52 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q134 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q134, q136]
+                               != 3
+                               ->
+                               or([b_PartitionOccurrence_WhichPart[q138] = q90 /\
+                                   q138 =
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q134, q136]
+                                       | q138 : int(1..2)])
+                                   | q136 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q140] = q90 ->
+                               or([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q134, q142]
+                                   != 3
+                                   /\
+                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q134, q142]
+                                   = q140
+                                       | q142 : int(1..2)])
+                                   | q140 : int(1..2)]))
+                             | q134 : int(1..2)]))
+               =
+               toInt(or([q93 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q96] = q93 ->
+                               or([b_PartitionOccurrence_WhichPart[q98] = q90 /\ q98 = q96 | q98 : int(1..2)])
+                                   | q96 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q100] = q90 ->
+                               or([b_PartitionOccurrence_WhichPart[q102] = q93 /\ q102 = q100 | q102 : int(1..2)])
+                                   | q100 : int(1..2)]))
+                             | q93 : int(1..2)]))
+                   | q90 : int(1..2)])))
+            | q37 : int(1..2)]),
+    alldifferent_except([toInt(q28 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q28, q29] !=
+                               3)
+                         *
+                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q28, q29],
+                                    0)
+                             | q28 : int(1..2), q29 : int(1..2)],
+                        0),
+    and([q30 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q32] != 3)
+                  | q32 : int(1..2)])
+         >= 1
+             | q30 : int(1..2)]),
+    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q12] | q12 : int(1..2)] <lex
+    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q13] | q13 : int(1..2)],
+    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q5, q27] = 1
+                  | q27 : int(1..2)])
+             | q5 : int(1..2)]),
+    a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] <
+         a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2]
+         \/ a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3
+             | q6 : int(1..2)]),
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 1] = 3 ->
+          a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, 2] = 3)
+             | q6 : int(1..2)]),
+    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, q9] != 3)
+                  | q9 : int(1..2)])
+         <= 2
+             | q6 : int(1..2)]),
+    2 =
+    sum([toInt(q14 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(a_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q14, q16] !=
+                               3)
+                             | q16 : int(1..2)]),
+                    0)
+             | q14 : int(1..2)]),
+    and([q17 <= b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q17] <= 2 | q17 : int(1..2)]),
+    and([q17 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q17] = 0 | q17 : int(1..2)]),
+    b_PartitionOccurrence_NumParts <= 2,
+    b_PartitionOccurrence_NumParts = max([b_PartitionOccurrence_WhichPart[q20] | q20 : int(1..2)]),
+    and([b_PartitionOccurrence_PartSizes[q21] =
+         sum([toInt(b_PartitionOccurrence_WhichPart[q22] = q21) | q22 : int(1..2)])
+             | q21 : int(1..2)]),
+    and([q23 <= b_PartitionOccurrence_NumParts ->
+         and([b_PartitionOccurrence_WhichPart[q24] = q23 -> b_PartitionOccurrence_FirstIndex[q23] <= q24
+                  | q24 : int(1..2)])
+             | q23 : int(1..2)]),
+    and([q23 <= b_PartitionOccurrence_NumParts ->
+         or([b_PartitionOccurrence_WhichPart[q24] = q23 /\ b_PartitionOccurrence_FirstIndex[q23] = q24
+                 | q24 : int(1..2)])
+             | q23 : int(1..2)]),
+    and([q23 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_FirstIndex[q23] = 1 | q23 : int(1..2)]),
+    and([q25 <= b_PartitionOccurrence_NumParts /\ q26 <= b_PartitionOccurrence_NumParts ->
+         (q25 < q26 <-> b_PartitionOccurrence_FirstIndex[q25] < b_PartitionOccurrence_FirstIndex[q26])
+             | q25 : int(1..2), q26 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1.eprime.orig b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1.eprime.orig
deleted file mode 100644
index 72047fad24..0000000000
--- a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_1.eprime.orig
+++ /dev/null
@@ -1,852 +0,0 @@
-language ESSENCE' 1.0
-
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
-branching on
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
-such that
-    or([q37 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        (toInt(or([q129 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q129] =
-                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q37]
-                    /\
-                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q129, q130]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q37, q130]
-                             | q130 : int(1..2)]))
-                       | q129 : int(1..2)]))
-         <
-         toInt(or([q134 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                   (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q134, q135] ->
-                         or([q137 <=
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q37]
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q37, q137]
-                             = q135
-                                 | q137 : int(1..2)])
-                             | q135 : int(1..2)])
-                    /\
-                    and([q139 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q37]
-                         ->
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                             [q134,
-                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                  [q37, q139]]
-                             | q139 : int(1..2)]))
-                       | q134 : int(1..2)]))
-         /\
-         (and([q141 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q200 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q141]
-                    /\
-                    (toInt(or([q221 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q141]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q141, q221]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q141, q200]
-                                   | q221 : int(1..2)]))
-                     <
-                     toInt(or([q223 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q37]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q37, q223]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q141, q200]
-                                   | q223 : int(1..2)]))
-                     /\
-                     (and([q224 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q141]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q141, q224]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q141, q200]
-                           ->
-                           toInt(or([q233 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q141]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q233]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q224]
-                                         | q233 : int(1..2)]))
-                           =
-                           toInt(or([q235 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q37]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q235]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q224]
-                                         | q235 : int(1..2)]))
-                               | q224 : int(1..2)])
-                      /\
-                      and([and([q225 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q37],
-                                !or([q231 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q141]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q231]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q225]
-                                         | q231 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q37, q225]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q141, q200];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q227 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q141]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q227]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q225]
-                                         | q227 : int(1..2)]))
-                           =
-                           toInt(or([q229 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q37]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q229]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q225]
-                                         | q229 : int(1..2)]))
-                               | q225 : int(1..2)])))
-                        | q200 : int(1..2)])
-                \/
-                or([q201 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q37] /\
-                    !or([q219 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q141]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q141, q219]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q37, q201]
-                             | q219 : int(1..2)])
-                    /\
-                    (toInt(or([q203 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q141]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q141, q203]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q37, q201]
-                                   | q203 : int(1..2)]))
-                     <
-                     toInt(or([q205 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q37]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q37, q205]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q37, q201]
-                                   | q205 : int(1..2)]))
-                     /\
-                     (and([q206 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q141]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q141, q206]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q37, q201]
-                           ->
-                           toInt(or([q215 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q141]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q215]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q206]
-                                         | q215 : int(1..2)]))
-                           =
-                           toInt(or([q217 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q37]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q217]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q206]
-                                         | q217 : int(1..2)]))
-                               | q206 : int(1..2)])
-                      /\
-                      and([and([q207 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q37],
-                                !or([q213 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q141]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q213]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q207]
-                                         | q213 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q37, q207]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q37, q201];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q209 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q141]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q141, q209]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q207]
-                                         | q209 : int(1..2)]))
-                           =
-                           toInt(or([q211 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q37]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q211]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q37, q207]
-                                         | q211 : int(1..2)]))
-                               | q207 : int(1..2)])))
-                        | q201 : int(1..2)]))
-               ->
-               toInt(or([q187 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q187] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q141]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q187, q188]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q141, q188]
-                                   | q188 : int(1..2)]))
-                             | q187 : int(1..2)]))
-               =
-               toInt(or([q192 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q192, q193] ->
-                               or([q195 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q141]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q141, q195]
-                                   = q193
-                                       | q195 : int(1..2)])
-                                   | q193 : int(1..2)])
-                          /\
-                          and([q197 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q141]
-                               ->
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q192,
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q141, q197]]
-                                   | q197 : int(1..2)]))
-                             | q192 : int(1..2)]))
-                   | q141 : int(1..2)])
-          /\
-          and([and([q143 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
-                    !or([q159 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q161 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q159]
-                               ->
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q143,
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q159, q161]]
-                                   | q161 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q162] ->
-                               or([q164 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q159]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q159, q164]
-                                   = q162
-                                       | q164 : int(1..2)])
-                                   | q162 : int(1..2)]))
-                             | q159 : int(1..2)]),
-                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q165] /\
-                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q165]) <
-                         toInt(or([q178 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q37]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q37, q178]
-                                   = q165
-                                       | q178 : int(1..2)]))
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q166] ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q166]) =
-                               toInt(or([q184 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q37]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q184]
-                                         = q166
-                                             | q184 : int(1..2)]))
-                                   | q166 : int(1..2), q166 < q165])
-                          /\
-                          and([and([q179 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q37],
-                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q182] /\
-                                         q182 =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q179]
-                                             | q182 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q37, q179]
-                                    < q165;
-                                        int(1..3)])
-                               ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                         [q143,
-                                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                              [q37, q179]])
-                               =
-                               toInt(or([q181 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q37]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q181]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q179]
-                                             | q181 : int(1..2)]))
-                                   | q179 : int(1..2)])))
-                            | q165 : int(1..2)])
-                    \/
-                    or([q167 <=
-                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q37]
-                        /\
-                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q176] /\
-                             q176 =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q37, q167]
-                                 | q176 : int(1..2)])
-                        /\
-                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q143,
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q37, q167]])
-                         <
-                         toInt(or([q169 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q37]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q37, q169]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q37, q167]
-                                       | q169 : int(1..2)]))
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q166] /\
-                               q166 <
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q37, q167]
-                               ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q166]) =
-                               toInt(or([q175 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q37]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q175]
-                                         = q166
-                                             | q175 : int(1..2)]))
-                                   | q166 : int(1..2)])
-                          /\
-                          and([and([q170 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q37],
-                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q173] /\
-                                         q173 =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q170]
-                                             | q173 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q37, q170]
-                                    <
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q37, q167];
-                                        int(1..3)])
-                               ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                         [q143,
-                                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                              [q37, q170]])
-                               =
-                               toInt(or([q172 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q37]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q172]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q37, q170]
-                                             | q172 : int(1..2)]))
-                                   | q170 : int(1..2)])))
-                            | q167 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q146 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q148 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q146]
-                               ->
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q143,
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q146, q148]]
-                                   | q148 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q149] ->
-                               or([q151 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q146]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q146, q151]
-                                   = q149
-                                       | q151 : int(1..2)])
-                                   | q149 : int(1..2)]))
-                             | q146 : int(1..2)]))
-               =
-               toInt(or([q154 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q154, q155] =
-                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q143, q155]
-                                  | q155 : int(1..2)])
-                             | q154 : int(1..2)]))
-                   | q143 : int(1..2)])))
-            | q37 : int(1..2)])
-    \/
-    or([q39 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-        !or([q121 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q123 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q121] ->
-                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                       [q39,
-                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                            [q121, q123]]
-                       | q123 : int(1..2)])
-              /\
-              and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q124] ->
-                   or([q126 <=
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q121]
-                       /\
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q121, q126]
-                       = q124
-                           | q126 : int(1..2)])
-                       | q124 : int(1..2)]))
-                 | q121 : int(1..2)])
-        /\
-        (toInt(or([q42 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (and([q44 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q42]
-                         ->
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                             [q39,
-                              a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                  [q42, q44]]
-                             | q44 : int(1..2)])
-                    /\
-                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q45] ->
-                         or([q47 <=
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q42]
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q42, q47]
-                             = q45
-                                 | q47 : int(1..2)])
-                             | q45 : int(1..2)]))
-                       | q42 : int(1..2)]))
-         <
-         toInt(or([q50 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q50, q51] =
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q51]
-                            | q51 : int(1..2)])
-                       | q50 : int(1..2)]))
-         /\
-         (and([q54 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q98 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54] /\
-                    (toInt(or([q111 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q111]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q98]
-                                   | q111 : int(1..2)]))
-                     <
-                     toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                               [q39,
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q54, q98]])
-                     /\
-                     (and([q112 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q54, q112]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q54, q98]
-                           ->
-                           toInt(or([q118 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q54]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q54, q118]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q54, q112]
-                                         | q118 : int(1..2)]))
-                           =
-                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                     [q39,
-                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                          [q54, q112]])
-                               | q112 : int(1..2)])
-                      /\
-                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q97],
-                                !or([q116 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q54]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q54, q116]
-                                     = q97
-                                         | q116 : int(1..2)]),
-                                q97 <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q54, q98];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q114 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q54]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q54, q114]
-                                     = q97
-                                         | q114 : int(1..2)]))
-                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q97])
-                               | q97 : int(1..2)])))
-                        | q98 : int(1..2)])
-                \/
-                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q96] /\
-                    !or([q109 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q54, q109]
-                         = q96
-                             | q109 : int(1..2)])
-                    /\
-                    (toInt(or([q100 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q100]
-                               = q96
-                                   | q100 : int(1..2)]))
-                     < toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q96])
-                     /\
-                     (and([q101 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q54, q101]
-                           < q96
-                           ->
-                           toInt(or([q107 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q54]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q54, q107]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q54, q101]
-                                         | q107 : int(1..2)]))
-                           =
-                           toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                     [q39,
-                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                          [q54, q101]])
-                               | q101 : int(1..2)])
-                      /\
-                      and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q97] /\
-                           !or([q105 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q54]
-                                /\
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q54, q105]
-                                = q97
-                                    | q105 : int(1..2)])
-                           ->
-                           toInt(or([q103 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q54]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q54, q103]
-                                     = q97
-                                         | q103 : int(1..2)]))
-                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q97])
-                               | q97 : int(1..2), q97 < q96])))
-                        | q96 : int(1..2)]))
-               ->
-               toInt(or([q85 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q85] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q85, q86]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q86]
-                                   | q86 : int(1..2)]))
-                             | q85 : int(1..2)]))
-               =
-               toInt(or([q90 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q90, q91] ->
-                               or([q93 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q54]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q54, q93]
-                                   = q91
-                                       | q93 : int(1..2)])
-                                   | q91 : int(1..2)])
-                          /\
-                          and([q95 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                               ->
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q90,
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q54, q95]]
-                                   | q95 : int(1..2)]))
-                             | q90 : int(1..2)]))
-                   | q54 : int(1..2)])
-          /\
-          and([and([q56 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
-                    !or([q72 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q74 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q72]
-                               ->
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q56,
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q72, q74]]
-                                   | q74 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q75] ->
-                               or([q77 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q72]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q72, q77]
-                                   = q75
-                                       | q77 : int(1..2)])
-                                   | q75 : int(1..2)]))
-                             | q72 : int(1..2)]),
-                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q78] /\
-                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q78]) <
-                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q78])
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q79] ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q79]) =
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q79])
-                                   | q79 : int(1..2), q79 < q78])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q79] /\
-                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q82] /\
-                                    q82 = q79
-                                        | q82 : int(1..2)])
-                               ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q79]) =
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q79])
-                                   | q79 : int(1..2), q79 < q78])))
-                            | q78 : int(1..2)])
-                    \/
-                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q78] /\
-                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q81] /\ q81 = q78
-                                 | q81 : int(1..2)])
-                        /\
-                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q78]) <
-                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q78])
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q79] ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q79]) =
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q79])
-                                   | q79 : int(1..2), q79 < q78])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q79] /\
-                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q80] /\
-                                    q80 = q79
-                                        | q80 : int(1..2)])
-                               ->
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q79]) =
-                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q39, q79])
-                                   | q79 : int(1..2), q79 < q78])))
-                            | q78 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q59 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q61 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q59]
-                               ->
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence
-                                   [q56,
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q59, q61]]
-                                   | q61 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q62] ->
-                               or([q64 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q59]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q59, q64]
-                                   = q62
-                                       | q64 : int(1..2)])
-                                   | q62 : int(1..2)]))
-                             | q59 : int(1..2)]))
-               =
-               toInt(or([q67 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q67, q68] =
-                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q56, q68]
-                                  | q68 : int(1..2)])
-                             | q67 : int(1..2)]))
-                   | q56 : int(1..2)])))
-            | q39 : int(1..2)]),
-    alldifferent_except([toInt(q31 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q32 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q31])
-                         *
-                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q31, q32],
-                                    0)
-                             | q31 : int(1..2), q32 : int(1..2)],
-                        0),
-    and([q33 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q33] >= 1
-             | q33 : int(1..2)]),
-    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q11]
-                  | q11 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q12]
-                  | q12 : int(1..2)];
-                 int(1..2)]),
-    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q27] = 1
-                  | q27 : int(1..2)])
-             | q5 : int(1..2)]),
-    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 1] <
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 2])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..2)])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= 2
-             | q6 : int(1..2)]),
-    2 =
-    sum([toInt(q13 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q13], 0)
-             | q13 : int(1..2)]),
-    and([1 =
-         sum([toInt(q28 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
-                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q28, q14])
-                  | q28 : int(1..2)])
-             | q14 : int(1..2)]),
-    and([q29 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q29, q30]) | q30 : int(1..2)]) >= 1
-             | q29 : int(1..2)]),
-    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q22]) | q22 : int(1..2)] <lex
-    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q23]) | q23 : int(1..2)],
-    and([q18 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q18, q24] = false | q24 : int(1..2)])
-             | q18 : int(1..2)]),
-    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q19, q20]) | q20 : int(1..2)]) <= 2
-             | q19 : int(1..2)]),
-    2 =
-    sum([toInt(q25 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
-         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q25, q26])
-                             | q26 : int(1..2)]),
-                    0)
-             | q25 : int(1..2)])
-
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2.eprime.orig b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2.eprime.orig
deleted file mode 100644
index c88908f280..0000000000
--- a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_2.eprime.orig
+++ /dev/null
@@ -1,1228 +0,0 @@
-language ESSENCE' 1.0
-
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
-branching on
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
-such that
-    or([q43 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        (toInt(or([q198 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q198] =
-                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43]
-                    /\
-                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q198, q199]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q43, q199]
-                             | q199 : int(1..2)]))
-                       | q198 : int(1..2)]))
-         <
-         toInt(or([q203 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                   (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q203, q205] != 3
-                         ->
-                         or([q207 <=
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43]
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q43, q207]
-                             = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q203, q205]
-                                 | q207 : int(1..2)])
-                             | q205 : int(1..2)])
-                    /\
-                    and([q209 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43]
-                         ->
-                         or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q203, q211] !=
-                             3
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q203, q211] =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q43, q209]
-                                 | q211 : int(1..2)])
-                             | q209 : int(1..2)]))
-                       | q203 : int(1..2)]))
-         /\
-         (and([q213 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q299 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q213]
-                    /\
-                    (toInt(or([q320 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q213]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q213, q320]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q213, q299]
-                                   | q320 : int(1..2)]))
-                     <
-                     toInt(or([q322 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q43, q322]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q213, q299]
-                                   | q322 : int(1..2)]))
-                     /\
-                     (and([q323 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q213]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q213, q323]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q213, q299]
-                           ->
-                           toInt(or([q332 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q213]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q332]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q323]
-                                         | q332 : int(1..2)]))
-                           =
-                           toInt(or([q334 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q43]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q334]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q323]
-                                         | q334 : int(1..2)]))
-                               | q323 : int(1..2)])
-                      /\
-                      and([and([q324 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q43],
-                                !or([q330 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q213]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q330]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q324]
-                                         | q330 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q43, q324]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q213, q299];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q326 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q213]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q326]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q324]
-                                         | q326 : int(1..2)]))
-                           =
-                           toInt(or([q328 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q43]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q328]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q324]
-                                         | q328 : int(1..2)]))
-                               | q324 : int(1..2)])))
-                        | q299 : int(1..2)])
-                \/
-                or([q300 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43] /\
-                    !or([q318 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q213]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q213, q318]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q43, q300]
-                             | q318 : int(1..2)])
-                    /\
-                    (toInt(or([q302 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q213]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q213, q302]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q43, q300]
-                                   | q302 : int(1..2)]))
-                     <
-                     toInt(or([q304 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q43, q304]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q43, q300]
-                                   | q304 : int(1..2)]))
-                     /\
-                     (and([q305 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q213]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q213, q305]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q43, q300]
-                           ->
-                           toInt(or([q314 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q213]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q314]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q305]
-                                         | q314 : int(1..2)]))
-                           =
-                           toInt(or([q316 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q43]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q316]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q305]
-                                         | q316 : int(1..2)]))
-                               | q305 : int(1..2)])
-                      /\
-                      and([and([q306 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q43],
-                                !or([q312 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q213]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q312]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q306]
-                                         | q312 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q43, q306]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q43, q300];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q308 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q213]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q213, q308]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q306]
-                                         | q308 : int(1..2)]))
-                           =
-                           toInt(or([q310 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q43]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q310]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q43, q306]
-                                         | q310 : int(1..2)]))
-                               | q306 : int(1..2)])))
-                        | q300 : int(1..2)]))
-               ->
-               toInt(or([q283 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q283] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q213]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q283, q284]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q213, q284]
-                                   | q284 : int(1..2)]))
-                             | q283 : int(1..2)]))
-               =
-               toInt(or([q288 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q288, q290]
-                               != 3
-                               ->
-                               or([q292 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q213]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q213, q292]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q288, q290]
-                                       | q292 : int(1..2)])
-                                   | q290 : int(1..2)])
-                          /\
-                          and([q294 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q213]
-                               ->
-                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q288, q296]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q288, q296]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q213, q294]
-                                       | q296 : int(1..2)])
-                                   | q294 : int(1..2)]))
-                             | q288 : int(1..2)]))
-                   | q213 : int(1..2)])
-          /\
-          and([and([q215 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
-                    !or([q234 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q236 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q234]
-                               ->
-                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q238]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q238]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q234, q236]
-                                       | q238 : int(1..2)])
-                                   | q236 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q240]
-                               != 3
-                               ->
-                               or([q242 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q234]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q234, q242]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q240]
-                                       | q242 : int(1..2)])
-                                   | q240 : int(1..2)]))
-                             | q234 : int(1..2)]),
-                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q245] != 3 /\
-                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q266]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q266]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q245]
-                                       | q266 : int(1..2)]))
-                         <
-                         toInt(or([q268 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q43]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q43, q268]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q245]
-                                       | q268 : int(1..2)]))
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q269]
-                               != 3
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q269]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q245]
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q278]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q278]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q269]
-                                             | q278 : int(1..2)]))
-                               =
-                               toInt(or([q280 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q43]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q280]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q269]
-                                             | q280 : int(1..2)]))
-                                   | q269 : int(1..2)])
-                          /\
-                          and([and([q270 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q43],
-                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q276]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q276]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q270]
-                                             | q276 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q43, q270]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q215, q245];
-                                        int(1..3)])
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q272]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q272]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q270]
-                                             | q272 : int(1..2)]))
-                               =
-                               toInt(or([q274 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q43]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q274]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q270]
-                                             | q274 : int(1..2)]))
-                                   | q270 : int(1..2)])))
-                            | q245 : int(1..2)])
-                    \/
-                    or([q246 <=
-                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43]
-                        /\
-                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q264] !=
-                             3
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q264] =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q43, q246]
-                                 | q264 : int(1..2)])
-                        /\
-                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q248]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q248]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q43, q246]
-                                       | q248 : int(1..2)]))
-                         <
-                         toInt(or([q250 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q43]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q43, q250]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q43, q246]
-                                       | q250 : int(1..2)]))
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q251]
-                               != 3
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q251]
-                               <
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q43, q246]
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q260]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q260]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q251]
-                                             | q260 : int(1..2)]))
-                               =
-                               toInt(or([q262 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q43]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q262]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q251]
-                                             | q262 : int(1..2)]))
-                                   | q251 : int(1..2)])
-                          /\
-                          and([and([q252 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q43],
-                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q258]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q258]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q252]
-                                             | q258 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q43, q252]
-                                    <
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q43, q246];
-                                        int(1..3)])
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q254]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q215, q254]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q252]
-                                             | q254 : int(1..2)]))
-                               =
-                               toInt(or([q256 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q43]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q256]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q43, q252]
-                                             | q256 : int(1..2)]))
-                                   | q252 : int(1..2)])))
-                            | q246 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q218 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q220 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q218]
-                               ->
-                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q222]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q222]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q218, q220]
-                                       | q222 : int(1..2)])
-                                   | q220 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q224]
-                               != 3
-                               ->
-                               or([q226 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q218]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q218, q226]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q215, q224]
-                                       | q226 : int(1..2)])
-                                   | q224 : int(1..2)]))
-                             | q218 : int(1..2)]))
-               =
-               toInt(or([q229 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q229, q230] =
-                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q215, q230]
-                                  | q230 : int(1..2)])
-                             | q229 : int(1..2)]))
-                   | q215 : int(1..2)])))
-            | q43 : int(1..2)])
-    \/
-    or([q45 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-        !or([q187 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q189 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q187] ->
-                   or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q191] != 3 /\
-                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q191] =
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q187, q189]
-                           | q191 : int(1..2)])
-                       | q189 : int(1..2)])
-              /\
-              and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q193] != 3 ->
-                   or([q195 <=
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q187]
-                       /\
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q187, q195]
-                       = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q193]
-                           | q195 : int(1..2)])
-                       | q193 : int(1..2)]))
-                 | q187 : int(1..2)])
-        /\
-        (toInt(or([q48 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (and([q50 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q48]
-                         ->
-                         or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q52] != 3
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q52] =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q48, q50]
-                                 | q52 : int(1..2)])
-                             | q50 : int(1..2)])
-                    /\
-                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q54] != 3 ->
-                         or([q56 <=
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q48]
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q48, q56]
-                             = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q54]
-                                 | q56 : int(1..2)])
-                             | q54 : int(1..2)]))
-                       | q48 : int(1..2)]))
-         <
-         toInt(or([q59 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q59, q60] =
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q60]
-                            | q60 : int(1..2)])
-                       | q59 : int(1..2)]))
-         /\
-         (and([q63 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q149 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63] /\
-                    (toInt(or([q170 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q63, q170]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q63, q149]
-                                   | q170 : int(1..2)]))
-                     <
-                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q172]
-                               != 3
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q172] =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q63, q149]
-                                   | q172 : int(1..2)]))
-                     /\
-                     (and([q173 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q63, q173]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q63, q149]
-                           ->
-                           toInt(or([q182 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q63]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q182]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q173]
-                                         | q182 : int(1..2)]))
-                           =
-                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q184]
-                                     != 3
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q184]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q173]
-                                         | q184 : int(1..2)]))
-                               | q173 : int(1..2)])
-                      /\
-                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q174]
-                                != 3,
-                                !or([q176 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q63]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q176]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q174]
-                                         | q176 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q174]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q63, q149];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q178 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q63]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q178]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q174]
-                                         | q178 : int(1..2)]))
-                           =
-                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q180]
-                                     != 3
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q180]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q174]
-                                         | q180 : int(1..2)]))
-                               | q174 : int(1..2)])))
-                        | q149 : int(1..2)])
-                \/
-                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q150] != 3 /\
-                    !or([q152 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q63, q152]
-                         = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q150]
-                             | q152 : int(1..2)])
-                    /\
-                    (toInt(or([q154 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q63, q154]
-                               = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q150]
-                                   | q154 : int(1..2)]))
-                     <
-                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q156]
-                               != 3
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q156] =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q150]
-                                   | q156 : int(1..2)]))
-                     /\
-                     (and([q157 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q63, q157]
-                           < b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q150]
-                           ->
-                           toInt(or([q166 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q63]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q166]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q157]
-                                         | q166 : int(1..2)]))
-                           =
-                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q168]
-                                     != 3
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q168]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q157]
-                                         | q168 : int(1..2)]))
-                               | q157 : int(1..2)])
-                      /\
-                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q158]
-                                != 3,
-                                !or([q160 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q63]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q160]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q158]
-                                         | q160 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q158]
-                                <
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q150];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q162 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q63]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q63, q162]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q158]
-                                         | q162 : int(1..2)]))
-                           =
-                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q164]
-                                     != 3
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q164]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                         [q45, q158]
-                                         | q164 : int(1..2)]))
-                               | q158 : int(1..2)])))
-                        | q150 : int(1..2)]))
-               ->
-               toInt(or([q133 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q133] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q133, q134]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q63, q134]
-                                   | q134 : int(1..2)]))
-                             | q133 : int(1..2)]))
-               =
-               toInt(or([q138 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q138, q140]
-                               != 3
-                               ->
-                               or([q142 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q63]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q63, q142]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q138, q140]
-                                       | q142 : int(1..2)])
-                                   | q140 : int(1..2)])
-                          /\
-                          and([q144 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q63]
-                               ->
-                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q138, q146]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q138, q146]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q63, q144]
-                                       | q146 : int(1..2)])
-                                   | q144 : int(1..2)]))
-                             | q138 : int(1..2)]))
-                   | q63 : int(1..2)])
-          /\
-          and([and([q65 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
-                    !or([q84 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q86 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q84]
-                               ->
-                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q88]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q88]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q84, q86]
-                                       | q88 : int(1..2)])
-                                   | q86 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q90] !=
-                               3
-                               ->
-                               or([q92 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q84]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q84, q92]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q90]
-                                       | q92 : int(1..2)])
-                                   | q90 : int(1..2)]))
-                             | q84 : int(1..2)]),
-                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q95] != 3 /\
-                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q116]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q116]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q95]
-                                       | q116 : int(1..2)]))
-                         <
-                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q45, q118]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q45, q118]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q95]
-                                       | q118 : int(1..2)]))
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q119]
-                               != 3
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q119] <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q95]
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q128]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q128]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q119]
-                                             | q128 : int(1..2)]))
-                               =
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q130]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q130]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q119]
-                                             | q130 : int(1..2)]))
-                                   | q119 : int(1..2)])
-                          /\
-                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q45, q120]
-                                    != 3,
-                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q122]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q122]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q120]
-                                             | q122 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q45, q120]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q65, q95];
-                                        int(1..3)])
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q124]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q124]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q120]
-                                             | q124 : int(1..2)]))
-                               =
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q126]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q126]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q120]
-                                             | q126 : int(1..2)]))
-                                   | q120 : int(1..2)])))
-                            | q95 : int(1..2)])
-                    \/
-                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q96] != 3 /\
-                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q98] != 3
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q98] =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q96]
-                                 | q98 : int(1..2)])
-                        /\
-                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q100]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q100]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q45, q96]
-                                       | q100 : int(1..2)]))
-                         <
-                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q45, q102]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q45, q102]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q45, q96]
-                                       | q102 : int(1..2)]))
-                         /\
-                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q103]
-                               != 3
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q103] <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q45, q96]
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q112]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q112]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q103]
-                                             | q112 : int(1..2)]))
-                               =
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q114]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q114]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q103]
-                                             | q114 : int(1..2)]))
-                                   | q103 : int(1..2)])
-                          /\
-                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q45, q104]
-                                    != 3,
-                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q106]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q106]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q104]
-                                             | q106 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q45, q104]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q45, q96];
-                                        int(1..3)])
-                               ->
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q108]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q65, q108]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q104]
-                                             | q108 : int(1..2)]))
-                               =
-                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q110]
-                                         != 3
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q110]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                             [q45, q104]
-                                             | q110 : int(1..2)]))
-                                   | q104 : int(1..2)])))
-                            | q96 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q68 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q70 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q68]
-                               ->
-                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q72]
-                                   != 3
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q72]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q68, q70]
-                                       | q72 : int(1..2)])
-                                   | q70 : int(1..2)])
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q74] !=
-                               3
-                               ->
-                               or([q76 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q68]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q68, q76]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                       [q65, q74]
-                                       | q76 : int(1..2)])
-                                   | q74 : int(1..2)]))
-                             | q68 : int(1..2)]))
-               =
-               toInt(or([q79 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q79, q80] =
-                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q65, q80]
-                                  | q80 : int(1..2)])
-                             | q79 : int(1..2)]))
-                   | q65 : int(1..2)])))
-            | q45 : int(1..2)]),
-    alldifferent_except([toInt(q32 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q33 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q32])
-                         *
-                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q32, q33],
-                                    0)
-                             | q32 : int(1..2), q33 : int(1..2)],
-                        0),
-    and([q34 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q34] >= 1
-             | q34 : int(1..2)]),
-    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q11]
-                  | q11 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q12]
-                  | q12 : int(1..2)];
-                 int(1..2)]),
-    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q30] = 1
-                  | q30 : int(1..2)])
-             | q5 : int(1..2)]),
-    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 1] <
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 2])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..2)])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= 2
-             | q6 : int(1..2)]),
-    2 =
-    sum([toInt(q13 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q13], 0)
-             | q13 : int(1..2)]),
-    alldifferent_except([toInt(q35 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q35, q36] !=
-                               3)
-                         *
-                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
-                                        [q35, q36],
-                                    0)
-                             | q35 : int(1..2), q36 : int(1..2)],
-                        0),
-    and([q37 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q37, q39] != 3)
-                  | q39 : int(1..2)])
-         >= 1
-             | q37 : int(1..2)]),
-    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q25] | q25 : int(1..2)] <lex
-    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q26] | q26 : int(1..2)],
-    and([q18 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q18, q31] = 1
-                  | q31 : int(1..2)])
-             | q18 : int(1..2)]),
-    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 1] <
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 2]
-         \/ b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 1] = 3
-             | q19 : int(1..2)]),
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 1] = 3 ->
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, 2] = 3)
-             | q19 : int(1..2)]),
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q19, q22] != 3)
-                  | q22 : int(1..2)])
-         <= 2
-             | q19 : int(1..2)]),
-    2 =
-    sum([toInt(q27 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
-         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q27, q29] !=
-                               3)
-                             | q29 : int(1..2)]),
-                    0)
-             | q27 : int(1..2)])
-
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3.eprime.orig b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3.eprime.orig
deleted file mode 100644
index 849d1cad80..0000000000
--- a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_3.eprime.orig
+++ /dev/null
@@ -1,1127 +0,0 @@
-language ESSENCE' 1.0
-
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-branching on
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    or([q38 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        (toInt(or([q163 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q163] =
-                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q38]
-                    /\
-                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q163, q164]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q38, q164]
-                             | q164 : int(1..2)]))
-                       | q163 : int(1..2)]))
-         <
-         toInt(or([q168 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q168] =
-                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q38]
-                    /\
-                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q168, q169]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q38, q169]
-                             | q169 : int(1..2)]))
-                       | q168 : int(1..2)]))
-         /\
-         (and([q172 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q240 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q172]
-                    /\
-                    (toInt(or([q261 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q172]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q172, q261]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q172, q240]
-                                   | q261 : int(1..2)]))
-                     <
-                     toInt(or([q263 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q38]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q38, q263]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q172, q240]
-                                   | q263 : int(1..2)]))
-                     /\
-                     (and([q264 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q172]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q172, q264]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q172, q240]
-                           ->
-                           toInt(or([q273 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q172]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q273]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q264]
-                                         | q273 : int(1..2)]))
-                           =
-                           toInt(or([q275 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q38]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q275]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q264]
-                                         | q275 : int(1..2)]))
-                               | q264 : int(1..2)])
-                      /\
-                      and([and([q265 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q38],
-                                !or([q271 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q172]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q271]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q265]
-                                         | q271 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q38, q265]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q172, q240];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q267 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q172]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q267]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q265]
-                                         | q267 : int(1..2)]))
-                           =
-                           toInt(or([q269 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q38]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q269]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q265]
-                                         | q269 : int(1..2)]))
-                               | q265 : int(1..2)])))
-                        | q240 : int(1..2)])
-                \/
-                or([q241 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q38] /\
-                    !or([q259 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q172]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q172, q259]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q38, q241]
-                             | q259 : int(1..2)])
-                    /\
-                    (toInt(or([q243 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q172]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q172, q243]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q38, q241]
-                                   | q243 : int(1..2)]))
-                     <
-                     toInt(or([q245 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q38]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q38, q245]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q38, q241]
-                                   | q245 : int(1..2)]))
-                     /\
-                     (and([q246 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q172]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q172, q246]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q38, q241]
-                           ->
-                           toInt(or([q255 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q172]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q255]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q246]
-                                         | q255 : int(1..2)]))
-                           =
-                           toInt(or([q257 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q38]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q257]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q246]
-                                         | q257 : int(1..2)]))
-                               | q246 : int(1..2)])
-                      /\
-                      and([and([q247 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q38],
-                                !or([q253 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q172]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q253]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q247]
-                                         | q253 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q38, q247]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q38, q241];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q249 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q172]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q172, q249]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q247]
-                                         | q249 : int(1..2)]))
-                           =
-                           toInt(or([q251 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q38]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q251]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q38, q247]
-                                         | q251 : int(1..2)]))
-                               | q247 : int(1..2)])))
-                        | q241 : int(1..2)]))
-               ->
-               toInt(or([q230 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q230] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q172]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q230, q231]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q172, q231]
-                                   | q231 : int(1..2)]))
-                             | q230 : int(1..2)]))
-               =
-               toInt(or([q235 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q235] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q172]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q235, q236]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q172, q236]
-                                   | q236 : int(1..2)]))
-                             | q235 : int(1..2)]))
-                   | q172 : int(1..2)])
-          /\
-          and([and([q174 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q187 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q187] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q174]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q187, q188]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q174, q188]
-                                   | q188 : int(1..2)]))
-                             | q187 : int(1..2)]),
-                    or([q192 <=
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q174]
-                        /\
-                        (toInt(or([q213 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q174]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q174, q213]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q174, q192]
-                                       | q213 : int(1..2)]))
-                         <
-                         toInt(or([q215 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q38]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q38, q215]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q174, q192]
-                                       | q215 : int(1..2)]))
-                         /\
-                         (and([q216 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q174]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q174, q216]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q174, q192]
-                               ->
-                               toInt(or([q225 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q174]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q225]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q216]
-                                             | q225 : int(1..2)]))
-                               =
-                               toInt(or([q227 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q38]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q227]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q216]
-                                             | q227 : int(1..2)]))
-                                   | q216 : int(1..2)])
-                          /\
-                          and([and([q217 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q38],
-                                    !or([q223 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q174]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q223]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q217]
-                                             | q223 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q38, q217]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q174, q192];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q219 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q174]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q219]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q217]
-                                             | q219 : int(1..2)]))
-                               =
-                               toInt(or([q221 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q38]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q221]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q217]
-                                             | q221 : int(1..2)]))
-                                   | q217 : int(1..2)])))
-                            | q192 : int(1..2)])
-                    \/
-                    or([q193 <=
-                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q38]
-                        /\
-                        !or([q211 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q174]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q174, q211]
-                             =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q38, q193]
-                                 | q211 : int(1..2)])
-                        /\
-                        (toInt(or([q195 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q174]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q174, q195]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q38, q193]
-                                       | q195 : int(1..2)]))
-                         <
-                         toInt(or([q197 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q38]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q38, q197]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q38, q193]
-                                       | q197 : int(1..2)]))
-                         /\
-                         (and([q198 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q174]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q174, q198]
-                               <
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q38, q193]
-                               ->
-                               toInt(or([q207 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q174]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q207]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q198]
-                                             | q207 : int(1..2)]))
-                               =
-                               toInt(or([q209 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q38]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q209]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q198]
-                                             | q209 : int(1..2)]))
-                                   | q198 : int(1..2)])
-                          /\
-                          and([and([q199 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q38],
-                                    !or([q205 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q174]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q205]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q199]
-                                             | q205 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q38, q199]
-                                    <
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q38, q193];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q201 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q174]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q174, q201]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q199]
-                                             | q201 : int(1..2)]))
-                               =
-                               toInt(or([q203 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q38]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q203]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q38, q199]
-                                             | q203 : int(1..2)]))
-                                   | q199 : int(1..2)])))
-                            | q193 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q177 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q177] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q174]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q177, q178]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q174, q178]
-                                   | q178 : int(1..2)]))
-                             | q177 : int(1..2)]))
-               =
-               toInt(or([q182 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q182] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q174]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q182, q183]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q174, q183]
-                                   | q183 : int(1..2)]))
-                             | q182 : int(1..2)]))
-                   | q174 : int(1..2)])))
-            | q38 : int(1..2)])
-    \/
-    or([q40 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        !or([q158 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q158] =
-              b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40]
-              /\
-              and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q158, q159] =
-                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q40, q159]
-                       | q159 : int(1..2)]))
-                 | q158 : int(1..2)])
-        /\
-        (toInt(or([q43 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q43] =
-                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40]
-                    /\
-                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q43, q44]
-                         =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q40, q44]
-                             | q44 : int(1..2)]))
-                       | q43 : int(1..2)]))
-         <
-         toInt(or([q48 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q48] =
-                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40]
-                    /\
-                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q48, q49]
-                         =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q40, q49]
-                             | q49 : int(1..2)]))
-                       | q48 : int(1..2)]))
-         /\
-         (and([q52 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q120 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52] /\
-                    (toInt(or([q141 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q52, q141]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q52, q120]
-                                   | q141 : int(1..2)]))
-                     <
-                     toInt(or([q143 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q40, q143]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q52, q120]
-                                   | q143 : int(1..2)]))
-                     /\
-                     (and([q144 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q52, q144]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q52, q120]
-                           ->
-                           toInt(or([q153 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q52]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q153]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q144]
-                                         | q153 : int(1..2)]))
-                           =
-                           toInt(or([q155 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q40]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q155]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q144]
-                                         | q155 : int(1..2)]))
-                               | q144 : int(1..2)])
-                      /\
-                      and([and([q145 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q40],
-                                !or([q151 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q52]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q151]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q145]
-                                         | q151 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q40, q145]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q52, q120];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q147 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q52]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q147]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q145]
-                                         | q147 : int(1..2)]))
-                           =
-                           toInt(or([q149 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q40]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q149]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q145]
-                                         | q149 : int(1..2)]))
-                               | q145 : int(1..2)])))
-                        | q120 : int(1..2)])
-                \/
-                or([q121 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40] /\
-                    !or([q139 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q52, q139]
-                         =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q40, q121]
-                             | q139 : int(1..2)])
-                    /\
-                    (toInt(or([q123 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q52, q123]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q40, q121]
-                                   | q123 : int(1..2)]))
-                     <
-                     toInt(or([q125 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q40, q125]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q40, q121]
-                                   | q125 : int(1..2)]))
-                     /\
-                     (and([q126 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q52, q126]
-                           <
-                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q40, q121]
-                           ->
-                           toInt(or([q135 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q52]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q135]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q126]
-                                         | q135 : int(1..2)]))
-                           =
-                           toInt(or([q137 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q40]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q137]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q126]
-                                         | q137 : int(1..2)]))
-                               | q126 : int(1..2)])
-                      /\
-                      and([and([q127 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q40],
-                                !or([q133 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q52]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q133]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q127]
-                                         | q133 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q40, q127]
-                                <
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q40, q121];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q129 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q52]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q52, q129]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q127]
-                                         | q129 : int(1..2)]))
-                           =
-                           toInt(or([q131 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q40]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q131]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q40, q127]
-                                         | q131 : int(1..2)]))
-                               | q127 : int(1..2)])))
-                        | q121 : int(1..2)]))
-               ->
-               toInt(or([q110 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q110] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q110, q111]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q52, q111]
-                                   | q111 : int(1..2)]))
-                             | q110 : int(1..2)]))
-               =
-               toInt(or([q115 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q115] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q52]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q115, q116]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q52, q116]
-                                   | q116 : int(1..2)]))
-                             | q115 : int(1..2)]))
-                   | q52 : int(1..2)])
-          /\
-          and([and([q54 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q67 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q67] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q67, q68]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q68]
-                                   | q68 : int(1..2)]))
-                             | q67 : int(1..2)]),
-                    or([q72 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                        /\
-                        (toInt(or([q93 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q54]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q54, q93]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q54, q72]
-                                       | q93 : int(1..2)]))
-                         <
-                         toInt(or([q95 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q40]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q40, q95]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q54, q72]
-                                       | q95 : int(1..2)]))
-                         /\
-                         (and([q96 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q96]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q72]
-                               ->
-                               toInt(or([q105 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q54]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q105]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q96]
-                                             | q105 : int(1..2)]))
-                               =
-                               toInt(or([q107 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q40]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q107]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q96]
-                                             | q107 : int(1..2)]))
-                                   | q96 : int(1..2)])
-                          /\
-                          and([and([q97 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q40],
-                                    !or([q103 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q54]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q103]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q97]
-                                             | q103 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q40, q97]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q54, q72];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q99 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q54]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q99]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q97]
-                                             | q99 : int(1..2)]))
-                               =
-                               toInt(or([q101 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q40]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q101]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q97]
-                                             | q101 : int(1..2)]))
-                                   | q97 : int(1..2)])))
-                            | q72 : int(1..2)])
-                    \/
-                    or([q73 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q40]
-                        /\
-                        !or([q91 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q54, q91]
-                             =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q40, q73]
-                                 | q91 : int(1..2)])
-                        /\
-                        (toInt(or([q75 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q54]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q54, q75]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q40, q73]
-                                       | q75 : int(1..2)]))
-                         <
-                         toInt(or([q77 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q40]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q40, q77]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q40, q73]
-                                       | q77 : int(1..2)]))
-                         /\
-                         (and([q78 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q78]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q40, q73]
-                               ->
-                               toInt(or([q87 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q54]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q87]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q78]
-                                             | q87 : int(1..2)]))
-                               =
-                               toInt(or([q89 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q40]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q89]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q78]
-                                             | q89 : int(1..2)]))
-                                   | q78 : int(1..2)])
-                          /\
-                          and([and([q79 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q40],
-                                    !or([q85 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q54]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q85]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q79]
-                                             | q85 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q40, q79]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q40, q73];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q81 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q54]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q54, q81]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q79]
-                                             | q81 : int(1..2)]))
-                               =
-                               toInt(or([q83 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q40]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q83]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q40, q79]
-                                             | q83 : int(1..2)]))
-                                   | q79 : int(1..2)])))
-                            | q73 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q57 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q57] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q57, q58]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q58]
-                                   | q58 : int(1..2)]))
-                             | q57 : int(1..2)]))
-               =
-               toInt(or([q62 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q62] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q54]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q62, q63]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q54, q63]
-                                   | q63 : int(1..2)]))
-                             | q62 : int(1..2)]))
-                   | q54 : int(1..2)])))
-            | q40 : int(1..2)]),
-    alldifferent_except([toInt(q29 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q30 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q29])
-                         *
-                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q29, q30],
-                                    0)
-                             | q29 : int(1..2), q30 : int(1..2)],
-                        0),
-    and([q31 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31] >= 1
-             | q31 : int(1..2)]),
-    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q11]
-                  | q11 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q12]
-                  | q12 : int(1..2)];
-                 int(1..2)]),
-    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q27] = 1
-                  | q27 : int(1..2)])
-             | q5 : int(1..2)]),
-    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 1] <
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 2])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..2)])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= 2
-             | q6 : int(1..2)]),
-    2 =
-    sum([toInt(q13 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q13], 0)
-             | q13 : int(1..2)]),
-    alldifferent_except([toInt(q32 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q33 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q32])
-                         *
-                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q32, q33],
-                                    0)
-                             | q32 : int(1..2), q33 : int(1..2)],
-                        0),
-    and([q34 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q34] >= 1
-             | q34 : int(1..2)]),
-    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q24]
-                  | q24 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q25]
-                  | q25 : int(1..2)];
-                 int(1..2)]),
-    and([q18 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q18] = 0 /\
-         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q18, q28] = 1
-                  | q28 : int(1..2)])
-             | q18 : int(1..2)]),
-    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19] ->
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q19, 1] <
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q19, 2])
-             | q19 : int(1..2)]),
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q21 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19] ->
-              b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q19, q21] = 1
-                  | q21 : int(1..2)])
-             | q19 : int(1..2)]),
-    and([q19 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19] <= 2
-             | q19 : int(1..2)]),
-    2 =
-    sum([toInt(q26 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q26], 0)
-             | q26 : int(1..2)])
-
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4.eprime.orig b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4.eprime.orig
deleted file mode 100644
index 9842c459d7..0000000000
--- a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_3_4.eprime.orig
+++ /dev/null
@@ -1,906 +0,0 @@
-language ESSENCE' 1.0
-
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-find b_PartitionOccurrence_NumParts: int(1..2)
-find b_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
-find b_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
-find b_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
-branching on
-    [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values,
-     b_PartitionOccurrence_NumParts, b_PartitionOccurrence_WhichPart, b_PartitionOccurrence_PartSizes,
-     b_PartitionOccurrence_FirstIndex]
-such that
-    or([q31 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        (toInt(or([q178 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q178] =
-                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31]
-                    /\
-                    and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q178, q179]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q31, q179]
-                             | q179 : int(1..2)]))
-                       | q178 : int(1..2)]))
-         <
-         toInt(or([q182 <= b_PartitionOccurrence_NumParts /\
-                   (and([b_PartitionOccurrence_WhichPart[q185] = q182 ->
-                         or([q187 <=
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31]
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q31, q187]
-                             = q185
-                                 | q187 : int(1..2)])
-                             | q185 : int(1..2)])
-                    /\
-                    and([q189 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31]
-                         ->
-                         or([b_PartitionOccurrence_WhichPart[q191] = q182 /\
-                             q191 =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q31, q189]
-                                 | q191 : int(1..2)])
-                             | q189 : int(1..2)]))
-                       | q182 : int(1..2)]))
-         /\
-         (and([q193 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q285 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q193]
-                    /\
-                    (toInt(or([q306 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q193]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q193, q306]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q193, q285]
-                                   | q306 : int(1..2)]))
-                     <
-                     toInt(or([q308 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q31, q308]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q193, q285]
-                                   | q308 : int(1..2)]))
-                     /\
-                     (and([q309 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q193]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q193, q309]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q193, q285]
-                           ->
-                           toInt(or([q318 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q193]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q318]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q309]
-                                         | q318 : int(1..2)]))
-                           =
-                           toInt(or([q320 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q31]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q320]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q309]
-                                         | q320 : int(1..2)]))
-                               | q309 : int(1..2)])
-                      /\
-                      and([and([q310 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q31],
-                                !or([q316 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q193]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q316]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q310]
-                                         | q316 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q31, q310]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q193, q285];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q312 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q193]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q312]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q310]
-                                         | q312 : int(1..2)]))
-                           =
-                           toInt(or([q314 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q31]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q314]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q310]
-                                         | q314 : int(1..2)]))
-                               | q310 : int(1..2)])))
-                        | q285 : int(1..2)])
-                \/
-                or([q286 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31] /\
-                    !or([q304 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q193]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q193, q304]
-                         =
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q31, q286]
-                             | q304 : int(1..2)])
-                    /\
-                    (toInt(or([q288 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q193]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q193, q288]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q31, q286]
-                                   | q288 : int(1..2)]))
-                     <
-                     toInt(or([q290 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q31, q290]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q31, q286]
-                                   | q290 : int(1..2)]))
-                     /\
-                     (and([q291 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q193]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q193, q291]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q31, q286]
-                           ->
-                           toInt(or([q300 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q193]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q300]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q291]
-                                         | q300 : int(1..2)]))
-                           =
-                           toInt(or([q302 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q31]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q302]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q291]
-                                         | q302 : int(1..2)]))
-                               | q291 : int(1..2)])
-                      /\
-                      and([and([q292 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q31],
-                                !or([q298 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q193]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q298]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q292]
-                                         | q298 : int(1..2)]),
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q31, q292]
-                                <
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q31, q286];
-                                    int(1..3)])
-                           ->
-                           toInt(or([q294 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q193]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q193, q294]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q292]
-                                         | q294 : int(1..2)]))
-                           =
-                           toInt(or([q296 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q31]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q296]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q31, q292]
-                                         | q296 : int(1..2)]))
-                               | q292 : int(1..2)])))
-                        | q286 : int(1..2)]))
-               ->
-               toInt(or([q269 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q269] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q193]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q269, q270]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q193, q270]
-                                   | q270 : int(1..2)]))
-                             | q269 : int(1..2)]))
-               =
-               toInt(or([q273 <= b_PartitionOccurrence_NumParts /\
-                         (and([b_PartitionOccurrence_WhichPart[q276] = q273 ->
-                               or([q278 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q193]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q193, q278]
-                                   = q276
-                                       | q278 : int(1..2)])
-                                   | q276 : int(1..2)])
-                          /\
-                          and([q280 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q193]
-                               ->
-                               or([b_PartitionOccurrence_WhichPart[q282] = q273 /\
-                                   q282 =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q193, q280]
-                                       | q282 : int(1..2)])
-                                   | q280 : int(1..2)]))
-                             | q273 : int(1..2)]))
-                   | q193 : int(1..2)])
-          /\
-          and([and([q194 <= b_PartitionOccurrence_NumParts,
-                    !or([q209 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q211 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q209]
-                               ->
-                               or([b_PartitionOccurrence_WhichPart[q213] = q194 /\
-                                   q213 =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q209, q211]
-                                       | q213 : int(1..2)])
-                                   | q211 : int(1..2)])
-                          /\
-                          and([b_PartitionOccurrence_WhichPart[q215] = q194 ->
-                               or([q217 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q209]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q209, q217]
-                                   = q215
-                                       | q217 : int(1..2)])
-                                   | q215 : int(1..2)]))
-                             | q209 : int(1..2)]),
-                    or([b_PartitionOccurrence_WhichPart[q220] = q194 /\
-                        (sum([toInt(b_PartitionOccurrence_WhichPart[q241] = q194) * catchUndef(toInt(q241 = q220), 0)
-                                  | q241 : int(1..2)])
-                         <
-                         toInt(or([q243 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q31]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q31, q243]
-                                   = q220
-                                       | q243 : int(1..2)]))
-                         /\
-                         (and([b_PartitionOccurrence_WhichPart[q244] = q194 ->
-                               sum([toInt(b_PartitionOccurrence_WhichPart[q253] = q194) *
-                                    catchUndef(toInt(q253 = q244), 0)
-                                        | q253 : int(1..2)])
-                               =
-                               toInt(or([q255 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q31]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q255]
-                                         = q244
-                                             | q255 : int(1..2)]))
-                                   | q244 : int(1..2), q244 < q220])
-                          /\
-                          and([and([q245 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q31],
-                                    !or([b_PartitionOccurrence_WhichPart[q251] = q194 /\
-                                         q251 =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q245]
-                                             | q251 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q31, q245]
-                                    < q220;
-                                        int(1..3)])
-                               ->
-                               sum([toInt(b_PartitionOccurrence_WhichPart[q247] = q194) *
-                                    catchUndef(toInt(q247 =
-                                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                         [q31, q245]),
-                                               0)
-                                        | q247 : int(1..2)])
-                               =
-                               toInt(or([q249 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q31]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q249]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q245]
-                                             | q249 : int(1..2)]))
-                                   | q245 : int(1..2)])))
-                            | q220 : int(1..2)])
-                    \/
-                    or([q221 <=
-                        a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q31]
-                        /\
-                        !or([b_PartitionOccurrence_WhichPart[q239] = q194 /\
-                             q239 =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q31, q221]
-                                 | q239 : int(1..2)])
-                        /\
-                        (sum([toInt(b_PartitionOccurrence_WhichPart[q223] = q194) *
-                              catchUndef(toInt(q223 =
-                                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                   [q31, q221]),
-                                         0)
-                                  | q223 : int(1..2)])
-                         <
-                         toInt(or([q225 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q31]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q31, q225]
-                                   =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q31, q221]
-                                       | q225 : int(1..2)]))
-                         /\
-                         (and([b_PartitionOccurrence_WhichPart[q226] = q194 /\
-                               q226 <
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q31, q221]
-                               ->
-                               sum([toInt(b_PartitionOccurrence_WhichPart[q235] = q194) *
-                                    catchUndef(toInt(q235 = q226), 0)
-                                        | q235 : int(1..2)])
-                               =
-                               toInt(or([q237 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q31]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q237]
-                                         = q226
-                                             | q237 : int(1..2)]))
-                                   | q226 : int(1..2)])
-                          /\
-                          and([and([q227 <=
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q31],
-                                    !or([b_PartitionOccurrence_WhichPart[q233] = q194 /\
-                                         q233 =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q227]
-                                             | q233 : int(1..2)]),
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q31, q227]
-                                    <
-                                    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q31, q221];
-                                        int(1..3)])
-                               ->
-                               sum([toInt(b_PartitionOccurrence_WhichPart[q229] = q194) *
-                                    catchUndef(toInt(q229 =
-                                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                         [q31, q227]),
-                                               0)
-                                        | q229 : int(1..2)])
-                               =
-                               toInt(or([q231 <=
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q31]
-                                         /\
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q231]
-                                         =
-                                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q31, q227]
-                                             | q231 : int(1..2)]))
-                                   | q227 : int(1..2)])))
-                            | q221 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q258 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q260 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q258]
-                               ->
-                               or([b_PartitionOccurrence_WhichPart[q262] = q194 /\
-                                   q262 =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q258, q260]
-                                       | q262 : int(1..2)])
-                                   | q260 : int(1..2)])
-                          /\
-                          and([b_PartitionOccurrence_WhichPart[q264] = q194 ->
-                               or([q266 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q258]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q258, q266]
-                                   = q264
-                                       | q266 : int(1..2)])
-                                   | q264 : int(1..2)]))
-                             | q258 : int(1..2)]))
-               =
-               toInt(or([q197 <= b_PartitionOccurrence_NumParts /\
-                         (and([b_PartitionOccurrence_WhichPart[q200] = q197 ->
-                               or([b_PartitionOccurrence_WhichPart[q202] = q194 /\ q202 = q200 | q202 : int(1..2)])
-                                   | q200 : int(1..2)])
-                          /\
-                          and([b_PartitionOccurrence_WhichPart[q204] = q194 ->
-                               or([b_PartitionOccurrence_WhichPart[q206] = q197 /\ q206 = q204 | q206 : int(1..2)])
-                                   | q204 : int(1..2)]))
-                             | q197 : int(1..2)]))
-                   | q194 : int(1..2)])))
-            | q31 : int(1..2)])
-    \/
-    or([q32 <= b_PartitionOccurrence_NumParts /\
-        !or([q167 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-             (and([q169 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q167] ->
-                   or([b_PartitionOccurrence_WhichPart[q171] = q32 /\
-                       q171 =
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q167, q169]
-                           | q171 : int(1..2)])
-                       | q169 : int(1..2)])
-              /\
-              and([b_PartitionOccurrence_WhichPart[q173] = q32 ->
-                   or([q175 <=
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q167]
-                       /\
-                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q167, q175]
-                       = q173
-                           | q175 : int(1..2)])
-                       | q173 : int(1..2)]))
-                 | q167 : int(1..2)])
-        /\
-        (toInt(or([q156 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (and([q158 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q156]
-                         ->
-                         or([b_PartitionOccurrence_WhichPart[q160] = q32 /\
-                             q160 =
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q156, q158]
-                                 | q160 : int(1..2)])
-                             | q158 : int(1..2)])
-                    /\
-                    and([b_PartitionOccurrence_WhichPart[q162] = q32 ->
-                         or([q164 <=
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q156]
-                             /\
-                             a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q156, q164]
-                             = q162
-                                 | q164 : int(1..2)])
-                             | q162 : int(1..2)]))
-                       | q156 : int(1..2)]))
-         <
-         toInt(or([q35 <= b_PartitionOccurrence_NumParts /\
-                   (and([b_PartitionOccurrence_WhichPart[q38] = q35 ->
-                         or([b_PartitionOccurrence_WhichPart[q40] = q32 /\ q40 = q38 | q40 : int(1..2)])
-                             | q38 : int(1..2)])
-                    /\
-                    and([b_PartitionOccurrence_WhichPart[q42] = q32 ->
-                         or([b_PartitionOccurrence_WhichPart[q44] = q35 /\ q44 = q42 | q44 : int(1..2)])
-                             | q42 : int(1..2)]))
-                       | q35 : int(1..2)]))
-         /\
-         (and([q66 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-               (or([q67 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q66] /\
-                    (toInt(or([q75 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q66]
-                               /\
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q66, q75]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q66, q67]
-                                   | q75 : int(1..2)]))
-                     <
-                     sum([toInt(b_PartitionOccurrence_WhichPart[q58] = q32) *
-                          catchUndef(toInt(q58 =
-                                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                               [q66, q67]),
-                                     0)
-                              | q58 : int(1..2)])
-                     /\
-                     (and([q68 <=
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q66]
-                           /\
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q66, q68]
-                           <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q66, q67]
-                           ->
-                           toInt(or([q70 <=
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q66]
-                                     /\
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q66, q70]
-                                     =
-                                     a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q66, q68]
-                                         | q70 : int(1..2)]))
-                           =
-                           sum([toInt(b_PartitionOccurrence_WhichPart[q64] = q32) *
-                                catchUndef(toInt(q64 =
-                                                 a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                     [q66, q68]),
-                                           0)
-                                    | q64 : int(1..2)])
-                               | q68 : int(1..2)])
-                      /\
-                      and([!or([q71 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q66]
-                                /\
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q66, q71]
-                                = q59
-                                    | q71 : int(1..2)])
-                           /\
-                           q59 <
-                           a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q66, q67]
-                           ->
-                           (b_PartitionOccurrence_WhichPart[q59] = q32 ->
-                            toInt(or([q73 <=
-                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                          [q66]
-                                      /\
-                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                          [q66, q73]
-                                      = q59
-                                          | q73 : int(1..2)]))
-                            =
-                            sum([toInt(b_PartitionOccurrence_WhichPart[q61] = q32) * catchUndef(toInt(q61 = q59), 0)
-                                     | q61 : int(1..2)]))
-                               | q59 : int(1..2)])))
-                        | q67 : int(1..2)])
-                \/
-                or([!or([q84 <=
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q66]
-                         /\
-                         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q66, q84]
-                         = q47
-                             | q84 : int(1..2)])
-                    /\
-                    (b_PartitionOccurrence_WhichPart[q47] = q32 /\
-                     (toInt(or([q83 <=
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q66]
-                                /\
-                                a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q66, q83]
-                                = q47
-                                    | q83 : int(1..2)]))
-                      <
-                      sum([toInt(b_PartitionOccurrence_WhichPart[q49] = q32) * catchUndef(toInt(q49 = q47), 0)
-                               | q49 : int(1..2)])
-                      /\
-                      (and([q76 <=
-                            a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q66]
-                            /\
-                            a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                [q66, q76]
-                            < q47
-                            ->
-                            toInt(or([q78 <=
-                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                          [q66]
-                                      /\
-                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                          [q66, q78]
-                                      =
-                                      a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                          [q66, q76]
-                                          | q78 : int(1..2)]))
-                            =
-                            sum([toInt(b_PartitionOccurrence_WhichPart[q55] = q32) *
-                                 catchUndef(toInt(q55 =
-                                                  a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                      [q66, q76]),
-                                            0)
-                                     | q55 : int(1..2)])
-                                | q76 : int(1..2)])
-                       /\
-                       and([!or([q79 <=
-                                 a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                     [q66]
-                                 /\
-                                 a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                     [q66, q79]
-                                 = q50
-                                     | q79 : int(1..2)])
-                            ->
-                            (b_PartitionOccurrence_WhichPart[q50] = q32 ->
-                             toInt(or([q81 <=
-                                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                           [q66]
-                                       /\
-                                       a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                           [q66, q81]
-                                       = q50
-                                           | q81 : int(1..2)]))
-                             =
-                             sum([toInt(b_PartitionOccurrence_WhichPart[q52] = q32) * catchUndef(toInt(q52 = q50), 0)
-                                      | q52 : int(1..2)]))
-                                | q50 : int(1..2), q50 < q47]))))
-                        | q47 : int(1..2)]))
-               ->
-               toInt(or([q140 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q140] =
-                          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q66]
-                          /\
-                          and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q140, q141]
-                               =
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q66, q141]
-                                   | q141 : int(1..2)]))
-                             | q140 : int(1..2)]))
-               =
-               toInt(or([q144 <= b_PartitionOccurrence_NumParts /\
-                         (and([b_PartitionOccurrence_WhichPart[q147] = q144 ->
-                               or([q149 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q66]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q66, q149]
-                                   = q147
-                                       | q149 : int(1..2)])
-                                   | q147 : int(1..2)])
-                          /\
-                          and([q151 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q66]
-                               ->
-                               or([b_PartitionOccurrence_WhichPart[q153] = q144 /\
-                                   q153 =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q66, q151]
-                                       | q153 : int(1..2)])
-                                   | q151 : int(1..2)]))
-                             | q144 : int(1..2)]))
-                   | q66 : int(1..2)])
-          /\
-          and([and([q85 <= b_PartitionOccurrence_NumParts,
-                    !or([q100 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q102 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q100]
-                               ->
-                               or([b_PartitionOccurrence_WhichPart[q104] = q85 /\
-                                   q104 =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q100, q102]
-                                       | q104 : int(1..2)])
-                                   | q102 : int(1..2)])
-                          /\
-                          and([b_PartitionOccurrence_WhichPart[q106] = q85 ->
-                               or([q108 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q100]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q100, q108]
-                                   = q106
-                                       | q108 : int(1..2)])
-                                   | q106 : int(1..2)]))
-                             | q100 : int(1..2)]),
-                    or([b_PartitionOccurrence_WhichPart[q117] = q85 /\
-                        (toInt(or([b_PartitionOccurrence_WhichPart[q110] = q85 /\ q110 = q117 | q110 : int(1..2)])) <
-                         sum([toInt(b_PartitionOccurrence_WhichPart[q58] = q32) * catchUndef(toInt(q58 = q117), 0)
-                                  | q58 : int(1..2)])
-                         /\
-                         (and([b_PartitionOccurrence_WhichPart[q113] = q85 ->
-                               toInt(or([b_PartitionOccurrence_WhichPart[q112] = q85 /\ q112 = q113
-                                             | q112 : int(1..2)]))
-                               =
-                               sum([toInt(b_PartitionOccurrence_WhichPart[q64] = q32) * catchUndef(toInt(q64 = q113), 0)
-                                        | q64 : int(1..2)])
-                                   | q113 : int(1..2), q113 < q117])
-                          /\
-                          and([!or([b_PartitionOccurrence_WhichPart[q116] = q85 /\ q116 = q59 | q116 : int(1..2)]) ->
-                               (b_PartitionOccurrence_WhichPart[q59] = q32 ->
-                                toInt(or([b_PartitionOccurrence_WhichPart[q115] = q85 /\ q115 = q59
-                                              | q115 : int(1..2)]))
-                                =
-                                sum([toInt(b_PartitionOccurrence_WhichPart[q61] = q32) * catchUndef(toInt(q61 = q59), 0)
-                                         | q61 : int(1..2)]))
-                                   | q59 : int(1..2), q59 < q117])))
-                            | q117 : int(1..2)])
-                    \/
-                    or([!or([b_PartitionOccurrence_WhichPart[q126] = q85 /\ q126 = q47 | q126 : int(1..2)]) /\
-                        (b_PartitionOccurrence_WhichPart[q47] = q32 /\
-                         (toInt(or([b_PartitionOccurrence_WhichPart[q119] = q85 /\ q119 = q47 | q119 : int(1..2)])) <
-                          sum([toInt(b_PartitionOccurrence_WhichPart[q49] = q32) * catchUndef(toInt(q49 = q47), 0)
-                                   | q49 : int(1..2)])
-                          /\
-                          (and([b_PartitionOccurrence_WhichPart[q122] = q85 ->
-                                toInt(or([b_PartitionOccurrence_WhichPart[q121] = q85 /\ q121 = q122
-                                              | q121 : int(1..2)]))
-                                =
-                                sum([toInt(b_PartitionOccurrence_WhichPart[q55] = q32) *
-                                     catchUndef(toInt(q55 = q122), 0)
-                                         | q55 : int(1..2)])
-                                    | q122 : int(1..2), q122 < q47])
-                           /\
-                           and([!or([b_PartitionOccurrence_WhichPart[q125] = q85 /\ q125 = q50 | q125 : int(1..2)]) ->
-                                (b_PartitionOccurrence_WhichPart[q50] = q32 ->
-                                 toInt(or([b_PartitionOccurrence_WhichPart[q124] = q85 /\ q124 = q50
-                                               | q124 : int(1..2)]))
-                                 =
-                                 sum([toInt(b_PartitionOccurrence_WhichPart[q52] = q32) *
-                                      catchUndef(toInt(q52 = q50), 0)
-                                          | q52 : int(1..2)]))
-                                    | q50 : int(1..2), q50 < q47]))))
-                            | q47 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q129 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q131 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q129]
-                               ->
-                               or([b_PartitionOccurrence_WhichPart[q133] = q85 /\
-                                   q133 =
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q129, q131]
-                                       | q133 : int(1..2)])
-                                   | q131 : int(1..2)])
-                          /\
-                          and([b_PartitionOccurrence_WhichPart[q135] = q85 ->
-                               or([q137 <=
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q129]
-                                   /\
-                                   a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q129, q137]
-                                   = q135
-                                       | q137 : int(1..2)])
-                                   | q135 : int(1..2)]))
-                             | q129 : int(1..2)]))
-               =
-               toInt(or([q88 <= b_PartitionOccurrence_NumParts /\
-                         (and([b_PartitionOccurrence_WhichPart[q91] = q88 ->
-                               or([b_PartitionOccurrence_WhichPart[q93] = q85 /\ q93 = q91 | q93 : int(1..2)])
-                                   | q91 : int(1..2)])
-                          /\
-                          and([b_PartitionOccurrence_WhichPart[q95] = q85 ->
-                               or([b_PartitionOccurrence_WhichPart[q97] = q88 /\ q97 = q95 | q97 : int(1..2)])
-                                   | q95 : int(1..2)]))
-                             | q88 : int(1..2)]))
-                   | q85 : int(1..2)])))
-            | q32 : int(1..2)]),
-    alldifferent_except([toInt(q25 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q26 <=
-                               a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q25])
-                         *
-                         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q25, q26],
-                                    0)
-                             | q25 : int(1..2), q26 : int(1..2)],
-                        0),
-    and([q27 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q27] >= 1
-             | q27 : int(1..2)]),
-    2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q11]
-                  | q11 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q12]
-                  | q12 : int(1..2)];
-                 int(1..2)]),
-    and([q5 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] = 0 /\
-         and([a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, q24] = 1
-                  | q24 : int(1..2)])
-             | q5 : int(1..2)]),
-    a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 1] <
-          a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, 2])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q8 > a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8] = 1
-                  | q8 : int(1..2)])
-             | q6 : int(1..2)]),
-    and([q6 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= 2
-             | q6 : int(1..2)]),
-    2 =
-    sum([toInt(q13 <= a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(a_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q13], 0)
-             | q13 : int(1..2)]),
-    and([q14 <= b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q14] <= 2 | q14 : int(1..2)]),
-    and([q14 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q14] = 0 | q14 : int(1..2)]),
-    b_PartitionOccurrence_NumParts <= 2,
-    b_PartitionOccurrence_NumParts = max([b_PartitionOccurrence_WhichPart[q17] | q17 : int(1..2)]),
-    and([b_PartitionOccurrence_PartSizes[q18] =
-         sum([toInt(b_PartitionOccurrence_WhichPart[q19] = q18) | q19 : int(1..2)])
-             | q18 : int(1..2)]),
-    and([q20 <= b_PartitionOccurrence_NumParts ->
-         and([b_PartitionOccurrence_WhichPart[q21] = q20 -> b_PartitionOccurrence_FirstIndex[q20] <= q21
-                  | q21 : int(1..2)])
-             | q20 : int(1..2)]),
-    and([q20 <= b_PartitionOccurrence_NumParts ->
-         or([b_PartitionOccurrence_WhichPart[q21] = q20 /\ b_PartitionOccurrence_FirstIndex[q20] = q21
-                 | q21 : int(1..2)])
-             | q20 : int(1..2)]),
-    and([q20 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_FirstIndex[q20] = 1 | q20 : int(1..2)]),
-    and([q22 <= b_PartitionOccurrence_NumParts /\ q23 <= b_PartitionOccurrence_NumParts ->
-         (q22 < q23 <-> b_PartitionOccurrence_FirstIndex[q22] < b_PartitionOccurrence_FirstIndex[q23])
-             | q22 : int(1..2), q23 : int(1..2)])
-
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1.eprime
new file mode 100644
index 0000000000..5216e84b83
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_1.eprime
@@ -0,0 +1,373 @@
+language ESSENCE' 1.0
+
+find a_PartitionOccurrence_NumParts: int(1..2)
+find a_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
+find a_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
+find a_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker: int(0..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence: matrix indexed by [int(1..2), int(1..2)] of bool
+branching on
+    [a_PartitionOccurrence_NumParts, a_PartitionOccurrence_WhichPart, a_PartitionOccurrence_PartSizes,
+     a_PartitionOccurrence_FirstIndex, b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence]
+such that
+    or([q29 <= a_PartitionOccurrence_NumParts /\
+        (toInt(or([q122 <= a_PartitionOccurrence_NumParts /\
+                   (and([a_PartitionOccurrence_WhichPart[q125] = q122 ->
+                         or([a_PartitionOccurrence_WhichPart[q127] = q29 /\ q127 = q125 | q127 : int(1..2)])
+                             | q125 : int(1..2)])
+                    /\
+                    and([a_PartitionOccurrence_WhichPart[q129] = q29 ->
+                         or([a_PartitionOccurrence_WhichPart[q131] = q122 /\ q131 = q129 | q131 : int(1..2)])
+                             | q129 : int(1..2)]))
+                       | q122 : int(1..2)]))
+         <
+         toInt(or([q33 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q33, q34] ->
+                         or([a_PartitionOccurrence_WhichPart[q36] = q29 /\ q36 = q34 | q36 : int(1..2)])
+                             | q34 : int(1..2)])
+                    /\
+                    and([a_PartitionOccurrence_WhichPart[q38] = q29 ->
+                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q33, q38]
+                             | q38 : int(1..2)]))
+                       | q33 : int(1..2)]))
+         /\
+         (and([q59 <= a_PartitionOccurrence_NumParts /\
+               (or([a_PartitionOccurrence_WhichPart[q77] = q59 /\
+                    (toInt(or([a_PartitionOccurrence_WhichPart[q70] = q59 /\ q70 = q77 | q70 : int(1..2)])) <
+                     sum([toInt(a_PartitionOccurrence_WhichPart[q52] = q29) * catchUndef(toInt(q52 = q77), 0)
+                              | q52 : int(1..2)])
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q73] = q59 ->
+                           toInt(or([a_PartitionOccurrence_WhichPart[q72] = q59 /\ q72 = q73 | q72 : int(1..2)])) =
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q58] = q29) * catchUndef(toInt(q58 = q73), 0)
+                                    | q58 : int(1..2)])
+                               | q73 : int(1..2), q73 < q77])
+                      /\
+                      and([!or([a_PartitionOccurrence_WhichPart[q76] = q59 /\ q76 = q53 | q76 : int(1..2)]) ->
+                           (a_PartitionOccurrence_WhichPart[q53] = q29 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q75] = q59 /\ q75 = q53 | q75 : int(1..2)])) =
+                            sum([toInt(a_PartitionOccurrence_WhichPart[q55] = q29) * catchUndef(toInt(q55 = q53), 0)
+                                     | q55 : int(1..2)]))
+                               | q53 : int(1..2), q53 < q77])))
+                        | q77 : int(1..2)])
+                \/
+                or([!or([a_PartitionOccurrence_WhichPart[q86] = q59 /\ q86 = q41 | q86 : int(1..2)]) /\
+                    (a_PartitionOccurrence_WhichPart[q41] = q29 /\
+                     (toInt(or([a_PartitionOccurrence_WhichPart[q79] = q59 /\ q79 = q41 | q79 : int(1..2)])) <
+                      sum([toInt(a_PartitionOccurrence_WhichPart[q43] = q29) * catchUndef(toInt(q43 = q41), 0)
+                               | q43 : int(1..2)])
+                      /\
+                      (and([a_PartitionOccurrence_WhichPart[q82] = q59 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q81] = q59 /\ q81 = q82 | q81 : int(1..2)])) =
+                            sum([toInt(a_PartitionOccurrence_WhichPart[q49] = q29) * catchUndef(toInt(q49 = q82), 0)
+                                     | q49 : int(1..2)])
+                                | q82 : int(1..2), q82 < q41])
+                       /\
+                       and([!or([a_PartitionOccurrence_WhichPart[q85] = q59 /\ q85 = q44 | q85 : int(1..2)]) ->
+                            (a_PartitionOccurrence_WhichPart[q44] = q29 ->
+                             toInt(or([a_PartitionOccurrence_WhichPart[q84] = q59 /\ q84 = q44 | q84 : int(1..2)])) =
+                             sum([toInt(a_PartitionOccurrence_WhichPart[q46] = q29) * catchUndef(toInt(q46 = q44), 0)
+                                      | q46 : int(1..2)]))
+                                | q44 : int(1..2), q44 < q41]))))
+                        | q41 : int(1..2)]))
+               ->
+               toInt(or([q111 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q114] = q111 ->
+                               or([a_PartitionOccurrence_WhichPart[q116] = q59 /\ q116 = q114 | q116 : int(1..2)])
+                                   | q114 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q118] = q59 ->
+                               or([a_PartitionOccurrence_WhichPart[q120] = q111 /\ q120 = q118 | q120 : int(1..2)])
+                                   | q118 : int(1..2)]))
+                             | q111 : int(1..2)]))
+               =
+               toInt(or([q63 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q63, q64] ->
+                               or([a_PartitionOccurrence_WhichPart[q66] = q59 /\ q66 = q64 | q66 : int(1..2)])
+                                   | q64 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q68] = q59 ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q63, q68]
+                                   | q68 : int(1..2)]))
+                             | q63 : int(1..2)]))
+                   | q59 : int(1..2)])
+          /\
+          and([and([q88 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+                    !or([q103 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q106] = q103 ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q106]
+                                   | q106 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q107] ->
+                               or([a_PartitionOccurrence_WhichPart[q109] = q103 /\ q109 = q107 | q109 : int(1..2)])
+                                   | q107 : int(1..2)]))
+                             | q103 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q39] /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q39]) <
+                         sum([toInt(a_PartitionOccurrence_WhichPart[q52] = q29) * catchUndef(toInt(q52 = q39), 0)
+                                  | q52 : int(1..2)])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q40] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q40]) =
+                               sum([toInt(a_PartitionOccurrence_WhichPart[q58] = q29) * catchUndef(toInt(q58 = q40), 0)
+                                        | q58 : int(1..2)])
+                                   | q40 : int(1..2), q40 < q39])
+                          /\
+                          and([!or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q56] /\
+                                    q56 = q53
+                                        | q56 : int(1..2)])
+                               ->
+                               (a_PartitionOccurrence_WhichPart[q53] = q29 ->
+                                toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q53]) =
+                                sum([toInt(a_PartitionOccurrence_WhichPart[q55] = q29) * catchUndef(toInt(q55 = q53), 0)
+                                         | q55 : int(1..2)]))
+                                   | q53 : int(1..2), q53 < q39])))
+                            | q39 : int(1..2)])
+                    \/
+                    or([!or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q50] /\ q50 = q41
+                                 | q50 : int(1..2)])
+                        /\
+                        (a_PartitionOccurrence_WhichPart[q41] = q29 /\
+                         (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q41]) <
+                          sum([toInt(a_PartitionOccurrence_WhichPart[q43] = q29) * catchUndef(toInt(q43 = q41), 0)
+                                   | q43 : int(1..2)])
+                          /\
+                          (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q40] ->
+                                toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q40]) =
+                                sum([toInt(a_PartitionOccurrence_WhichPart[q49] = q29) * catchUndef(toInt(q49 = q40), 0)
+                                         | q49 : int(1..2)])
+                                    | q40 : int(1..2), q40 < q41])
+                           /\
+                           and([!or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q47] /\
+                                     q47 = q44
+                                         | q47 : int(1..2)])
+                                ->
+                                (a_PartitionOccurrence_WhichPart[q44] = q29 ->
+                                 toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q44]) =
+                                 sum([toInt(a_PartitionOccurrence_WhichPart[q46] = q29) *
+                                      catchUndef(toInt(q46 = q44), 0)
+                                          | q46 : int(1..2)]))
+                                    | q44 : int(1..2), q44 < q41]))))
+                            | q41 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q90 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q93] = q90 ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q93]
+                                   | q93 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q94] ->
+                               or([a_PartitionOccurrence_WhichPart[q96] = q90 /\ q96 = q94 | q96 : int(1..2)])
+                                   | q94 : int(1..2)]))
+                             | q90 : int(1..2)]))
+               =
+               toInt(or([q99 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q99, q100] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q88, q100]
+                                  | q100 : int(1..2)])
+                             | q99 : int(1..2)]))
+                   | q88 : int(1..2)])))
+            | q29 : int(1..2)])
+    \/
+    or([q133 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+        !or([q220 <= a_PartitionOccurrence_NumParts /\
+             (and([a_PartitionOccurrence_WhichPart[q223] = q220 ->
+                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q223]
+                       | q223 : int(1..2)])
+              /\
+              and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q224] ->
+                   or([a_PartitionOccurrence_WhichPart[q226] = q220 /\ q226 = q224 | q226 : int(1..2)])
+                       | q224 : int(1..2)]))
+                 | q220 : int(1..2)])
+        /\
+        (toInt(or([q135 <= a_PartitionOccurrence_NumParts /\
+                   (and([a_PartitionOccurrence_WhichPart[q138] = q135 ->
+                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q138]
+                             | q138 : int(1..2)])
+                    /\
+                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q139] ->
+                         or([a_PartitionOccurrence_WhichPart[q141] = q135 /\ q141 = q139 | q141 : int(1..2)])
+                             | q139 : int(1..2)]))
+                       | q135 : int(1..2)]))
+         <
+         toInt(or([q144 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q144, q145] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q145]
+                            | q145 : int(1..2)])
+                       | q144 : int(1..2)]))
+         /\
+         (and([q147 <= a_PartitionOccurrence_NumParts /\
+               (or([a_PartitionOccurrence_WhichPart[q159] = q147 /\
+                    (sum([toInt(a_PartitionOccurrence_WhichPart[q172] = q147) * catchUndef(toInt(q172 = q159), 0)
+                              | q172 : int(1..2)])
+                     < toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q159])
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q173] = q147 ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q179] = q147) * catchUndef(toInt(q179 = q173), 0)
+                                    | q179 : int(1..2)])
+                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q173])
+                               | q173 : int(1..2), q173 < q159])
+                      /\
+                      and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q158] /\
+                           !or([a_PartitionOccurrence_WhichPart[q177] = q147 /\ q177 = q158 | q177 : int(1..2)])
+                           ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q175] = q147) * catchUndef(toInt(q175 = q158), 0)
+                                    | q175 : int(1..2)])
+                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q158])
+                               | q158 : int(1..2), q158 < q159])))
+                        | q159 : int(1..2)])
+                \/
+                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q157] /\
+                    !or([a_PartitionOccurrence_WhichPart[q170] = q147 /\ q170 = q157 | q170 : int(1..2)])
+                    /\
+                    (sum([toInt(a_PartitionOccurrence_WhichPart[q161] = q147) * catchUndef(toInt(q161 = q157), 0)
+                              | q161 : int(1..2)])
+                     < toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q157])
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q162] = q147 ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q168] = q147) * catchUndef(toInt(q168 = q162), 0)
+                                    | q168 : int(1..2)])
+                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q162])
+                               | q162 : int(1..2), q162 < q157])
+                      /\
+                      and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q158] /\
+                           !or([a_PartitionOccurrence_WhichPart[q166] = q147 /\ q166 = q158 | q166 : int(1..2)])
+                           ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q164] = q147) * catchUndef(toInt(q164 = q158), 0)
+                                    | q164 : int(1..2)])
+                           = toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q158])
+                               | q158 : int(1..2), q158 < q157])))
+                        | q157 : int(1..2)]))
+               ->
+               toInt(or([q209 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q212] = q209 ->
+                               or([a_PartitionOccurrence_WhichPart[q214] = q147 /\ q214 = q212 | q214 : int(1..2)])
+                                   | q212 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q216] = q147 ->
+                               or([a_PartitionOccurrence_WhichPart[q218] = q209 /\ q218 = q216 | q218 : int(1..2)])
+                                   | q216 : int(1..2)]))
+                             | q209 : int(1..2)]))
+               =
+               toInt(or([q151 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q151, q152] ->
+                               or([a_PartitionOccurrence_WhichPart[q154] = q147 /\ q154 = q152 | q154 : int(1..2)])
+                                   | q152 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q156] = q147 ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q151, q156]
+                                   | q156 : int(1..2)]))
+                             | q151 : int(1..2)]))
+                   | q147 : int(1..2)])
+          /\
+          and([and([q181 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker,
+                    !or([q196 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q199] = q196 ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q199]
+                                   | q199 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q200] ->
+                               or([a_PartitionOccurrence_WhichPart[q202] = q196 /\ q202 = q200 | q202 : int(1..2)])
+                                   | q200 : int(1..2)]))
+                             | q196 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q203] /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q203]) <
+                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q203])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q204] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q204]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q204])
+                                   | q204 : int(1..2), q204 < q203])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q204] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q207] /\
+                                    q207 = q204
+                                        | q207 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q204]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q204])
+                                   | q204 : int(1..2), q204 < q203])))
+                            | q203 : int(1..2)])
+                    \/
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q203] /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q206] /\ q206 = q203
+                                 | q206 : int(1..2)])
+                        /\
+                        (toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q203]) <
+                         toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q203])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q204] ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q204]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q204])
+                                   | q204 : int(1..2), q204 < q203])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q204] /\
+                               !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q205] /\
+                                    q205 = q204
+                                        | q205 : int(1..2)])
+                               ->
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q204]) =
+                               toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q133, q204])
+                                   | q204 : int(1..2), q204 < q203])))
+                            | q203 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q183 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q186] = q183 ->
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q186]
+                                   | q186 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q187] ->
+                               or([a_PartitionOccurrence_WhichPart[q189] = q183 /\ q189 = q187 | q189 : int(1..2)])
+                                   | q187 : int(1..2)]))
+                             | q183 : int(1..2)]))
+               =
+               toInt(or([q192 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q192, q193] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q181, q193]
+                                  | q193 : int(1..2)])
+                             | q192 : int(1..2)]))
+                   | q181 : int(1..2)])))
+            | q133 : int(1..2)]),
+    and([q1 <= a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] <= 2 | q1 : int(1..2)]),
+    and([q1 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..2)]),
+    a_PartitionOccurrence_NumParts <= 2,
+    a_PartitionOccurrence_NumParts = max([a_PartitionOccurrence_WhichPart[q4] | q4 : int(1..2)]),
+    and([a_PartitionOccurrence_PartSizes[q5] = sum([toInt(a_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..2)])
+             | q5 : int(1..2)]),
+    and([q7 <= a_PartitionOccurrence_NumParts ->
+         and([a_PartitionOccurrence_WhichPart[q8] = q7 -> a_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..2)])
+             | q7 : int(1..2)]),
+    and([q7 <= a_PartitionOccurrence_NumParts ->
+         or([a_PartitionOccurrence_WhichPart[q8] = q7 /\ a_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..2)])
+             | q7 : int(1..2)]),
+    and([q7 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..2)]),
+    and([q9 <= a_PartitionOccurrence_NumParts /\ q10 <= a_PartitionOccurrence_NumParts ->
+         (q9 < q10 <-> a_PartitionOccurrence_FirstIndex[q9] < a_PartitionOccurrence_FirstIndex[q10])
+             | q9 : int(1..2), q10 : int(1..2)]),
+    and([1 =
+         sum([toInt(q24 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker /\
+                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q24, q11])
+                  | q24 : int(1..2)])
+             | q11 : int(1..2)]),
+    and([q25 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q25, q26]) | q26 : int(1..2)]) >= 1
+             | q25 : int(1..2)]),
+    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[1, q19]) | q19 : int(1..2)] <lex
+    [-toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[2, q20]) | q20 : int(1..2)],
+    and([q15 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q15, q21] = false | q21 : int(1..2)])
+             | q15 : int(1..2)]),
+    b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker <= 2,
+    and([q16 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q16, q17]) | q17 : int(1..2)]) <= 2
+             | q16 : int(1..2)]),
+    2 =
+    sum([toInt(q22 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker) *
+         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q22, q23])
+                             | q23 : int(1..2)]),
+                    0)
+             | q22 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2.eprime
new file mode 100644
index 0000000000..4fdad05487
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_2.eprime
@@ -0,0 +1,827 @@
+language ESSENCE' 1.0
+
+find a_PartitionOccurrence_NumParts: int(1..2)
+find a_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
+find a_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
+find a_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker: int(0..2)
+find b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy:
+        matrix indexed by [int(1..2), int(1..2)] of int(1..3)
+branching on
+    [a_PartitionOccurrence_NumParts, a_PartitionOccurrence_WhichPart, a_PartitionOccurrence_PartSizes,
+     a_PartitionOccurrence_FirstIndex, b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy]
+such that
+    or([q35 <= a_PartitionOccurrence_NumParts /\
+        (toInt(or([q158 <= a_PartitionOccurrence_NumParts /\
+                   (and([a_PartitionOccurrence_WhichPart[q161] = q158 ->
+                         or([a_PartitionOccurrence_WhichPart[q163] = q35 /\ q163 = q161 | q163 : int(1..2)])
+                             | q161 : int(1..2)])
+                    /\
+                    and([a_PartitionOccurrence_WhichPart[q165] = q35 ->
+                         or([a_PartitionOccurrence_WhichPart[q167] = q158 /\ q167 = q165 | q167 : int(1..2)])
+                             | q165 : int(1..2)]))
+                       | q158 : int(1..2)]))
+         <
+         toInt(or([q39 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q39, q41] != 3 ->
+                         or([a_PartitionOccurrence_WhichPart[q43] = q35 /\
+                             q43 =
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q39, q41]
+                                 | q43 : int(1..2)])
+                             | q41 : int(1..2)])
+                    /\
+                    and([a_PartitionOccurrence_WhichPart[q45] = q35 ->
+                         or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q39, q47] != 3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q39, q47] =
+                             q45 | q47 : int(1..2)])
+                             | q45 : int(1..2)]))
+                       | q39 : int(1..2)]))
+         /\
+         (and([q68 <= a_PartitionOccurrence_NumParts /\
+               (or([a_PartitionOccurrence_WhichPart[q89] = q68 /\
+                    (toInt(or([a_PartitionOccurrence_WhichPart[q82] = q68 /\ q82 = q89 | q82 : int(1..2)])) <
+                     sum([toInt(a_PartitionOccurrence_WhichPart[q61] = q35) * catchUndef(toInt(q61 = q89), 0)
+                              | q61 : int(1..2)])
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q85] = q68 ->
+                           toInt(or([a_PartitionOccurrence_WhichPart[q84] = q68 /\ q84 = q85 | q84 : int(1..2)])) =
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q67] = q35) * catchUndef(toInt(q67 = q85), 0)
+                                    | q67 : int(1..2)])
+                               | q85 : int(1..2), q85 < q89])
+                      /\
+                      and([!or([a_PartitionOccurrence_WhichPart[q88] = q68 /\ q88 = q62 | q88 : int(1..2)]) ->
+                           (a_PartitionOccurrence_WhichPart[q62] = q35 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q87] = q68 /\ q87 = q62 | q87 : int(1..2)])) =
+                            sum([toInt(a_PartitionOccurrence_WhichPart[q64] = q35) * catchUndef(toInt(q64 = q62), 0)
+                                     | q64 : int(1..2)]))
+                               | q62 : int(1..2), q62 < q89])))
+                        | q89 : int(1..2)])
+                \/
+                or([!or([a_PartitionOccurrence_WhichPart[q98] = q68 /\ q98 = q50 | q98 : int(1..2)]) /\
+                    (a_PartitionOccurrence_WhichPart[q50] = q35 /\
+                     (toInt(or([a_PartitionOccurrence_WhichPart[q91] = q68 /\ q91 = q50 | q91 : int(1..2)])) <
+                      sum([toInt(a_PartitionOccurrence_WhichPart[q52] = q35) * catchUndef(toInt(q52 = q50), 0)
+                               | q52 : int(1..2)])
+                      /\
+                      (and([a_PartitionOccurrence_WhichPart[q94] = q68 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q93] = q68 /\ q93 = q94 | q93 : int(1..2)])) =
+                            sum([toInt(a_PartitionOccurrence_WhichPart[q58] = q35) * catchUndef(toInt(q58 = q94), 0)
+                                     | q58 : int(1..2)])
+                                | q94 : int(1..2), q94 < q50])
+                       /\
+                       and([!or([a_PartitionOccurrence_WhichPart[q97] = q68 /\ q97 = q53 | q97 : int(1..2)]) ->
+                            (a_PartitionOccurrence_WhichPart[q53] = q35 ->
+                             toInt(or([a_PartitionOccurrence_WhichPart[q96] = q68 /\ q96 = q53 | q96 : int(1..2)])) =
+                             sum([toInt(a_PartitionOccurrence_WhichPart[q55] = q35) * catchUndef(toInt(q55 = q53), 0)
+                                      | q55 : int(1..2)]))
+                                | q53 : int(1..2), q53 < q50]))))
+                        | q50 : int(1..2)]))
+               ->
+               toInt(or([q147 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q150] = q147 ->
+                               or([a_PartitionOccurrence_WhichPart[q152] = q68 /\ q152 = q150 | q152 : int(1..2)])
+                                   | q150 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q154] = q68 ->
+                               or([a_PartitionOccurrence_WhichPart[q156] = q147 /\ q156 = q154 | q156 : int(1..2)])
+                                   | q154 : int(1..2)]))
+                             | q147 : int(1..2)]))
+               =
+               toInt(or([q72 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q72, q74] !=
+                               3
+                               ->
+                               or([a_PartitionOccurrence_WhichPart[q76] = q68 /\
+                                   q76 =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q72, q74]
+                                       | q76 : int(1..2)])
+                                   | q74 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q78] = q68 ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q72, q80]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q72, q80]
+                                   = q78
+                                       | q80 : int(1..2)])
+                                   | q78 : int(1..2)]))
+                             | q72 : int(1..2)]))
+                   | q68 : int(1..2)])
+          /\
+          and([and([q100 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+                    !or([q136 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q139] = q136 ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q141]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q141]
+                                   = q139
+                                       | q141 : int(1..2)])
+                                   | q139 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q143]
+                               != 3
+                               ->
+                               or([a_PartitionOccurrence_WhichPart[q145] = q136 /\
+                                   q145 =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q143]
+                                       | q145 : int(1..2)])
+                                   | q143 : int(1..2)]))
+                             | q136 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q101] != 3 /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q109]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q109]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q101]
+                                       | q109 : int(1..2)]))
+                         <
+                         sum([toInt(a_PartitionOccurrence_WhichPart[q61] = q35) *
+                              catchUndef(toInt(q61 =
+                                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                   [q100, q101]),
+                                         0)
+                                  | q61 : int(1..2)])
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q102]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q102]
+                               <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q101]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q100, q104]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q100, q104]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q100, q102]
+                                             | q104 : int(1..2)]))
+                               =
+                               sum([toInt(a_PartitionOccurrence_WhichPart[q67] = q35) *
+                                    catchUndef(toInt(q67 =
+                                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                         [q100, q102]),
+                                               0)
+                                        | q67 : int(1..2)])
+                                   | q102 : int(1..2)])
+                          /\
+                          and([!or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q100, q105]
+                                    != 3
+                                    /\
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q100, q105]
+                                    = q62
+                                        | q105 : int(1..2)])
+                               /\
+                               q62 <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q101]
+                               ->
+                               (a_PartitionOccurrence_WhichPart[q62] = q35 ->
+                                toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q100, q107]
+                                          != 3
+                                          /\
+                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q100, q107]
+                                          = q62
+                                              | q107 : int(1..2)]))
+                                =
+                                sum([toInt(a_PartitionOccurrence_WhichPart[q64] = q35) * catchUndef(toInt(q64 = q62), 0)
+                                         | q64 : int(1..2)]))
+                                   | q62 : int(1..2)])))
+                            | q101 : int(1..2)])
+                    \/
+                    or([!or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q118] !=
+                             3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q118] =
+                             q50 | q118 : int(1..2)])
+                        /\
+                        (a_PartitionOccurrence_WhichPart[q50] = q35 /\
+                         (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q100, q117]
+                                    != 3
+                                    /\
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q100, q117]
+                                    = q50
+                                        | q117 : int(1..2)]))
+                          <
+                          sum([toInt(a_PartitionOccurrence_WhichPart[q52] = q35) * catchUndef(toInt(q52 = q50), 0)
+                                   | q52 : int(1..2)])
+                          /\
+                          (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q110]
+                                != 3
+                                /\
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q110]
+                                < q50
+                                ->
+                                toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q100, q112]
+                                          != 3
+                                          /\
+                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q100, q112]
+                                          =
+                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                              [q100, q110]
+                                              | q112 : int(1..2)]))
+                                =
+                                sum([toInt(a_PartitionOccurrence_WhichPart[q58] = q35) *
+                                     catchUndef(toInt(q58 =
+                                                      b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                          [q100, q110]),
+                                                0)
+                                         | q58 : int(1..2)])
+                                    | q110 : int(1..2)])
+                           /\
+                           and([!or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q100, q113]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q100, q113]
+                                     = q53
+                                         | q113 : int(1..2)])
+                                ->
+                                (a_PartitionOccurrence_WhichPart[q53] = q35 ->
+                                 toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                               [q100, q115]
+                                           != 3
+                                           /\
+                                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                               [q100, q115]
+                                           = q53
+                                               | q115 : int(1..2)]))
+                                 =
+                                 sum([toInt(a_PartitionOccurrence_WhichPart[q55] = q35) *
+                                      catchUndef(toInt(q55 = q53), 0)
+                                          | q55 : int(1..2)]))
+                                    | q53 : int(1..2), q53 < q50]))))
+                            | q50 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q120 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q123] = q120 ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q125]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q125]
+                                   = q123
+                                       | q125 : int(1..2)])
+                                   | q123 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q127]
+                               != 3
+                               ->
+                               or([a_PartitionOccurrence_WhichPart[q129] = q120 /\
+                                   q129 =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q100, q127]
+                                       | q129 : int(1..2)])
+                                   | q127 : int(1..2)]))
+                             | q120 : int(1..2)]))
+               =
+               toInt(or([q132 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q132, q133] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q100, q133]
+                                  | q133 : int(1..2)])
+                             | q132 : int(1..2)]))
+                   | q100 : int(1..2)])))
+            | q35 : int(1..2)])
+    \/
+    or([q169 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+        !or([q316 <= a_PartitionOccurrence_NumParts /\
+             (and([a_PartitionOccurrence_WhichPart[q319] = q316 ->
+                   or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q321] != 3 /\
+                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q321] = q319
+                           | q321 : int(1..2)])
+                       | q319 : int(1..2)])
+              /\
+              and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q323] != 3 ->
+                   or([a_PartitionOccurrence_WhichPart[q325] = q316 /\
+                       q325 = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q323]
+                           | q325 : int(1..2)])
+                       | q323 : int(1..2)]))
+                 | q316 : int(1..2)])
+        /\
+        (toInt(or([q171 <= a_PartitionOccurrence_NumParts /\
+                   (and([a_PartitionOccurrence_WhichPart[q174] = q171 ->
+                         or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q176] !=
+                             3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q176] =
+                             q174
+                                 | q176 : int(1..2)])
+                             | q174 : int(1..2)])
+                    /\
+                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q178] != 3
+                         ->
+                         or([a_PartitionOccurrence_WhichPart[q180] = q171 /\
+                             q180 =
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q178]
+                                 | q180 : int(1..2)])
+                             | q178 : int(1..2)]))
+                       | q171 : int(1..2)]))
+         <
+         toInt(or([q183 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                   and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q183, q184] =
+                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q184]
+                            | q184 : int(1..2)])
+                       | q183 : int(1..2)]))
+         /\
+         (and([q186 <= a_PartitionOccurrence_NumParts /\
+               (or([a_PartitionOccurrence_WhichPart[q201] = q186 /\
+                    (sum([toInt(a_PartitionOccurrence_WhichPart[q222] = q186) * catchUndef(toInt(q222 = q201), 0)
+                              | q222 : int(1..2)])
+                     <
+                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q224]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q224]
+                               = q201
+                                   | q224 : int(1..2)]))
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q225] = q186 ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q234] = q186) * catchUndef(toInt(q234 = q225), 0)
+                                    | q234 : int(1..2)])
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q236]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q236]
+                                     = q225
+                                         | q236 : int(1..2)]))
+                               | q225 : int(1..2), q225 < q201])
+                      /\
+                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q226]
+                                != 3,
+                                !or([a_PartitionOccurrence_WhichPart[q228] = q186 /\
+                                     q228 =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q226]
+                                         | q228 : int(1..2)]),
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q226]
+                                < q201;
+                                    int(1..3)])
+                           ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q230] = q186) *
+                                catchUndef(toInt(q230 =
+                                                 b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                     [q169, q226]),
+                                           0)
+                                    | q230 : int(1..2)])
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q232]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q232]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q226]
+                                         | q232 : int(1..2)]))
+                               | q226 : int(1..2)])))
+                        | q201 : int(1..2)])
+                \/
+                or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q202] != 3 /\
+                    !or([a_PartitionOccurrence_WhichPart[q204] = q186 /\
+                         q204 = b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q202]
+                             | q204 : int(1..2)])
+                    /\
+                    (sum([toInt(a_PartitionOccurrence_WhichPart[q206] = q186) *
+                          catchUndef(toInt(q206 =
+                                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                               [q169, q202]),
+                                     0)
+                              | q206 : int(1..2)])
+                     <
+                     toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q208]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q208]
+                               =
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q202]
+                                   | q208 : int(1..2)]))
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q209] = q186 /\
+                           q209 <
+                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q202]
+                           ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q218] = q186) * catchUndef(toInt(q218 = q209), 0)
+                                    | q218 : int(1..2)])
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q220]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q220]
+                                     = q209
+                                         | q220 : int(1..2)]))
+                               | q209 : int(1..2)])
+                      /\
+                      and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q210]
+                                != 3,
+                                !or([a_PartitionOccurrence_WhichPart[q212] = q186 /\
+                                     q212 =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q210]
+                                         | q212 : int(1..2)]),
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q210]
+                                <
+                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                    [q169, q202];
+                                    int(1..3)])
+                           ->
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q214] = q186) *
+                                catchUndef(toInt(q214 =
+                                                 b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                                     [q169, q210]),
+                                           0)
+                                    | q214 : int(1..2)])
+                           =
+                           toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q216]
+                                     != 3
+                                     /\
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q216]
+                                     =
+                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                         [q169, q210]
+                                         | q216 : int(1..2)]))
+                               | q210 : int(1..2)])))
+                        | q202 : int(1..2)]))
+               ->
+               toInt(or([q305 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q308] = q305 ->
+                               or([a_PartitionOccurrence_WhichPart[q310] = q186 /\ q310 = q308 | q310 : int(1..2)])
+                                   | q308 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q312] = q186 ->
+                               or([a_PartitionOccurrence_WhichPart[q314] = q305 /\ q314 = q312 | q314 : int(1..2)])
+                                   | q312 : int(1..2)]))
+                             | q305 : int(1..2)]))
+               =
+               toInt(or([q190 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q190, q192]
+                               != 3
+                               ->
+                               or([a_PartitionOccurrence_WhichPart[q194] = q186 /\
+                                   q194 =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q190, q192]
+                                       | q194 : int(1..2)])
+                                   | q192 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q196] = q186 ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q190, q198]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q190, q198]
+                                   = q196
+                                       | q198 : int(1..2)])
+                                   | q196 : int(1..2)]))
+                             | q190 : int(1..2)]))
+                   | q186 : int(1..2)])
+          /\
+          and([and([q238 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker,
+                    !or([q256 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q259] = q256 ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q261]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q261]
+                                   = q259
+                                       | q261 : int(1..2)])
+                                   | q259 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q263]
+                               != 3
+                               ->
+                               or([a_PartitionOccurrence_WhichPart[q265] = q256 /\
+                                   q265 =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q263]
+                                       | q265 : int(1..2)])
+                                   | q263 : int(1..2)]))
+                             | q256 : int(1..2)]),
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q268] != 3 /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q289]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q289]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q268]
+                                       | q289 : int(1..2)]))
+                         <
+                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q169, q291]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q169, q291]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q268]
+                                       | q291 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q292]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q292]
+                               <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q268]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q301]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q301]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q292]
+                                             | q301 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q303]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q303]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q292]
+                                             | q303 : int(1..2)]))
+                                   | q292 : int(1..2)])
+                          /\
+                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q169, q293]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q295]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q295]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q293]
+                                             | q295 : int(1..2)]),
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q169, q293]
+                                    <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q238, q268];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q297]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q297]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q293]
+                                             | q297 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q299]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q299]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q293]
+                                             | q299 : int(1..2)]))
+                                   | q293 : int(1..2)])))
+                            | q268 : int(1..2)])
+                    \/
+                    or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q269] != 3 /\
+                        !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q271] !=
+                             3
+                             /\
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q271] =
+                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q269]
+                                 | q271 : int(1..2)])
+                        /\
+                        (toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q273]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q273]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q169, q269]
+                                       | q273 : int(1..2)]))
+                         <
+                         toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q169, q275]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q169, q275]
+                                   =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q169, q269]
+                                       | q275 : int(1..2)]))
+                         /\
+                         (and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q276]
+                               != 3
+                               /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q276]
+                               <
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q169, q269]
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q285]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q285]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q276]
+                                             | q285 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q287]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q287]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q276]
+                                             | q287 : int(1..2)]))
+                                   | q276 : int(1..2)])
+                          /\
+                          and([and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q169, q277]
+                                    != 3,
+                                    !or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q279]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q279]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q277]
+                                             | q279 : int(1..2)]),
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q169, q277]
+                                    <
+                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q169, q269];
+                                        int(1..3)])
+                               ->
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q281]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q238, q281]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q277]
+                                             | q281 : int(1..2)]))
+                               =
+                               toInt(or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q283]
+                                         != 3
+                                         /\
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q283]
+                                         =
+                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                             [q169, q277]
+                                             | q283 : int(1..2)]))
+                                   | q277 : int(1..2)])))
+                            | q269 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q240 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q243] = q240 ->
+                               or([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q245]
+                                   != 3
+                                   /\
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q245]
+                                   = q243
+                                       | q245 : int(1..2)])
+                                   | q243 : int(1..2)])
+                          /\
+                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q247]
+                               != 3
+                               ->
+                               or([a_PartitionOccurrence_WhichPart[q249] = q240 /\
+                                   q249 =
+                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                       [q238, q247]
+                                       | q249 : int(1..2)])
+                                   | q247 : int(1..2)]))
+                             | q240 : int(1..2)]))
+               =
+               toInt(or([q252 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q252, q253] =
+                              b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q238, q253]
+                                  | q253 : int(1..2)])
+                             | q252 : int(1..2)]))
+                   | q238 : int(1..2)])))
+            | q169 : int(1..2)]),
+    and([q1 <= a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] <= 2 | q1 : int(1..2)]),
+    and([q1 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..2)]),
+    a_PartitionOccurrence_NumParts <= 2,
+    a_PartitionOccurrence_NumParts = max([a_PartitionOccurrence_WhichPart[q4] | q4 : int(1..2)]),
+    and([a_PartitionOccurrence_PartSizes[q5] = sum([toInt(a_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..2)])
+             | q5 : int(1..2)]),
+    and([q7 <= a_PartitionOccurrence_NumParts ->
+         and([a_PartitionOccurrence_WhichPart[q8] = q7 -> a_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..2)])
+             | q7 : int(1..2)]),
+    and([q7 <= a_PartitionOccurrence_NumParts ->
+         or([a_PartitionOccurrence_WhichPart[q8] = q7 /\ a_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..2)])
+             | q7 : int(1..2)]),
+    and([q7 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..2)]),
+    and([q9 <= a_PartitionOccurrence_NumParts /\ q10 <= a_PartitionOccurrence_NumParts ->
+         (q9 < q10 <-> a_PartitionOccurrence_FirstIndex[q9] < a_PartitionOccurrence_FirstIndex[q10])
+             | q9 : int(1..2), q10 : int(1..2)]),
+    alldifferent_except([toInt(q28 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker /\
+                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q28, q29] !=
+                               3)
+                         *
+                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
+                                        [q28, q29],
+                                    0)
+                             | q28 : int(1..2), q29 : int(1..2)],
+                        0),
+    and([q30 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q30, q32] != 3)
+                  | q32 : int(1..2)])
+         >= 1
+             | q30 : int(1..2)]),
+    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, q22] | q22 : int(1..2)] <lex
+    [b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, q23] | q23 : int(1..2)],
+    and([q15 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q15, q27] = 1
+                  | q27 : int(1..2)])
+             | q15 : int(1..2)]),
+    b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker <= 2,
+    and([q16 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, 1] <
+         b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, 2]
+         \/ b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, 1] = 3
+             | q16 : int(1..2)]),
+    and([q16 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, 1] = 3 ->
+          b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, 2] = 3)
+             | q16 : int(1..2)]),
+    and([q16 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
+         sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q16, q19] != 3)
+                  | q19 : int(1..2)])
+         <= 2
+             | q16 : int(1..2)]),
+    2 =
+    sum([toInt(q24 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker) *
+         catchUndef(sum([toInt(b_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q24, q26] !=
+                               3)
+                             | q26 : int(1..2)]),
+                    0)
+             | q24 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3.eprime.orig b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3.eprime.orig
deleted file mode 100644
index d77a6dce81..0000000000
--- a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_3.eprime.orig
+++ /dev/null
@@ -1,901 +0,0 @@
-language ESSENCE' 1.0
-
-find a_PartitionOccurrence_NumParts: int(1..2)
-find a_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
-find a_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
-find a_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker: int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
-        matrix indexed by [int(1..2)] of int(0..2)
-find b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
-        matrix indexed by [int(1..2), int(1..2)] of int(1..2)
-branching on
-    [a_PartitionOccurrence_NumParts, a_PartitionOccurrence_WhichPart, a_PartitionOccurrence_PartSizes,
-     a_PartitionOccurrence_FirstIndex, b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker,
-     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values]
-such that
-    or([q30 <= a_PartitionOccurrence_NumParts /\
-        (toInt(or([q153 <= a_PartitionOccurrence_NumParts /\
-                   (and([a_PartitionOccurrence_WhichPart[q156] = q153 ->
-                         or([a_PartitionOccurrence_WhichPart[q158] = q30 /\ q158 = q156 | q158 : int(1..2)])
-                             | q156 : int(1..2)])
-                    /\
-                    and([a_PartitionOccurrence_WhichPart[q160] = q30 ->
-                         or([a_PartitionOccurrence_WhichPart[q162] = q153 /\ q162 = q160 | q162 : int(1..2)])
-                             | q160 : int(1..2)]))
-                       | q153 : int(1..2)]))
-         <
-         toInt(or([q34 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (and([q36 <=
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q34]
-                         ->
-                         or([a_PartitionOccurrence_WhichPart[q38] = q30 /\
-                             q38 =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q34, q36]
-                                 | q38 : int(1..2)])
-                             | q36 : int(1..2)])
-                    /\
-                    and([a_PartitionOccurrence_WhichPart[q40] = q30 ->
-                         or([q42 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q34]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q34, q42]
-                             = q40
-                                 | q42 : int(1..2)])
-                             | q40 : int(1..2)]))
-                       | q34 : int(1..2)]))
-         /\
-         (and([q63 <= a_PartitionOccurrence_NumParts /\
-               (or([a_PartitionOccurrence_WhichPart[q84] = q63 /\
-                    (toInt(or([a_PartitionOccurrence_WhichPart[q77] = q63 /\ q77 = q84 | q77 : int(1..2)])) <
-                     sum([toInt(a_PartitionOccurrence_WhichPart[q56] = q30) * catchUndef(toInt(q56 = q84), 0)
-                              | q56 : int(1..2)])
-                     /\
-                     (and([a_PartitionOccurrence_WhichPart[q80] = q63 ->
-                           toInt(or([a_PartitionOccurrence_WhichPart[q79] = q63 /\ q79 = q80 | q79 : int(1..2)])) =
-                           sum([toInt(a_PartitionOccurrence_WhichPart[q62] = q30) * catchUndef(toInt(q62 = q80), 0)
-                                    | q62 : int(1..2)])
-                               | q80 : int(1..2), q80 < q84])
-                      /\
-                      and([!or([a_PartitionOccurrence_WhichPart[q83] = q63 /\ q83 = q57 | q83 : int(1..2)]) ->
-                           (a_PartitionOccurrence_WhichPart[q57] = q30 ->
-                            toInt(or([a_PartitionOccurrence_WhichPart[q82] = q63 /\ q82 = q57 | q82 : int(1..2)])) =
-                            sum([toInt(a_PartitionOccurrence_WhichPart[q59] = q30) * catchUndef(toInt(q59 = q57), 0)
-                                     | q59 : int(1..2)]))
-                               | q57 : int(1..2), q57 < q84])))
-                        | q84 : int(1..2)])
-                \/
-                or([!or([a_PartitionOccurrence_WhichPart[q93] = q63 /\ q93 = q45 | q93 : int(1..2)]) /\
-                    (a_PartitionOccurrence_WhichPart[q45] = q30 /\
-                     (toInt(or([a_PartitionOccurrence_WhichPart[q86] = q63 /\ q86 = q45 | q86 : int(1..2)])) <
-                      sum([toInt(a_PartitionOccurrence_WhichPart[q47] = q30) * catchUndef(toInt(q47 = q45), 0)
-                               | q47 : int(1..2)])
-                      /\
-                      (and([a_PartitionOccurrence_WhichPart[q89] = q63 ->
-                            toInt(or([a_PartitionOccurrence_WhichPart[q88] = q63 /\ q88 = q89 | q88 : int(1..2)])) =
-                            sum([toInt(a_PartitionOccurrence_WhichPart[q53] = q30) * catchUndef(toInt(q53 = q89), 0)
-                                     | q53 : int(1..2)])
-                                | q89 : int(1..2), q89 < q45])
-                       /\
-                       and([!or([a_PartitionOccurrence_WhichPart[q92] = q63 /\ q92 = q48 | q92 : int(1..2)]) ->
-                            (a_PartitionOccurrence_WhichPart[q48] = q30 ->
-                             toInt(or([a_PartitionOccurrence_WhichPart[q91] = q63 /\ q91 = q48 | q91 : int(1..2)])) =
-                             sum([toInt(a_PartitionOccurrence_WhichPart[q50] = q30) * catchUndef(toInt(q50 = q48), 0)
-                                      | q50 : int(1..2)]))
-                                | q48 : int(1..2), q48 < q45]))))
-                        | q45 : int(1..2)]))
-               ->
-               toInt(or([q142 <= a_PartitionOccurrence_NumParts /\
-                         (and([a_PartitionOccurrence_WhichPart[q145] = q142 ->
-                               or([a_PartitionOccurrence_WhichPart[q147] = q63 /\ q147 = q145 | q147 : int(1..2)])
-                                   | q145 : int(1..2)])
-                          /\
-                          and([a_PartitionOccurrence_WhichPart[q149] = q63 ->
-                               or([a_PartitionOccurrence_WhichPart[q151] = q142 /\ q151 = q149 | q151 : int(1..2)])
-                                   | q149 : int(1..2)]))
-                             | q142 : int(1..2)]))
-               =
-               toInt(or([q67 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q69 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q67]
-                               ->
-                               or([a_PartitionOccurrence_WhichPart[q71] = q63 /\
-                                   q71 =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q67, q69]
-                                       | q71 : int(1..2)])
-                                   | q69 : int(1..2)])
-                          /\
-                          and([a_PartitionOccurrence_WhichPart[q73] = q63 ->
-                               or([q75 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q67]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q67, q75]
-                                   = q73
-                                       | q75 : int(1..2)])
-                                   | q73 : int(1..2)]))
-                             | q67 : int(1..2)]))
-                   | q63 : int(1..2)])
-          /\
-          and([and([q95 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q131 <= a_PartitionOccurrence_NumParts /\
-                         (and([a_PartitionOccurrence_WhichPart[q134] = q131 ->
-                               or([q136 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q95]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q95, q136]
-                                   = q134
-                                       | q136 : int(1..2)])
-                                   | q134 : int(1..2)])
-                          /\
-                          and([q138 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q95]
-                               ->
-                               or([a_PartitionOccurrence_WhichPart[q140] = q131 /\
-                                   q140 =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q95, q138]
-                                       | q140 : int(1..2)])
-                                   | q138 : int(1..2)]))
-                             | q131 : int(1..2)]),
-                    or([q96 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q95]
-                        /\
-                        (toInt(or([q104 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q95]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q95, q104]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q95, q96]
-                                       | q104 : int(1..2)]))
-                         <
-                         sum([toInt(a_PartitionOccurrence_WhichPart[q56] = q30) *
-                              catchUndef(toInt(q56 =
-                                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                   [q95, q96]),
-                                         0)
-                                  | q56 : int(1..2)])
-                         /\
-                         (and([q97 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q95]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q95, q97]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q95, q96]
-                               ->
-                               toInt(or([q99 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q95]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q95, q99]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q95, q97]
-                                             | q99 : int(1..2)]))
-                               =
-                               sum([toInt(a_PartitionOccurrence_WhichPart[q62] = q30) *
-                                    catchUndef(toInt(q62 =
-                                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                         [q95, q97]),
-                                               0)
-                                        | q62 : int(1..2)])
-                                   | q97 : int(1..2)])
-                          /\
-                          and([!or([q100 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q95]
-                                    /\
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q95, q100]
-                                    = q57
-                                        | q100 : int(1..2)])
-                               /\
-                               q57 <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q95, q96]
-                               ->
-                               (a_PartitionOccurrence_WhichPart[q57] = q30 ->
-                                toInt(or([q102 <=
-                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                              [q95]
-                                          /\
-                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                              [q95, q102]
-                                          = q57
-                                              | q102 : int(1..2)]))
-                                =
-                                sum([toInt(a_PartitionOccurrence_WhichPart[q59] = q30) * catchUndef(toInt(q59 = q57), 0)
-                                         | q59 : int(1..2)]))
-                                   | q57 : int(1..2)])))
-                            | q96 : int(1..2)])
-                    \/
-                    or([!or([q113 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q95]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q95, q113]
-                             = q45
-                                 | q113 : int(1..2)])
-                        /\
-                        (a_PartitionOccurrence_WhichPart[q45] = q30 /\
-                         (toInt(or([q112 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q95]
-                                    /\
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q95, q112]
-                                    = q45
-                                        | q112 : int(1..2)]))
-                          <
-                          sum([toInt(a_PartitionOccurrence_WhichPart[q47] = q30) * catchUndef(toInt(q47 = q45), 0)
-                                   | q47 : int(1..2)])
-                          /\
-                          (and([q105 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q95]
-                                /\
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q95, q105]
-                                < q45
-                                ->
-                                toInt(or([q107 <=
-                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                              [q95]
-                                          /\
-                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                              [q95, q107]
-                                          =
-                                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                              [q95, q105]
-                                              | q107 : int(1..2)]))
-                                =
-                                sum([toInt(a_PartitionOccurrence_WhichPart[q53] = q30) *
-                                     catchUndef(toInt(q53 =
-                                                      b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                          [q95, q105]),
-                                                0)
-                                         | q53 : int(1..2)])
-                                    | q105 : int(1..2)])
-                           /\
-                           and([!or([q108 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q95]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q95, q108]
-                                     = q48
-                                         | q108 : int(1..2)])
-                                ->
-                                (a_PartitionOccurrence_WhichPart[q48] = q30 ->
-                                 toInt(or([q110 <=
-                                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                               [q95]
-                                           /\
-                                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                               [q95, q110]
-                                           = q48
-                                               | q110 : int(1..2)]))
-                                 =
-                                 sum([toInt(a_PartitionOccurrence_WhichPart[q50] = q30) *
-                                      catchUndef(toInt(q50 = q48), 0)
-                                          | q50 : int(1..2)]))
-                                    | q48 : int(1..2), q48 < q45]))))
-                            | q45 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q115 <= a_PartitionOccurrence_NumParts /\
-                         (and([a_PartitionOccurrence_WhichPart[q118] = q115 ->
-                               or([q120 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q95]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q95, q120]
-                                   = q118
-                                       | q120 : int(1..2)])
-                                   | q118 : int(1..2)])
-                          /\
-                          and([q122 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q95]
-                               ->
-                               or([a_PartitionOccurrence_WhichPart[q124] = q115 /\
-                                   q124 =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q95, q122]
-                                       | q124 : int(1..2)])
-                                   | q122 : int(1..2)]))
-                             | q115 : int(1..2)]))
-               =
-               toInt(or([q127 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q127] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q95]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q127, q128]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q95, q128]
-                                   | q128 : int(1..2)]))
-                             | q127 : int(1..2)]))
-                   | q95 : int(1..2)])))
-            | q30 : int(1..2)])
-    \/
-    or([q164 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-        !or([q311 <= a_PartitionOccurrence_NumParts /\
-             (and([a_PartitionOccurrence_WhichPart[q314] = q311 ->
-                   or([q316 <=
-                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                       /\
-                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q164, q316]
-                       = q314
-                           | q316 : int(1..2)])
-                       | q314 : int(1..2)])
-              /\
-              and([q318 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164] ->
-                   or([a_PartitionOccurrence_WhichPart[q320] = q311 /\
-                       q320 =
-                       b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q164, q318]
-                           | q320 : int(1..2)])
-                       | q318 : int(1..2)]))
-                 | q311 : int(1..2)])
-        /\
-        (toInt(or([q166 <= a_PartitionOccurrence_NumParts /\
-                   (and([a_PartitionOccurrence_WhichPart[q169] = q166 ->
-                         or([q171 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q164, q171]
-                             = q169
-                                 | q171 : int(1..2)])
-                             | q169 : int(1..2)])
-                    /\
-                    and([q173 <=
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                         ->
-                         or([a_PartitionOccurrence_WhichPart[q175] = q166 /\
-                             q175 =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q164, q173]
-                                 | q175 : int(1..2)])
-                             | q173 : int(1..2)]))
-                       | q166 : int(1..2)]))
-         <
-         toInt(or([q178 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                   (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q178] =
-                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                    /\
-                    and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q178, q179]
-                         =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q164, q179]
-                             | q179 : int(1..2)]))
-                       | q178 : int(1..2)]))
-         /\
-         (and([q181 <= a_PartitionOccurrence_NumParts /\
-               (or([a_PartitionOccurrence_WhichPart[q196] = q181 /\
-                    (sum([toInt(a_PartitionOccurrence_WhichPart[q217] = q181) * catchUndef(toInt(q217 = q196), 0)
-                              | q217 : int(1..2)])
-                     <
-                     toInt(or([q219 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q164]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q164, q219]
-                               = q196
-                                   | q219 : int(1..2)]))
-                     /\
-                     (and([a_PartitionOccurrence_WhichPart[q220] = q181 ->
-                           sum([toInt(a_PartitionOccurrence_WhichPart[q229] = q181) * catchUndef(toInt(q229 = q220), 0)
-                                    | q229 : int(1..2)])
-                           =
-                           toInt(or([q231 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q164]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q231]
-                                     = q220
-                                         | q231 : int(1..2)]))
-                               | q220 : int(1..2), q220 < q196])
-                      /\
-                      and([and([q221 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q164],
-                                !or([a_PartitionOccurrence_WhichPart[q227] = q181 /\
-                                     q227 =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q221]
-                                         | q227 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q164, q221]
-                                < q196;
-                                    int(1..3)])
-                           ->
-                           sum([toInt(a_PartitionOccurrence_WhichPart[q223] = q181) *
-                                catchUndef(toInt(q223 =
-                                                 b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                     [q164, q221]),
-                                           0)
-                                    | q223 : int(1..2)])
-                           =
-                           toInt(or([q225 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q164]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q225]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q221]
-                                         | q225 : int(1..2)]))
-                               | q221 : int(1..2)])))
-                        | q196 : int(1..2)])
-                \/
-                or([q197 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                    /\
-                    !or([a_PartitionOccurrence_WhichPart[q215] = q181 /\
-                         q215 =
-                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                             [q164, q197]
-                             | q215 : int(1..2)])
-                    /\
-                    (sum([toInt(a_PartitionOccurrence_WhichPart[q199] = q181) *
-                          catchUndef(toInt(q199 =
-                                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                               [q164, q197]),
-                                     0)
-                              | q199 : int(1..2)])
-                     <
-                     toInt(or([q201 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q164]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q164, q201]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q164, q197]
-                                   | q201 : int(1..2)]))
-                     /\
-                     (and([a_PartitionOccurrence_WhichPart[q202] = q181 /\
-                           q202 <
-                           b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                               [q164, q197]
-                           ->
-                           sum([toInt(a_PartitionOccurrence_WhichPart[q211] = q181) * catchUndef(toInt(q211 = q202), 0)
-                                    | q211 : int(1..2)])
-                           =
-                           toInt(or([q213 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q164]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q213]
-                                     = q202
-                                         | q213 : int(1..2)]))
-                               | q202 : int(1..2)])
-                      /\
-                      and([and([q203 <=
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                    [q164],
-                                !or([a_PartitionOccurrence_WhichPart[q209] = q181 /\
-                                     q209 =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q203]
-                                         | q209 : int(1..2)]),
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q164, q203]
-                                <
-                                b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                    [q164, q197];
-                                    int(1..3)])
-                           ->
-                           sum([toInt(a_PartitionOccurrence_WhichPart[q205] = q181) *
-                                catchUndef(toInt(q205 =
-                                                 b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                                     [q164, q203]),
-                                           0)
-                                    | q205 : int(1..2)])
-                           =
-                           toInt(or([q207 <=
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                         [q164]
-                                     /\
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q207]
-                                     =
-                                     b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                         [q164, q203]
-                                         | q207 : int(1..2)]))
-                               | q203 : int(1..2)])))
-                        | q197 : int(1..2)]))
-               ->
-               toInt(or([q300 <= a_PartitionOccurrence_NumParts /\
-                         (and([a_PartitionOccurrence_WhichPart[q303] = q300 ->
-                               or([a_PartitionOccurrence_WhichPart[q305] = q181 /\ q305 = q303 | q305 : int(1..2)])
-                                   | q303 : int(1..2)])
-                          /\
-                          and([a_PartitionOccurrence_WhichPart[q307] = q181 ->
-                               or([a_PartitionOccurrence_WhichPart[q309] = q300 /\ q309 = q307 | q309 : int(1..2)])
-                                   | q307 : int(1..2)]))
-                             | q300 : int(1..2)]))
-               =
-               toInt(or([q185 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (and([q187 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q185]
-                               ->
-                               or([a_PartitionOccurrence_WhichPart[q189] = q181 /\
-                                   q189 =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q185, q187]
-                                       | q189 : int(1..2)])
-                                   | q187 : int(1..2)])
-                          /\
-                          and([a_PartitionOccurrence_WhichPart[q191] = q181 ->
-                               or([q193 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q185]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q185, q193]
-                                   = q191
-                                       | q193 : int(1..2)])
-                                   | q191 : int(1..2)]))
-                             | q185 : int(1..2)]))
-                   | q181 : int(1..2)])
-          /\
-          and([and([q233 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker,
-                    !or([q251 <= a_PartitionOccurrence_NumParts /\
-                         (and([a_PartitionOccurrence_WhichPart[q254] = q251 ->
-                               or([q256 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q233]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q256]
-                                   = q254
-                                       | q256 : int(1..2)])
-                                   | q254 : int(1..2)])
-                          /\
-                          and([q258 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q233]
-                               ->
-                               or([a_PartitionOccurrence_WhichPart[q260] = q251 /\
-                                   q260 =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q258]
-                                       | q260 : int(1..2)])
-                                   | q258 : int(1..2)]))
-                             | q251 : int(1..2)]),
-                    or([q263 <=
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q233]
-                        /\
-                        (toInt(or([q284 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q233]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q284]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q263]
-                                       | q284 : int(1..2)]))
-                         <
-                         toInt(or([q286 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q164]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q164, q286]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q263]
-                                       | q286 : int(1..2)]))
-                         /\
-                         (and([q287 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q233]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q233, q287]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q233, q263]
-                               ->
-                               toInt(or([q296 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q233]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q296]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q287]
-                                             | q296 : int(1..2)]))
-                               =
-                               toInt(or([q298 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q164]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q298]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q287]
-                                             | q298 : int(1..2)]))
-                                   | q287 : int(1..2)])
-                          /\
-                          and([and([q288 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q164],
-                                    !or([q294 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q233]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q294]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q288]
-                                             | q294 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q164, q288]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q233, q263];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q290 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q233]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q290]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q288]
-                                             | q290 : int(1..2)]))
-                               =
-                               toInt(or([q292 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q164]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q292]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q288]
-                                             | q292 : int(1..2)]))
-                                   | q288 : int(1..2)])))
-                            | q263 : int(1..2)])
-                    \/
-                    or([q264 <=
-                        b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q164]
-                        /\
-                        !or([q282 <=
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q233]
-                             /\
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q233, q282]
-                             =
-                             b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                 [q164, q264]
-                                 | q282 : int(1..2)])
-                        /\
-                        (toInt(or([q266 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q233]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q266]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q164, q264]
-                                       | q266 : int(1..2)]))
-                         <
-                         toInt(or([q268 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q164]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q164, q268]
-                                   =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q164, q264]
-                                       | q268 : int(1..2)]))
-                         /\
-                         (and([q269 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q233]
-                               /\
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q233, q269]
-                               <
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q164, q264]
-                               ->
-                               toInt(or([q278 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q233]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q278]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q269]
-                                             | q278 : int(1..2)]))
-                               =
-                               toInt(or([q280 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q164]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q280]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q269]
-                                             | q280 : int(1..2)]))
-                                   | q269 : int(1..2)])
-                          /\
-                          and([and([q270 <=
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                        [q164],
-                                    !or([q276 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q233]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q276]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q270]
-                                             | q276 : int(1..2)]),
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q164, q270]
-                                    <
-                                    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q164, q264];
-                                        int(1..3)])
-                               ->
-                               toInt(or([q272 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q233]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q233, q272]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q270]
-                                             | q272 : int(1..2)]))
-                               =
-                               toInt(or([q274 <=
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                             [q164]
-                                         /\
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q274]
-                                         =
-                                         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                             [q164, q270]
-                                             | q274 : int(1..2)]))
-                                   | q270 : int(1..2)])))
-                            | q264 : int(1..2)]);
-                        int(1..3)])
-               ->
-               toInt(or([q235 <= a_PartitionOccurrence_NumParts /\
-                         (and([a_PartitionOccurrence_WhichPart[q238] = q235 ->
-                               or([q240 <=
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                       [q233]
-                                   /\
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q240]
-                                   = q238
-                                       | q240 : int(1..2)])
-                                   | q238 : int(1..2)])
-                          /\
-                          and([q242 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q233]
-                               ->
-                               or([a_PartitionOccurrence_WhichPart[q244] = q235 /\
-                                   q244 =
-                                   b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                       [q233, q242]
-                                       | q244 : int(1..2)])
-                                   | q242 : int(1..2)]))
-                             | q235 : int(1..2)]))
-               =
-               toInt(or([q247 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                         (b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q247] =
-                          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q233]
-                          /\
-                          and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q247, q248]
-                               =
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                   [q233, q248]
-                                   | q248 : int(1..2)]))
-                             | q247 : int(1..2)]))
-                   | q233 : int(1..2)])))
-            | q164 : int(1..2)]),
-    and([q1 <= a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] <= 2 | q1 : int(1..2)]),
-    and([q1 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..2)]),
-    a_PartitionOccurrence_NumParts <= 2,
-    a_PartitionOccurrence_NumParts = max([a_PartitionOccurrence_WhichPart[q4] | q4 : int(1..2)]),
-    and([a_PartitionOccurrence_PartSizes[q5] = sum([toInt(a_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..2)])
-             | q5 : int(1..2)]),
-    and([q7 <= a_PartitionOccurrence_NumParts ->
-         and([a_PartitionOccurrence_WhichPart[q8] = q7 -> a_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..2)])
-             | q7 : int(1..2)]),
-    and([q7 <= a_PartitionOccurrence_NumParts ->
-         or([a_PartitionOccurrence_WhichPart[q8] = q7 /\ a_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..2)])
-             | q7 : int(1..2)]),
-    and([q7 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..2)]),
-    and([q9 <= a_PartitionOccurrence_NumParts /\ q10 <= a_PartitionOccurrence_NumParts ->
-         (q9 < q10 <-> a_PartitionOccurrence_FirstIndex[q9] < a_PartitionOccurrence_FirstIndex[q10])
-             | q9 : int(1..2), q10 : int(1..2)]),
-    alldifferent_except([toInt(q25 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\
-                               q26 <=
-                               b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
-                                   [q25])
-                         *
-                         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
-                                        [q25, q26],
-                                    0)
-                             | q25 : int(1..2), q26 : int(1..2)],
-                        0),
-    and([q27 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q27] >= 1
-             | q27 : int(1..2)]),
-    2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q21]
-                  | q21 : int(1..2)];
-                 int(1..2)])
-    <lex
-    flatten([[b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[2]; int(1)],
-             [b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[2, q22]
-                  | q22 : int(1..2)];
-                 int(1..2)]),
-    and([q15 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q15] = 0 /\
-         and([b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q15, q24] = 1
-                  | q24 : int(1..2)])
-             | q15 : int(1..2)]),
-    b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 2,
-    and([q16 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         (2 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q16] ->
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q16, 1] <
-          b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q16, 2])
-             | q16 : int(1..2)]),
-    and([q16 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         and([q18 > b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q16] ->
-              b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q16, q18] = 1
-                  | q18 : int(1..2)])
-             | q16 : int(1..2)]),
-    and([q16 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
-         b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q16] <= 2
-             | q16 : int(1..2)]),
-    2 =
-    sum([toInt(q23 <= b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) *
-         catchUndef(b_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q23], 0)
-             | q23 : int(1..2)])
-
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4-solution000001.solution
new file mode 100644
index 0000000000..cde05d5274
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4-solution000001.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be partition({1, 2})
+$ Visualisation for a
+$ 1 2
+
+letting b be partition({1}, {2})
+$ Visualisation for b
+$ 1
+$ 2
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4.eprime b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4.eprime
new file mode 100644
index 0000000000..c027a58750
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_partition_01/expected/model_4_4.eprime
@@ -0,0 +1,394 @@
+language ESSENCE' 1.0
+
+find a_PartitionOccurrence_NumParts: int(1..2)
+find a_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
+find a_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
+find a_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
+find b_PartitionOccurrence_NumParts: int(1..2)
+find b_PartitionOccurrence_WhichPart: matrix indexed by [int(1..2)] of int(1..2)
+find b_PartitionOccurrence_PartSizes: matrix indexed by [int(1..2)] of int(0..2)
+find b_PartitionOccurrence_FirstIndex: matrix indexed by [int(1..2)] of int(1..2)
+branching on
+    [a_PartitionOccurrence_NumParts, a_PartitionOccurrence_WhichPart, a_PartitionOccurrence_PartSizes,
+     a_PartitionOccurrence_FirstIndex, b_PartitionOccurrence_NumParts, b_PartitionOccurrence_WhichPart,
+     b_PartitionOccurrence_PartSizes, b_PartitionOccurrence_FirstIndex]
+such that
+    or([q23 <= a_PartitionOccurrence_NumParts /\
+        (toInt(or([q152 <= a_PartitionOccurrence_NumParts /\
+                   (and([a_PartitionOccurrence_WhichPart[q155] = q152 ->
+                         or([a_PartitionOccurrence_WhichPart[q157] = q23 /\ q157 = q155 | q157 : int(1..2)])
+                             | q155 : int(1..2)])
+                    /\
+                    and([a_PartitionOccurrence_WhichPart[q159] = q23 ->
+                         or([a_PartitionOccurrence_WhichPart[q161] = q152 /\ q161 = q159 | q161 : int(1..2)])
+                             | q159 : int(1..2)]))
+                       | q152 : int(1..2)]))
+         <
+         toInt(or([q26 <= b_PartitionOccurrence_NumParts /\
+                   (and([b_PartitionOccurrence_WhichPart[q29] = q26 ->
+                         or([a_PartitionOccurrence_WhichPart[q31] = q23 /\ q31 = q29 | q31 : int(1..2)])
+                             | q29 : int(1..2)])
+                    /\
+                    and([a_PartitionOccurrence_WhichPart[q33] = q23 ->
+                         or([b_PartitionOccurrence_WhichPart[q35] = q26 /\ q35 = q33 | q35 : int(1..2)])
+                             | q33 : int(1..2)]))
+                       | q26 : int(1..2)]))
+         /\
+         (and([q56 <= a_PartitionOccurrence_NumParts /\
+               (or([a_PartitionOccurrence_WhichPart[q77] = q56 /\
+                    (toInt(or([a_PartitionOccurrence_WhichPart[q70] = q56 /\ q70 = q77 | q70 : int(1..2)])) <
+                     sum([toInt(a_PartitionOccurrence_WhichPart[q49] = q23) * catchUndef(toInt(q49 = q77), 0)
+                              | q49 : int(1..2)])
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q73] = q56 ->
+                           toInt(or([a_PartitionOccurrence_WhichPart[q72] = q56 /\ q72 = q73 | q72 : int(1..2)])) =
+                           sum([toInt(a_PartitionOccurrence_WhichPart[q55] = q23) * catchUndef(toInt(q55 = q73), 0)
+                                    | q55 : int(1..2)])
+                               | q73 : int(1..2), q73 < q77])
+                      /\
+                      and([!or([a_PartitionOccurrence_WhichPart[q76] = q56 /\ q76 = q50 | q76 : int(1..2)]) ->
+                           (a_PartitionOccurrence_WhichPart[q50] = q23 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q75] = q56 /\ q75 = q50 | q75 : int(1..2)])) =
+                            sum([toInt(a_PartitionOccurrence_WhichPart[q52] = q23) * catchUndef(toInt(q52 = q50), 0)
+                                     | q52 : int(1..2)]))
+                               | q50 : int(1..2), q50 < q77])))
+                        | q77 : int(1..2)])
+                \/
+                or([!or([a_PartitionOccurrence_WhichPart[q86] = q56 /\ q86 = q38 | q86 : int(1..2)]) /\
+                    (a_PartitionOccurrence_WhichPart[q38] = q23 /\
+                     (toInt(or([a_PartitionOccurrence_WhichPart[q79] = q56 /\ q79 = q38 | q79 : int(1..2)])) <
+                      sum([toInt(a_PartitionOccurrence_WhichPart[q40] = q23) * catchUndef(toInt(q40 = q38), 0)
+                               | q40 : int(1..2)])
+                      /\
+                      (and([a_PartitionOccurrence_WhichPart[q82] = q56 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q81] = q56 /\ q81 = q82 | q81 : int(1..2)])) =
+                            sum([toInt(a_PartitionOccurrence_WhichPart[q46] = q23) * catchUndef(toInt(q46 = q82), 0)
+                                     | q46 : int(1..2)])
+                                | q82 : int(1..2), q82 < q38])
+                       /\
+                       and([!or([a_PartitionOccurrence_WhichPart[q85] = q56 /\ q85 = q41 | q85 : int(1..2)]) ->
+                            (a_PartitionOccurrence_WhichPart[q41] = q23 ->
+                             toInt(or([a_PartitionOccurrence_WhichPart[q84] = q56 /\ q84 = q41 | q84 : int(1..2)])) =
+                             sum([toInt(a_PartitionOccurrence_WhichPart[q43] = q23) * catchUndef(toInt(q43 = q41), 0)
+                                      | q43 : int(1..2)]))
+                                | q41 : int(1..2), q41 < q38]))))
+                        | q38 : int(1..2)]))
+               ->
+               toInt(or([q141 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q144] = q141 ->
+                               or([a_PartitionOccurrence_WhichPart[q146] = q56 /\ q146 = q144 | q146 : int(1..2)])
+                                   | q144 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q148] = q56 ->
+                               or([a_PartitionOccurrence_WhichPart[q150] = q141 /\ q150 = q148 | q150 : int(1..2)])
+                                   | q148 : int(1..2)]))
+                             | q141 : int(1..2)]))
+               =
+               toInt(or([q59 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q62] = q59 ->
+                               or([a_PartitionOccurrence_WhichPart[q64] = q56 /\ q64 = q62 | q64 : int(1..2)])
+                                   | q62 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q66] = q56 ->
+                               or([b_PartitionOccurrence_WhichPart[q68] = q59 /\ q68 = q66 | q68 : int(1..2)])
+                                   | q66 : int(1..2)]))
+                             | q59 : int(1..2)]))
+                   | q56 : int(1..2)])
+          /\
+          and([and([q87 <= b_PartitionOccurrence_NumParts,
+                    !or([q101 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q104] = q101 ->
+                               or([b_PartitionOccurrence_WhichPart[q106] = q87 /\ q106 = q104 | q106 : int(1..2)])
+                                   | q104 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q108] = q87 ->
+                               or([a_PartitionOccurrence_WhichPart[q110] = q101 /\ q110 = q108 | q110 : int(1..2)])
+                                   | q108 : int(1..2)]))
+                             | q101 : int(1..2)]),
+                    or([b_PartitionOccurrence_WhichPart[q119] = q87 /\
+                        (toInt(or([b_PartitionOccurrence_WhichPart[q112] = q87 /\ q112 = q119 | q112 : int(1..2)])) <
+                         sum([toInt(a_PartitionOccurrence_WhichPart[q49] = q23) * catchUndef(toInt(q49 = q119), 0)
+                                  | q49 : int(1..2)])
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q115] = q87 ->
+                               toInt(or([b_PartitionOccurrence_WhichPart[q114] = q87 /\ q114 = q115
+                                             | q114 : int(1..2)]))
+                               =
+                               sum([toInt(a_PartitionOccurrence_WhichPart[q55] = q23) * catchUndef(toInt(q55 = q115), 0)
+                                        | q55 : int(1..2)])
+                                   | q115 : int(1..2), q115 < q119])
+                          /\
+                          and([!or([b_PartitionOccurrence_WhichPart[q118] = q87 /\ q118 = q50 | q118 : int(1..2)]) ->
+                               (a_PartitionOccurrence_WhichPart[q50] = q23 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q117] = q87 /\ q117 = q50
+                                              | q117 : int(1..2)]))
+                                =
+                                sum([toInt(a_PartitionOccurrence_WhichPart[q52] = q23) * catchUndef(toInt(q52 = q50), 0)
+                                         | q52 : int(1..2)]))
+                                   | q50 : int(1..2), q50 < q119])))
+                            | q119 : int(1..2)])
+                    \/
+                    or([!or([b_PartitionOccurrence_WhichPart[q128] = q87 /\ q128 = q38 | q128 : int(1..2)]) /\
+                        (a_PartitionOccurrence_WhichPart[q38] = q23 /\
+                         (toInt(or([b_PartitionOccurrence_WhichPart[q121] = q87 /\ q121 = q38 | q121 : int(1..2)])) <
+                          sum([toInt(a_PartitionOccurrence_WhichPart[q40] = q23) * catchUndef(toInt(q40 = q38), 0)
+                                   | q40 : int(1..2)])
+                          /\
+                          (and([b_PartitionOccurrence_WhichPart[q124] = q87 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q123] = q87 /\ q123 = q124
+                                              | q123 : int(1..2)]))
+                                =
+                                sum([toInt(a_PartitionOccurrence_WhichPart[q46] = q23) *
+                                     catchUndef(toInt(q46 = q124), 0)
+                                         | q46 : int(1..2)])
+                                    | q124 : int(1..2), q124 < q38])
+                           /\
+                           and([!or([b_PartitionOccurrence_WhichPart[q127] = q87 /\ q127 = q41 | q127 : int(1..2)]) ->
+                                (a_PartitionOccurrence_WhichPart[q41] = q23 ->
+                                 toInt(or([b_PartitionOccurrence_WhichPart[q126] = q87 /\ q126 = q41
+                                               | q126 : int(1..2)]))
+                                 =
+                                 sum([toInt(a_PartitionOccurrence_WhichPart[q43] = q23) *
+                                      catchUndef(toInt(q43 = q41), 0)
+                                          | q43 : int(1..2)]))
+                                    | q41 : int(1..2), q41 < q38]))))
+                            | q38 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q130 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q133] = q130 ->
+                               or([b_PartitionOccurrence_WhichPart[q135] = q87 /\ q135 = q133 | q135 : int(1..2)])
+                                   | q133 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q137] = q87 ->
+                               or([a_PartitionOccurrence_WhichPart[q139] = q130 /\ q139 = q137 | q139 : int(1..2)])
+                                   | q137 : int(1..2)]))
+                             | q130 : int(1..2)]))
+               =
+               toInt(or([q90 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q93] = q90 ->
+                               or([b_PartitionOccurrence_WhichPart[q95] = q87 /\ q95 = q93 | q95 : int(1..2)])
+                                   | q93 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q97] = q87 ->
+                               or([b_PartitionOccurrence_WhichPart[q99] = q90 /\ q99 = q97 | q99 : int(1..2)])
+                                   | q97 : int(1..2)]))
+                             | q90 : int(1..2)]))
+                   | q87 : int(1..2)])))
+            | q23 : int(1..2)])
+    \/
+    or([q162 <= b_PartitionOccurrence_NumParts /\
+        !or([q302 <= a_PartitionOccurrence_NumParts /\
+             (and([a_PartitionOccurrence_WhichPart[q305] = q302 ->
+                   or([b_PartitionOccurrence_WhichPart[q307] = q162 /\ q307 = q305 | q307 : int(1..2)])
+                       | q305 : int(1..2)])
+              /\
+              and([b_PartitionOccurrence_WhichPart[q309] = q162 ->
+                   or([a_PartitionOccurrence_WhichPart[q311] = q302 /\ q311 = q309 | q311 : int(1..2)])
+                       | q309 : int(1..2)]))
+                 | q302 : int(1..2)])
+        /\
+        (toInt(or([q291 <= a_PartitionOccurrence_NumParts /\
+                   (and([a_PartitionOccurrence_WhichPart[q294] = q291 ->
+                         or([b_PartitionOccurrence_WhichPart[q296] = q162 /\ q296 = q294 | q296 : int(1..2)])
+                             | q294 : int(1..2)])
+                    /\
+                    and([b_PartitionOccurrence_WhichPart[q298] = q162 ->
+                         or([a_PartitionOccurrence_WhichPart[q300] = q291 /\ q300 = q298 | q300 : int(1..2)])
+                             | q298 : int(1..2)]))
+                       | q291 : int(1..2)]))
+         <
+         toInt(or([q165 <= b_PartitionOccurrence_NumParts /\
+                   (and([b_PartitionOccurrence_WhichPart[q168] = q165 ->
+                         or([b_PartitionOccurrence_WhichPart[q170] = q162 /\ q170 = q168 | q170 : int(1..2)])
+                             | q168 : int(1..2)])
+                    /\
+                    and([b_PartitionOccurrence_WhichPart[q172] = q162 ->
+                         or([b_PartitionOccurrence_WhichPart[q174] = q165 /\ q174 = q172 | q174 : int(1..2)])
+                             | q172 : int(1..2)]))
+                       | q165 : int(1..2)]))
+         /\
+         (and([q195 <= a_PartitionOccurrence_NumParts /\
+               (or([a_PartitionOccurrence_WhichPart[q216] = q195 /\
+                    (toInt(or([a_PartitionOccurrence_WhichPart[q209] = q195 /\ q209 = q216 | q209 : int(1..2)])) <
+                     sum([toInt(b_PartitionOccurrence_WhichPart[q188] = q162) * catchUndef(toInt(q188 = q216), 0)
+                              | q188 : int(1..2)])
+                     /\
+                     (and([a_PartitionOccurrence_WhichPart[q212] = q195 ->
+                           toInt(or([a_PartitionOccurrence_WhichPart[q211] = q195 /\ q211 = q212 | q211 : int(1..2)])) =
+                           sum([toInt(b_PartitionOccurrence_WhichPart[q194] = q162) * catchUndef(toInt(q194 = q212), 0)
+                                    | q194 : int(1..2)])
+                               | q212 : int(1..2), q212 < q216])
+                      /\
+                      and([!or([a_PartitionOccurrence_WhichPart[q215] = q195 /\ q215 = q189 | q215 : int(1..2)]) ->
+                           (b_PartitionOccurrence_WhichPart[q189] = q162 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q214] = q195 /\ q214 = q189 | q214 : int(1..2)]))
+                            =
+                            sum([toInt(b_PartitionOccurrence_WhichPart[q191] = q162) * catchUndef(toInt(q191 = q189), 0)
+                                     | q191 : int(1..2)]))
+                               | q189 : int(1..2), q189 < q216])))
+                        | q216 : int(1..2)])
+                \/
+                or([!or([a_PartitionOccurrence_WhichPart[q225] = q195 /\ q225 = q177 | q225 : int(1..2)]) /\
+                    (b_PartitionOccurrence_WhichPart[q177] = q162 /\
+                     (toInt(or([a_PartitionOccurrence_WhichPart[q218] = q195 /\ q218 = q177 | q218 : int(1..2)])) <
+                      sum([toInt(b_PartitionOccurrence_WhichPart[q179] = q162) * catchUndef(toInt(q179 = q177), 0)
+                               | q179 : int(1..2)])
+                      /\
+                      (and([a_PartitionOccurrence_WhichPart[q221] = q195 ->
+                            toInt(or([a_PartitionOccurrence_WhichPart[q220] = q195 /\ q220 = q221 | q220 : int(1..2)]))
+                            =
+                            sum([toInt(b_PartitionOccurrence_WhichPart[q185] = q162) * catchUndef(toInt(q185 = q221), 0)
+                                     | q185 : int(1..2)])
+                                | q221 : int(1..2), q221 < q177])
+                       /\
+                       and([!or([a_PartitionOccurrence_WhichPart[q224] = q195 /\ q224 = q180 | q224 : int(1..2)]) ->
+                            (b_PartitionOccurrence_WhichPart[q180] = q162 ->
+                             toInt(or([a_PartitionOccurrence_WhichPart[q223] = q195 /\ q223 = q180 | q223 : int(1..2)]))
+                             =
+                             sum([toInt(b_PartitionOccurrence_WhichPart[q182] = q162) *
+                                  catchUndef(toInt(q182 = q180), 0)
+                                      | q182 : int(1..2)]))
+                                | q180 : int(1..2), q180 < q177]))))
+                        | q177 : int(1..2)]))
+               ->
+               toInt(or([q280 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q283] = q280 ->
+                               or([a_PartitionOccurrence_WhichPart[q285] = q195 /\ q285 = q283 | q285 : int(1..2)])
+                                   | q283 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q287] = q195 ->
+                               or([a_PartitionOccurrence_WhichPart[q289] = q280 /\ q289 = q287 | q289 : int(1..2)])
+                                   | q287 : int(1..2)]))
+                             | q280 : int(1..2)]))
+               =
+               toInt(or([q198 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q201] = q198 ->
+                               or([a_PartitionOccurrence_WhichPart[q203] = q195 /\ q203 = q201 | q203 : int(1..2)])
+                                   | q201 : int(1..2)])
+                          /\
+                          and([a_PartitionOccurrence_WhichPart[q205] = q195 ->
+                               or([b_PartitionOccurrence_WhichPart[q207] = q198 /\ q207 = q205 | q207 : int(1..2)])
+                                   | q205 : int(1..2)]))
+                             | q198 : int(1..2)]))
+                   | q195 : int(1..2)])
+          /\
+          and([and([q226 <= b_PartitionOccurrence_NumParts,
+                    !or([q240 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q243] = q240 ->
+                               or([b_PartitionOccurrence_WhichPart[q245] = q226 /\ q245 = q243 | q245 : int(1..2)])
+                                   | q243 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q247] = q226 ->
+                               or([a_PartitionOccurrence_WhichPart[q249] = q240 /\ q249 = q247 | q249 : int(1..2)])
+                                   | q247 : int(1..2)]))
+                             | q240 : int(1..2)]),
+                    or([b_PartitionOccurrence_WhichPart[q258] = q226 /\
+                        (toInt(or([b_PartitionOccurrence_WhichPart[q251] = q226 /\ q251 = q258 | q251 : int(1..2)])) <
+                         sum([toInt(b_PartitionOccurrence_WhichPart[q188] = q162) * catchUndef(toInt(q188 = q258), 0)
+                                  | q188 : int(1..2)])
+                         /\
+                         (and([b_PartitionOccurrence_WhichPart[q254] = q226 ->
+                               toInt(or([b_PartitionOccurrence_WhichPart[q253] = q226 /\ q253 = q254
+                                             | q253 : int(1..2)]))
+                               =
+                               sum([toInt(b_PartitionOccurrence_WhichPart[q194] = q162) *
+                                    catchUndef(toInt(q194 = q254), 0)
+                                        | q194 : int(1..2)])
+                                   | q254 : int(1..2), q254 < q258])
+                          /\
+                          and([!or([b_PartitionOccurrence_WhichPart[q257] = q226 /\ q257 = q189 | q257 : int(1..2)]) ->
+                               (b_PartitionOccurrence_WhichPart[q189] = q162 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q256] = q226 /\ q256 = q189
+                                              | q256 : int(1..2)]))
+                                =
+                                sum([toInt(b_PartitionOccurrence_WhichPart[q191] = q162) *
+                                     catchUndef(toInt(q191 = q189), 0)
+                                         | q191 : int(1..2)]))
+                                   | q189 : int(1..2), q189 < q258])))
+                            | q258 : int(1..2)])
+                    \/
+                    or([!or([b_PartitionOccurrence_WhichPart[q267] = q226 /\ q267 = q177 | q267 : int(1..2)]) /\
+                        (b_PartitionOccurrence_WhichPart[q177] = q162 /\
+                         (toInt(or([b_PartitionOccurrence_WhichPart[q260] = q226 /\ q260 = q177 | q260 : int(1..2)])) <
+                          sum([toInt(b_PartitionOccurrence_WhichPart[q179] = q162) * catchUndef(toInt(q179 = q177), 0)
+                                   | q179 : int(1..2)])
+                          /\
+                          (and([b_PartitionOccurrence_WhichPart[q263] = q226 ->
+                                toInt(or([b_PartitionOccurrence_WhichPart[q262] = q226 /\ q262 = q263
+                                              | q262 : int(1..2)]))
+                                =
+                                sum([toInt(b_PartitionOccurrence_WhichPart[q185] = q162) *
+                                     catchUndef(toInt(q185 = q263), 0)
+                                         | q185 : int(1..2)])
+                                    | q263 : int(1..2), q263 < q177])
+                           /\
+                           and([!or([b_PartitionOccurrence_WhichPart[q266] = q226 /\ q266 = q180 | q266 : int(1..2)]) ->
+                                (b_PartitionOccurrence_WhichPart[q180] = q162 ->
+                                 toInt(or([b_PartitionOccurrence_WhichPart[q265] = q226 /\ q265 = q180
+                                               | q265 : int(1..2)]))
+                                 =
+                                 sum([toInt(b_PartitionOccurrence_WhichPart[q182] = q162) *
+                                      catchUndef(toInt(q182 = q180), 0)
+                                          | q182 : int(1..2)]))
+                                    | q180 : int(1..2), q180 < q177]))))
+                            | q177 : int(1..2)]);
+                        int(1..3)])
+               ->
+               toInt(or([q269 <= a_PartitionOccurrence_NumParts /\
+                         (and([a_PartitionOccurrence_WhichPart[q272] = q269 ->
+                               or([b_PartitionOccurrence_WhichPart[q274] = q226 /\ q274 = q272 | q274 : int(1..2)])
+                                   | q272 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q276] = q226 ->
+                               or([a_PartitionOccurrence_WhichPart[q278] = q269 /\ q278 = q276 | q278 : int(1..2)])
+                                   | q276 : int(1..2)]))
+                             | q269 : int(1..2)]))
+               =
+               toInt(or([q229 <= b_PartitionOccurrence_NumParts /\
+                         (and([b_PartitionOccurrence_WhichPart[q232] = q229 ->
+                               or([b_PartitionOccurrence_WhichPart[q234] = q226 /\ q234 = q232 | q234 : int(1..2)])
+                                   | q232 : int(1..2)])
+                          /\
+                          and([b_PartitionOccurrence_WhichPart[q236] = q226 ->
+                               or([b_PartitionOccurrence_WhichPart[q238] = q229 /\ q238 = q236 | q238 : int(1..2)])
+                                   | q236 : int(1..2)]))
+                             | q229 : int(1..2)]))
+                   | q226 : int(1..2)])))
+            | q162 : int(1..2)]),
+    and([q1 <= a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] <= 2 | q1 : int(1..2)]),
+    and([q1 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_PartSizes[q1] = 0 | q1 : int(1..2)]),
+    a_PartitionOccurrence_NumParts <= 2,
+    a_PartitionOccurrence_NumParts = max([a_PartitionOccurrence_WhichPart[q4] | q4 : int(1..2)]),
+    and([a_PartitionOccurrence_PartSizes[q5] = sum([toInt(a_PartitionOccurrence_WhichPart[q6] = q5) | q6 : int(1..2)])
+             | q5 : int(1..2)]),
+    and([q7 <= a_PartitionOccurrence_NumParts ->
+         and([a_PartitionOccurrence_WhichPart[q8] = q7 -> a_PartitionOccurrence_FirstIndex[q7] <= q8 | q8 : int(1..2)])
+             | q7 : int(1..2)]),
+    and([q7 <= a_PartitionOccurrence_NumParts ->
+         or([a_PartitionOccurrence_WhichPart[q8] = q7 /\ a_PartitionOccurrence_FirstIndex[q7] = q8 | q8 : int(1..2)])
+             | q7 : int(1..2)]),
+    and([q7 > a_PartitionOccurrence_NumParts -> a_PartitionOccurrence_FirstIndex[q7] = 1 | q7 : int(1..2)]),
+    and([q9 <= a_PartitionOccurrence_NumParts /\ q10 <= a_PartitionOccurrence_NumParts ->
+         (q9 < q10 <-> a_PartitionOccurrence_FirstIndex[q9] < a_PartitionOccurrence_FirstIndex[q10])
+             | q9 : int(1..2), q10 : int(1..2)]),
+    and([q11 <= b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q11] <= 2 | q11 : int(1..2)]),
+    and([q11 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_PartSizes[q11] = 0 | q11 : int(1..2)]),
+    b_PartitionOccurrence_NumParts <= 2,
+    b_PartitionOccurrence_NumParts = max([b_PartitionOccurrence_WhichPart[q14] | q14 : int(1..2)]),
+    and([b_PartitionOccurrence_PartSizes[q15] =
+         sum([toInt(b_PartitionOccurrence_WhichPart[q16] = q15) | q16 : int(1..2)])
+             | q15 : int(1..2)]),
+    and([q17 <= b_PartitionOccurrence_NumParts ->
+         and([b_PartitionOccurrence_WhichPart[q18] = q17 -> b_PartitionOccurrence_FirstIndex[q17] <= q18
+                  | q18 : int(1..2)])
+             | q17 : int(1..2)]),
+    and([q17 <= b_PartitionOccurrence_NumParts ->
+         or([b_PartitionOccurrence_WhichPart[q18] = q17 /\ b_PartitionOccurrence_FirstIndex[q17] = q18
+                 | q18 : int(1..2)])
+             | q17 : int(1..2)]),
+    and([q17 > b_PartitionOccurrence_NumParts -> b_PartitionOccurrence_FirstIndex[q17] = 1 | q17 : int(1..2)]),
+    and([q19 <= b_PartitionOccurrence_NumParts /\ q20 <= b_PartitionOccurrence_NumParts ->
+         (q19 < q20 <-> b_PartitionOccurrence_FirstIndex[q19] < b_PartitionOccurrence_FirstIndex[q20])
+             | q19 : int(1..2), q20 : int(1..2)])
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000001.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000001.solution
new file mode 100644
index 0000000000..9b50bb2ed2
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000001.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((2, true))
+$ Visualisation for b
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000002.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000002.solution
new file mode 100644
index 0000000000..e05e181325
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000002.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((2, false))
+$ Visualisation for b
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000003.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000003.solution
new file mode 100644
index 0000000000..a14764841f
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000003.solution
@@ -0,0 +1,8 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((2, false), (2, true))
+$ Visualisation for b
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000004.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000004.solution
new file mode 100644
index 0000000000..2d2025d4dc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000004.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, true))
+$ Visualisation for b
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000005.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000005.solution
new file mode 100644
index 0000000000..9e94a7fc99
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000005.solution
@@ -0,0 +1,8 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, true), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000006.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000006.solution
new file mode 100644
index 0000000000..a23fdb9592
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000006.solution
@@ -0,0 +1,8 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, true), (2, false))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000007.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000007.solution
new file mode 100644
index 0000000000..c6e284fe39
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000007.solution
@@ -0,0 +1,9 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000008.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000008.solution
new file mode 100644
index 0000000000..b9ac1ab260
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000008.solution
@@ -0,0 +1,7 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000009.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000009.solution
new file mode 100644
index 0000000000..4c3b9b516b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000009.solution
@@ -0,0 +1,8 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000010.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000010.solution
new file mode 100644
index 0000000000..390eb51d64
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000010.solution
@@ -0,0 +1,8 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000011.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000011.solution
new file mode 100644
index 0000000000..5f6b5bb3eb
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000011.solution
@@ -0,0 +1,9 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000012.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000012.solution
new file mode 100644
index 0000000000..96b3f7a61d
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000012.solution
@@ -0,0 +1,8 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000013.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000013.solution
new file mode 100644
index 0000000000..7c1b31979c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000013.solution
@@ -0,0 +1,9 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000014.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000014.solution
new file mode 100644
index 0000000000..df3bcc7d19
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000014.solution
@@ -0,0 +1,9 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000015.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000015.solution
new file mode 100644
index 0000000000..57c4c4d4cc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000015.solution
@@ -0,0 +1,10 @@
+language Essence 1.3
+
+letting a be relation()
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000016.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000016.solution
new file mode 100644
index 0000000000..d6c83fac87
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000016.solution
@@ -0,0 +1,10 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((2, false))
+$ Visualisation for b
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000017.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000017.solution
new file mode 100644
index 0000000000..2e03b77f68
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000017.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((2, false), (2, true))
+$ Visualisation for b
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000018.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000018.solution
new file mode 100644
index 0000000000..5a8a614393
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000018.solution
@@ -0,0 +1,10 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, true))
+$ Visualisation for b
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000019.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000019.solution
new file mode 100644
index 0000000000..827334e801
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000019.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, true), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000020.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000020.solution
new file mode 100644
index 0000000000..ff0da926b6
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000020.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, true), (2, false))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000021.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000021.solution
new file mode 100644
index 0000000000..6e71bd9351
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000021.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000022.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000022.solution
new file mode 100644
index 0000000000..632f76f414
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000022.solution
@@ -0,0 +1,10 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000023.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000023.solution
new file mode 100644
index 0000000000..59e96b0a9d
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000023.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000024.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000024.solution
new file mode 100644
index 0000000000..cb604edb99
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000024.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000025.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000025.solution
new file mode 100644
index 0000000000..b5fdc4c3d5
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000025.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000026.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000026.solution
new file mode 100644
index 0000000000..73274c8b53
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000026.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000027.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000027.solution
new file mode 100644
index 0000000000..740843554e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000027.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000028.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000028.solution
new file mode 100644
index 0000000000..29f3289516
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000028.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000029.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000029.solution
new file mode 100644
index 0000000000..fdeebbf013
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000029.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((2, true))
+$ Visualisation for a
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000030.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000030.solution
new file mode 100644
index 0000000000..eaccbb5373
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000030.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((2, false), (2, true))
+$ Visualisation for b
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000031.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000031.solution
new file mode 100644
index 0000000000..3eaa95be98
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000031.solution
@@ -0,0 +1,10 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, true))
+$ Visualisation for b
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000032.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000032.solution
new file mode 100644
index 0000000000..d5abbfe57c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000032.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, true), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000033.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000033.solution
new file mode 100644
index 0000000000..d9f72172e5
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000033.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, true), (2, false))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000034.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000034.solution
new file mode 100644
index 0000000000..57c910c0e2
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000034.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000035.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000035.solution
new file mode 100644
index 0000000000..24b2054619
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000035.solution
@@ -0,0 +1,10 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000036.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000036.solution
new file mode 100644
index 0000000000..bef7f6af5e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000036.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000037.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000037.solution
new file mode 100644
index 0000000000..03d588c94a
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000037.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000038.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000038.solution
new file mode 100644
index 0000000000..0cee2c9e7b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000038.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000039.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000039.solution
new file mode 100644
index 0000000000..886c2f905b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000039.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000040.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000040.solution
new file mode 100644
index 0000000000..769d0184ce
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000040.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000041.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000041.solution
new file mode 100644
index 0000000000..5f5262aec4
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000041.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000042.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000042.solution
new file mode 100644
index 0000000000..11990b806d
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000042.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((2, false))
+$ Visualisation for a
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000043.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000043.solution
new file mode 100644
index 0000000000..aacbe14a36
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000043.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, true))
+$ Visualisation for b
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000044.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000044.solution
new file mode 100644
index 0000000000..b15348099a
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000044.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, true), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000045.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000045.solution
new file mode 100644
index 0000000000..3b8561efe4
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000045.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, true), (2, false))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000046.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000046.solution
new file mode 100644
index 0000000000..c8c72a43bf
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000046.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000047.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000047.solution
new file mode 100644
index 0000000000..1e024d6569
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000047.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000048.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000048.solution
new file mode 100644
index 0000000000..689794b9e5
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000048.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000049.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000049.solution
new file mode 100644
index 0000000000..d53edacbed
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000049.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000050.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000050.solution
new file mode 100644
index 0000000000..2ffb1e0713
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000050.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000051.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000051.solution
new file mode 100644
index 0000000000..45ae15ca2f
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000051.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000052.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000052.solution
new file mode 100644
index 0000000000..e34aca5265
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000052.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000053.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000053.solution
new file mode 100644
index 0000000000..0650195dfa
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000053.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000054.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000054.solution
new file mode 100644
index 0000000000..d005ee72f3
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000054.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((2, false), (2, true))
+$ Visualisation for a
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000055.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000055.solution
new file mode 100644
index 0000000000..b97e565a71
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000055.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, true), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000056.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000056.solution
new file mode 100644
index 0000000000..1c2c273c2b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000056.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, true), (2, false))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000057.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000057.solution
new file mode 100644
index 0000000000..d22929e033
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000057.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000058.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000058.solution
new file mode 100644
index 0000000000..131f4ca60d
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000058.solution
@@ -0,0 +1,10 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000059.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000059.solution
new file mode 100644
index 0000000000..cdc3c8c342
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000059.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000060.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000060.solution
new file mode 100644
index 0000000000..e96d5802a8
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000060.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000061.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000061.solution
new file mode 100644
index 0000000000..bef89da48c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000061.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000062.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000062.solution
new file mode 100644
index 0000000000..ea0c4dbf09
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000062.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000063.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000063.solution
new file mode 100644
index 0000000000..ffe8162de3
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000063.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000064.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000064.solution
new file mode 100644
index 0000000000..40a475eb0a
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000064.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000065.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000065.solution
new file mode 100644
index 0000000000..bb4a540328
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000065.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true))
+$ Visualisation for a
+$ 1 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000066.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000066.solution
new file mode 100644
index 0000000000..a6d6d0a1d9
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000066.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, true), (2, false))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000067.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000067.solution
new file mode 100644
index 0000000000..30730a76db
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000067.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000068.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000068.solution
new file mode 100644
index 0000000000..2bda2ef994
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000068.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000069.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000069.solution
new file mode 100644
index 0000000000..edaea295f4
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000069.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000070.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000070.solution
new file mode 100644
index 0000000000..e7e730d42e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000070.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000071.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000071.solution
new file mode 100644
index 0000000000..d35c2856a3
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000071.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000072.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000072.solution
new file mode 100644
index 0000000000..2cafa9ec51
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000072.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000073.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000073.solution
new file mode 100644
index 0000000000..c6c6295627
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000073.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000074.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000074.solution
new file mode 100644
index 0000000000..15d97d4729
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000074.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000075.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000075.solution
new file mode 100644
index 0000000000..0697674c24
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000075.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000076.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000076.solution
new file mode 100644
index 0000000000..296759f9b3
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000076.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000077.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000077.solution
new file mode 100644
index 0000000000..4ea598db58
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000077.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000078.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000078.solution
new file mode 100644
index 0000000000..0537b5fb9e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000078.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000079.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000079.solution
new file mode 100644
index 0000000000..cb0d5e93ae
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000079.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000080.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000080.solution
new file mode 100644
index 0000000000..71bf1f4226
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000080.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000081.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000081.solution
new file mode 100644
index 0000000000..4a56054133
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000081.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000082.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000082.solution
new file mode 100644
index 0000000000..0afa181179
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000082.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000083.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000083.solution
new file mode 100644
index 0000000000..a556323487
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000083.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000084.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000084.solution
new file mode 100644
index 0000000000..847e586971
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000084.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000085.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000085.solution
new file mode 100644
index 0000000000..8b71d47ea9
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000085.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false))
+$ Visualisation for b
+$ 1 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000086.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000086.solution
new file mode 100644
index 0000000000..918b7b8edd
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000086.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000087.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000087.solution
new file mode 100644
index 0000000000..ca6ddd39f8
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000087.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000088.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000088.solution
new file mode 100644
index 0000000000..dca6353d9f
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000088.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000089.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000089.solution
new file mode 100644
index 0000000000..984e3636be
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000089.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000090.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000090.solution
new file mode 100644
index 0000000000..5b5350f84d
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000090.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000091.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000091.solution
new file mode 100644
index 0000000000..8c4f2ec1d5
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000091.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000092.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000092.solution
new file mode 100644
index 0000000000..3d9f447820
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000092.solution
@@ -0,0 +1,15 @@
+language Essence 1.3
+
+letting a be relation((1, true), (2, false), (2, true))
+$ Visualisation for a
+$ 1 T
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000093.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000093.solution
new file mode 100644
index 0000000000..20ba97a49b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000093.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, false))
+$ Visualisation for a
+$ 1 _
+
+letting b be relation((1, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000094.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000094.solution
new file mode 100644
index 0000000000..a6299cb56e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000094.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, false))
+$ Visualisation for a
+$ 1 _
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000095.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000095.solution
new file mode 100644
index 0000000000..68ef4a2d32
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000095.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, false))
+$ Visualisation for a
+$ 1 _
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000096.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000096.solution
new file mode 100644
index 0000000000..9191690a29
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000096.solution
@@ -0,0 +1,11 @@
+language Essence 1.3
+
+letting a be relation((1, false))
+$ Visualisation for a
+$ 1 _
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000097.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000097.solution
new file mode 100644
index 0000000000..be125318a4
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000097.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, false))
+$ Visualisation for a
+$ 1 _
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000098.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000098.solution
new file mode 100644
index 0000000000..3ee2e652e1
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000098.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, false))
+$ Visualisation for a
+$ 1 _
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000099.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000099.solution
new file mode 100644
index 0000000000..100fb99ae9
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000099.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false))
+$ Visualisation for a
+$ 1 _
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000100.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000100.solution
new file mode 100644
index 0000000000..fe1c124d6b
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000100.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 T
+
+letting b be relation((1, false), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000101.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000101.solution
new file mode 100644
index 0000000000..45605841d1
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000101.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 T
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000102.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000102.solution
new file mode 100644
index 0000000000..5b09524f76
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000102.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 T
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000103.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000103.solution
new file mode 100644
index 0000000000..289bf90bb7
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000103.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000104.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000104.solution
new file mode 100644
index 0000000000..acdc5ef598
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000104.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000105.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000105.solution
new file mode 100644
index 0000000000..c38106e519
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000105.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000106.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000106.solution
new file mode 100644
index 0000000000..4a64f01e99
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000106.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+
+letting b be relation((1, false), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000107.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000107.solution
new file mode 100644
index 0000000000..9ec48a3bc7
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000107.solution
@@ -0,0 +1,12 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000108.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000108.solution
new file mode 100644
index 0000000000..8531b893a9
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000108.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000109.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000109.solution
new file mode 100644
index 0000000000..e41a986c0c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000109.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000110.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000110.solution
new file mode 100644
index 0000000000..f39c9292d8
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000110.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000111.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000111.solution
new file mode 100644
index 0000000000..0801593375
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000111.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000112.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000112.solution
new file mode 100644
index 0000000000..8604ea0029
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000112.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000113.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000113.solution
new file mode 100644
index 0000000000..13ec11e78c
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000113.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000114.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000114.solution
new file mode 100644
index 0000000000..5df1f52cfb
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000114.solution
@@ -0,0 +1,15 @@
+language Essence 1.3
+
+letting a be relation((1, false), (2, false), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 2 _
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000115.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000115.solution
new file mode 100644
index 0000000000..08d44b1cbc
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000115.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (1, true))
+$ Visualisation for a
+$ 1 _
+$ 1 T
+
+letting b be relation((1, false), (1, true), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000116.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000116.solution
new file mode 100644
index 0000000000..61c43b3425
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000116.solution
@@ -0,0 +1,13 @@
+language Essence 1.3
+
+letting a be relation((1, false), (1, true))
+$ Visualisation for a
+$ 1 _
+$ 1 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000117.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000117.solution
new file mode 100644
index 0000000000..53b30afee2
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000117.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, false), (1, true))
+$ Visualisation for a
+$ 1 _
+$ 1 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000118.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000118.solution
new file mode 100644
index 0000000000..f9f326b9b0
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000118.solution
@@ -0,0 +1,14 @@
+language Essence 1.3
+
+letting a be relation((1, false), (1, true), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000119.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000119.solution
new file mode 100644
index 0000000000..1bbce78897
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000119.solution
@@ -0,0 +1,15 @@
+language Essence 1.3
+
+letting a be relation((1, false), (1, true), (2, true))
+$ Visualisation for a
+$ 1 _
+$ 1 T
+$ 2 T
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000120.solution b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000120.solution
new file mode 100644
index 0000000000..0e39505c9e
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model-solution000120.solution
@@ -0,0 +1,15 @@
+language Essence 1.3
+
+letting a be relation((1, false), (1, true), (2, false))
+$ Visualisation for a
+$ 1 _
+$ 1 T
+$ 2 _
+
+letting b be relation((1, false), (1, true), (2, false), (2, true))
+$ Visualisation for b
+$ 1 _
+$ 1 T
+$ 2 _
+$ 2 T
+
diff --git a/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model.eprime b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model.eprime
new file mode 100644
index 0000000000..02a8b92b47
--- /dev/null
+++ b/tests/exhaustive/tildeOrd/tildeOrd_relation_01/expected/model.eprime
@@ -0,0 +1,62 @@
+language ESSENCE' 1.0
+
+find a_RelationAsMatrix: matrix indexed by [int(1..2), bool] of bool
+find b_RelationAsMatrix: matrix indexed by [int(1..2), bool] of bool
+branching on [a_RelationAsMatrix, b_RelationAsMatrix]
+such that
+    or([a_RelationAsMatrix[q7_1, q7_2] /\
+        (sum([toInt(a_RelationAsMatrix[q23_1, q23_2]) * catchUndef(toInt(q23_1 = q7_1 /\ q23_2 = q7_2), 0)
+                  | q23_1 : int(1..2), q23_2 : bool])
+         <
+         sum([toInt(b_RelationAsMatrix[q9_1, q9_2]) * catchUndef(toInt(q9_1 = q7_1 /\ q9_2 = q7_2), 0)
+                  | q9_1 : int(1..2), q9_2 : bool])
+         /\
+         (and([a_RelationAsMatrix[q10_1, q10_2] ->
+               sum([toInt(a_RelationAsMatrix[q21_1, q21_2]) * catchUndef(toInt(q21_1 = q10_1 /\ q21_2 = q10_2), 0)
+                        | q21_1 : int(1..2), q21_2 : bool])
+               =
+               sum([toInt(b_RelationAsMatrix[q12_1, q12_2]) * catchUndef(toInt(q12_1 = q10_1 /\ q12_2 = q10_2), 0)
+                        | q12_1 : int(1..2), q12_2 : bool])
+                   | q10_1 : int(1..2), q10_2 : bool, q10_1 < q7_1 \/ q10_1 = q7_1 /\ q10_2 < q7_2])
+          /\
+          and([b_RelationAsMatrix[q13_1, q13_2] /\
+               !or([a_RelationAsMatrix[q17_1, q17_2] /\ (q17_1 = q13_1 /\ q17_2 = q13_2)
+                        | q17_1 : int(1..2), q17_2 : bool])
+               ->
+               sum([toInt(a_RelationAsMatrix[q19_1, q19_2]) * catchUndef(toInt(q19_1 = q13_1 /\ q19_2 = q13_2), 0)
+                        | q19_1 : int(1..2), q19_2 : bool])
+               =
+               sum([toInt(b_RelationAsMatrix[q15_1, q15_2]) * catchUndef(toInt(q15_1 = q13_1 /\ q15_2 = q13_2), 0)
+                        | q15_1 : int(1..2), q15_2 : bool])
+                   | q13_1 : int(1..2), q13_2 : bool, q13_1 < q7_1 \/ q13_1 = q7_1 /\ q13_2 < q7_2])))
+            | q7_1 : int(1..2), q7_2 : bool])
+    \/
+    or([b_RelationAsMatrix[q24_1, q24_2] /\
+        !or([a_RelationAsMatrix[q42_1, q42_2] /\ (q42_1 = q24_1 /\ q42_2 = q24_2) | q42_1 : int(1..2), q42_2 : bool])
+        /\
+        (sum([toInt(a_RelationAsMatrix[q40_1, q40_2]) * catchUndef(toInt(q40_1 = q24_1 /\ q40_2 = q24_2), 0)
+                  | q40_1 : int(1..2), q40_2 : bool])
+         <
+         sum([toInt(b_RelationAsMatrix[q26_1, q26_2]) * catchUndef(toInt(q26_1 = q24_1 /\ q26_2 = q24_2), 0)
+                  | q26_1 : int(1..2), q26_2 : bool])
+         /\
+         (and([a_RelationAsMatrix[q27_1, q27_2] ->
+               sum([toInt(a_RelationAsMatrix[q38_1, q38_2]) * catchUndef(toInt(q38_1 = q27_1 /\ q38_2 = q27_2), 0)
+                        | q38_1 : int(1..2), q38_2 : bool])
+               =
+               sum([toInt(b_RelationAsMatrix[q29_1, q29_2]) * catchUndef(toInt(q29_1 = q27_1 /\ q29_2 = q27_2), 0)
+                        | q29_1 : int(1..2), q29_2 : bool])
+                   | q27_1 : int(1..2), q27_2 : bool, q27_1 < q24_1 \/ q27_1 = q24_1 /\ q27_2 < q24_2])
+          /\
+          and([b_RelationAsMatrix[q30_1, q30_2] /\
+               !or([a_RelationAsMatrix[q34_1, q34_2] /\ (q34_1 = q30_1 /\ q34_2 = q30_2)
+                        | q34_1 : int(1..2), q34_2 : bool])
+               ->
+               sum([toInt(a_RelationAsMatrix[q36_1, q36_2]) * catchUndef(toInt(q36_1 = q30_1 /\ q36_2 = q30_2), 0)
+                        | q36_1 : int(1..2), q36_2 : bool])
+               =
+               sum([toInt(b_RelationAsMatrix[q32_1, q32_2]) * catchUndef(toInt(q32_1 = q30_1 /\ q32_2 = q30_2), 0)
+                        | q32_1 : int(1..2), q32_2 : bool])
+                   | q30_1 : int(1..2), q30_2 : bool, q30_1 < q24_1 \/ q30_1 = q24_1 /\ q30_2 < q24_2])))
+            | q24_1 : int(1..2), q24_2 : bool])
+
diff --git a/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/model.expected.json b/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/model.expected.json
index 3b8e1c73f5..f2bd73bf78 100644
--- a/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/model.expected.json
@@ -1167,7 +1167,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1349,7 +1349,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1606,7 +1606,7 @@
                                                                                               [{"TagInt": []},
                                                                                                2]}}]}]]},
                                                                        [{"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
@@ -1719,7 +1719,7 @@
                                                                                                                                               []},
                                                                                                                                          2]}}}}]}}]}},
                                                                                               {"Op":
-                                                                                                   {"MkOpLexLt":
+                                                                                                   {"MkOpDotLt":
                                                                                                         [{"Op":
                                                                                                               {"MkOpSlicing":
                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/stdout.expected b/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/stdout.expected
index 11ec8f266d..e0529f8cab 100644
--- a/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/00f3f6e00d6aaa0c44f7a7bfaeabf301/stdout.expected
@@ -71,7 +71,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -84,7 +84,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..3)]),
@@ -103,7 +103,7 @@ such that
          (2 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 2, ..]
           \/
@@ -115,7 +115,7 @@ such that
           /\
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 2, ..])
              | q7 : int(1..4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/model.expected.json
index 9b20daf7c2..e89804b3ab 100644
--- a/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/model.expected.json
@@ -77,7 +77,7 @@
                         {"RangeSingle": {"Constant": {"ConstantInt": [{"TagInt": []}, 4]}}}]]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Comprehension":
                             [{"Reference": [{"Name": "l_1"}, null]},
                              [{"Generator": {"GenDomainNoRepr": [{"Single": {"Name": "l_1"}}, {"DomainBool": []}]}},
diff --git a/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/stdout.expected
index 6755e07b70..240a1ce155 100644
--- a/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0155ed23298044f98c24b049e9f674d5/stdout.expected
@@ -7,6 +7,6 @@ find var2:
 find var3: matrix indexed by [int(2, 0..5)] of int(0..3, 2..3)
 find var4: int(5, 4)
 such that
-    [l_1 | l_1 : bool, l_1] <lex [[true; int(0)], [true, true; int(1, 5)]; int(5, 2)][0],
+    [l_1 | l_1 : bool, l_1] .< [[true; int(0)], [true, true; int(1, 5)]; int(5, 2)][0],
     true,
     false
diff --git a/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/model.expected.json b/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/model.expected.json
index 2a3a4eafdf..c163cccef9 100644
--- a/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/model.expected.json
@@ -251,7 +251,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -401,7 +401,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1286,7 +1286,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/stdout.expected b/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/stdout.expected
index a9e18652c0..1d88a80ff7 100644
--- a/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/016e7609f3aa273a2a9d8f851cda23b0/stdout.expected
@@ -19,7 +19,7 @@ such that
          /\
          (var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1, ..]
-          <lex
+          .<
           var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1 + 1, ..]
           \/
@@ -32,7 +32,7 @@ such that
           /\
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..4)]),
@@ -100,7 +100,7 @@ such that
               /\
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11 + 1, ..]
                   | q11 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/model.expected.json b/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/model.expected.json
index ce53c4fea6..66bb272743 100644
--- a/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/model.expected.json
@@ -459,7 +459,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -609,7 +609,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    3]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1412,7 +1412,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/stdout.expected b/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/stdout.expected
index 084596722c..c09efa6e49 100644
--- a/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/03336ac6e1e3f3c00e3feb6957358811/stdout.expected
@@ -38,7 +38,7 @@ such that
          /\
          (var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q5, ..]
-          <lex
+          .<
           var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q5 + 1, ..]
           \/
@@ -51,7 +51,7 @@ such that
           /\
           flatten(var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..15)]),
@@ -123,7 +123,7 @@ such that
               /\
               var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q13, ..]
-              <lex
+              .<
               var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q13 + 1, ..]
                   | q13 : int(1..2)])
diff --git a/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/model.expected.json
index b4ede9bcf6..fcce71a699 100644
--- a/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/model.expected.json
@@ -349,7 +349,7 @@
                                                                                                                                                                []},
                                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                                    {"Op":
-                                                                                                        {"MkOpLexLt":
+                                                                                                        {"MkOpDotLt":
                                                                                                              [{"Op":
                                                                                                                    {"MkOpSlicing":
                                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/stdout.expected
index fad617bc13..6db0015909 100644
--- a/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/039a29d0d4631598657b8b2611a05cf6/stdout.expected
@@ -24,7 +24,7 @@ such that
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_1[q11, q12] =
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_1[q11, q12 + 1]
               /\
-              var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q11, q12, ..] <lex
+              var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q11, q12, ..] .<
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q11, q12 + 1, ..]
                   | q12 : int(1..3)])
              | q11 : int(5, 4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/model.expected.json b/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/model.expected.json
index ecc66a4fdd..01c6c151cf 100644
--- a/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/model.expected.json
@@ -1768,7 +1768,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1954,7 +1954,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2257,7 +2257,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2419,7 +2419,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/stdout.expected b/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/stdout.expected
index f691b220c2..5965d2e2cf 100644
--- a/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/03fa5e0fb1010e34c88e5d085c726276/stdout.expected
@@ -114,7 +114,7 @@ such that
          /\
          (flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -128,7 +128,7 @@ such that
           /\
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -148,7 +148,7 @@ such that
          and([q2 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -161,7 +161,7 @@ such that
               /\
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/model.expected.json
index 07bf8f406a..ab5ce7464c 100644
--- a/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/model.expected.json
@@ -362,7 +362,7 @@
                                                                                                                                                                []},
                                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                                    {"Op":
-                                                                                                        {"MkOpLexLt":
+                                                                                                        {"MkOpDotLt":
                                                                                                              [{"Op":
                                                                                                                    {"MkOpSlicing":
                                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/stdout.expected
index 9e1186e8ef..0c494bd9b1 100644
--- a/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0632e804c201340757931f64f9587edb/stdout.expected
@@ -25,7 +25,7 @@ such that
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_1[q10, q11] =
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_1[q10, q11 + 1]
               /\
-              var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q10, q11, ..] <lex
+              var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q10, q11, ..] .<
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q10, q11 + 1, ..]
                   | q11 : int(1..3)])
              | q10 : int(5, 4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/model.expected.json b/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/model.expected.json
index 56d9a49a23..c307e5d0ed 100644
--- a/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/model.expected.json
@@ -1827,7 +1827,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2013,7 +2013,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2314,7 +2314,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2476,7 +2476,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/stdout.expected b/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/stdout.expected
index ef971ea61b..b2afa62697 100644
--- a/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/06af2d456d70394d86a8f427da584a37/stdout.expected
@@ -119,7 +119,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -133,7 +133,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..15)]),
@@ -153,7 +153,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -166,7 +166,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/model.expected.json b/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/model.expected.json
index 62a635b97e..f2010b7f50 100644
--- a/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Comprehension":
                             [{"Constant": {"ConstantInt": [{"TagInt": []}, 4]}},
                              [{"Generator":
diff --git a/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/stdout.expected b/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/stdout.expected
index c66284dbf3..adb24310a6 100644
--- a/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/074ea9fbacd659cc463b376a2772bf13/stdout.expected
@@ -2,5 +2,5 @@ language Essence 1.3
 
 find unused: bool
 such that
-    [4 | l_1 : int(5, 0)] <=lex
+    [4 | l_1 : int(5, 0)] .<=
     image((function() : `function mset of bool --> matrix indexed by [int] of int`), mset(false))
diff --git a/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/model.expected.json
index e9f7882e98..7f04593f9d 100644
--- a/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/model.expected.json
@@ -82,7 +82,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/stdout.expected
index e7f3cdfab4..f75f7437eb 100644
--- a/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/075527221a657e78d6f1c0a6a335371f/stdout.expected
@@ -6,7 +6,7 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Oc
 find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2: matrix indexed by [int(1..3)] of bool
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q16] ->
diff --git a/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/model.expected.json b/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/model.expected.json
index 42fa4725c1..0e8958c797 100644
--- a/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/model.expected.json
@@ -124,7 +124,7 @@
                                                   {"Reference":
                                                        [{"Name": "var1_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -849,7 +849,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -1022,7 +1022,7 @@
                                                                                                                                             []},
                                                                                                                                        5]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/stdout.expected b/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/stdout.expected
index d33df27036..fff55f0ca1 100644
--- a/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/084959e428c16c5485c7775b20480e40/stdout.expected
@@ -10,7 +10,7 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSi
 such that
     false,
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarker_Marker ->
-         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_Function1D[q1 + 1, ..]
              | q1 : int(1..63)]),
     and([q2 > var1_ExplicitVarSizeWithMarker_Marker ->
@@ -54,7 +54,7 @@ such that
     and([q10 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q10, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q10 + 1, .., ..])
          \/
@@ -66,7 +66,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q10, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q10 + 1, .., ..])
              | q10 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/model.expected.json b/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/model.expected.json
index d55227233a..de73187bd2 100644
--- a/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/model.expected.json
@@ -182,7 +182,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -319,7 +319,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -875,7 +875,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1254,7 +1254,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1388,7 +1388,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/stdout.expected b/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/stdout.expected
index 58203051da..568886ad2d 100644
--- a/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/089427b807ae2e05bb8e2512153035ee/stdout.expected
@@ -17,14 +17,14 @@ such that
                q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values : matrix indexed by [int(1..4), bool] of
                                                                                    int(5),
                and([q1 + 1 <= q_4_ExplicitVarSizeWithMarker_Marker ->
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, ..]
                     \/
                     and([q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, q9] =
                          q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, q9]
                              | q9 : bool])
                     /\
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1 + 1, ..]
                         | q1 : int(1..3)]),
                and([q1 > q_4_ExplicitVarSizeWithMarker_Marker ->
@@ -53,7 +53,7 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3 + 1]
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3 + 1, ..]
              | q3 : int(1..7)]),
     and([q3 > var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -73,14 +73,14 @@ such that
                   | q4 : int(1..3)])
              | q3 : int(1..8)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q5 + 1] ->
-         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5, ..] <lex
+         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5, ..] .<
          var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5, q10] =
               var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5 + 1, q10]
                   | q10 : bool])
          /\
-         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q5, ..] <lex
+         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q5, ..] .<
          var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q5 + 1, ..]
              | q5 : int(1..3)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q5] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/model.expected.json
index 6711c93083..92e0454dac 100644
--- a/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/model.expected.json
@@ -1361,7 +1361,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1560,7 +1560,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1888,7 +1888,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2063,7 +2063,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  2]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
@@ -2534,7 +2534,7 @@
                                   {"Reference":
                                        [{"Name": "var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                        {"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Op":
                                        {"MkOpSlicing":
                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/stdout.expected
index dfbe7aac8f..ec29df0b41 100644
--- a/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0896777a9c9ec7a2944d17b0f832af27/stdout.expected
@@ -84,7 +84,7 @@ such that
          /\
          (flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q8, .., ..])
-          <lex
+          .<
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q8 + 1, .., ..])
           \/
@@ -98,7 +98,7 @@ such that
           /\
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q8, .., ..])
-          <lex
+          .<
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q8 + 1, .., ..]))
              | q8 : int(1..65535)]),
@@ -119,7 +119,7 @@ such that
          and([q11 + 1 <= var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q10] ->
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q10, q11, ..]
-              <lex
+              .<
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q10, q11 + 1, ..]
               \/
@@ -132,7 +132,7 @@ such that
               /\
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q10, q11, ..]
-              <lex
+              .<
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q10, q11 + 1, ..]
                   | q11 : int(1..15)])
@@ -170,7 +170,7 @@ such that
          var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q31, 2] >= 1
              | q31 : int(1..2)]),
     2 <= var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-    var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, ..] <lex
+    var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, ..] .<
     var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[2, ..],
     and([q22 > var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q22, 2] = false
diff --git a/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/model.expected.json b/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/model.expected.json
index 685665ce7f..cc055bcb21 100644
--- a/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/model.expected.json
@@ -22,7 +22,7 @@
                                    {"Constant": {"ConstantBool": false}}]]}},
                        {"Op": {"MkOpToInt": {"Reference": [{"Name": "var1"}, null]}}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/stdout.expected b/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/stdout.expected
index 69797ff12e..c17f44bf91 100644
--- a/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/09ac2051b1e1a54e1b7a3b051b78bcd3/stdout.expected
@@ -3,4 +3,4 @@ language Essence 1.3
 find var1: bool
 such that
     [var1, var1, true, var1, false; int(10, 2..5)][toInt(var1)],
-    [false, false, true; int(1..3)] <=lex [var1, var1, false; int(9, 7, 5)]
+    [false, false, true; int(1..3)] .<= [var1, var1, false; int(9, 7, 5)]
diff --git a/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/model.expected.json
index 0af4102cbe..0708a5f68e 100644
--- a/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/model.expected.json
@@ -659,7 +659,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -832,7 +832,7 @@
                                                                                                                                             []},
                                                                                                                                        5]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/stdout.expected
index 801d252cd0..187620bd7f 100644
--- a/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0a4c5d1f2a6f82e1a72b0732362906b6/stdout.expected
@@ -40,7 +40,7 @@ such that
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q4 + 1, .., ..])
          \/
@@ -51,7 +51,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q4 + 1, .., ..])
              | q4 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/model.expected.json
index f3352b06f9..f380f12cbc 100644
--- a/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/model.expected.json
@@ -311,7 +311,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/stdout.expected
index 5e9cd96692..08e2115eb6 100644
--- a/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0b621881d60dee823364b01fd40f9769/stdout.expected
@@ -28,7 +28,7 @@ such that
          /\
          flatten(var2_PartitionAsSetR2_ExplicitVarSizeWithMarkerR5R2_Values_ExplicitVarSizeWithMarkerR2_Values_Occurrence
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSetR2_ExplicitVarSizeWithMarkerR5R2_Values_ExplicitVarSizeWithMarkerR2_Values_Occurrence
                      [q4 + 1, .., ..])
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/model.expected.json
index f6bb605140..0e3f3b8428 100644
--- a/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/model.expected.json
@@ -94,7 +94,7 @@
                                                                     {"Constant":
                                                                          {"ConstantInt": [{"TagInt": []}, 2]}}]}]]},
                                                        [{"Op":
-                                                             {"MkOpLexLt":
+                                                             {"MkOpDotLt":
                                                                   [{"Op":
                                                                         {"MkOpSlicing":
                                                                              [{"Op":
@@ -195,7 +195,7 @@
                                                                                                                                        []},
                                                                                                                                   2]}}]}]]}]}}]]}}},
                                                                               {"Op":
-                                                                                   {"MkOpLexLt":
+                                                                                   {"MkOpDotLt":
                                                                                         [{"Op":
                                                                                               {"MkOpSlicing":
                                                                                                    [{"Op":
@@ -534,7 +534,7 @@
                                                                                                     [{"TagInt": []},
                                                                                                      2]}}]}]]},
                                                                              [{"Op":
-                                                                                   {"MkOpLexLt":
+                                                                                   {"MkOpDotLt":
                                                                                         [{"Op":
                                                                                               {"MkOpSlicing":
                                                                                                    [{"Op":
@@ -564,7 +564,7 @@
                                                                                                                           2]}}]}},
                                                                                                     null, null]}}]}},
                                                                               {"Op":
-                                                                                   {"MkOpLexLt":
+                                                                                   {"MkOpDotLt":
                                                                                         [{"Op":
                                                                                               {"MkOpSlicing":
                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/stdout.expected
index dc3d21da99..d5fef7f40a 100644
--- a/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0d57246ca2b2deb63c1aa6a5fc286fa2/stdout.expected
@@ -5,14 +5,14 @@ find var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Values: matrix index
 find var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Flags: matrix indexed by [int(1..2), int(1..0)] of int(0)
 find var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..2), int(1..0)] of bool
 such that
-    var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Flags[1, ..] <lex
+    var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Flags[1, ..] .<
     var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Flags[2, ..]
     \/
     and([var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Flags[1, q14] =
          var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Flags[2, q14]
              | q14 : int(1..2)])
     /\
-    var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Values[1, ..] <lex
+    var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Values[1, ..] .<
     var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Values[2, ..]
     \/
     and([var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Flags[1, q17] ->
@@ -29,10 +29,10 @@ such that
                  | q23 : int(1..2)])
              | q21 : int(1..2)])
     /\
-    (var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Flags[1, ..] <lex
+    (var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Flags[1, ..] .<
      var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Flags[2, ..]
      \/
-     var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Values[1, ..] <lex
+     var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Values[1, ..] .<
      var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Values[2, ..]),
     and([var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Flags[q2, 2] ->
          var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithFlags_Values[q2, 1] <
diff --git a/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/model.expected.json
index 3994f27611..0ddcbedffa 100644
--- a/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/model.expected.json
@@ -125,7 +125,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -177,7 +177,7 @@
                                                                                                          null,
                                                                                                          null]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -229,7 +229,7 @@
                                                                                                          null,
                                                                                                          null]}}]}}]]}}}},
                                                              {"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/stdout.expected
index 534630128c..897e768def 100644
--- a/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0d757bbc1bf600cc00cccc23dd0dbabb/stdout.expected
@@ -10,18 +10,18 @@ find var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Re
 such that
     and([q1 + 1 <= var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
          flatten(var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_RelationAsMatrix[q1, .., ..])
-         <lex
+         .<
          flatten(var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_RelationAsMatrix
                      [q1 + 1, .., ..])
              | q1 : int(1..2)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/model.expected.json b/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/model.expected.json
index 0487544709..57874ffaff 100644
--- a/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/model.expected.json
@@ -193,7 +193,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -342,7 +342,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              6]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -2004,7 +2004,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/stdout.expected b/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/stdout.expected
index 3f57a8fd4e..7614ddc3fa 100644
--- a/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/0ed115e4ee3afb7cae4c8f89695c5fdd/stdout.expected
@@ -18,7 +18,7 @@ find var2_3: bool
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
@@ -31,7 +31,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
@@ -149,7 +149,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q15] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q15 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q15, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q15, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q15 + 1, ..]
              | q15 : int(1..3)]),
     and([q16 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/model.expected.json
index 3ba84da3f5..0c32b3f55a 100644
--- a/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/model.expected.json
@@ -109,7 +109,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -282,7 +282,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -617,7 +617,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}]]},
                                                                             [{"Op":
-                                                                                  {"MkOpLexLt":
+                                                                                  {"MkOpDotLt":
                                                                                        [{"Op":
                                                                                              {"MkOpSlicing":
                                                                                                   [{"Op":
@@ -768,7 +768,7 @@
                                                                                                                                          []},
                                                                                                                                     1]}}]}}]}},
                                                                                                    {"Op":
-                                                                                                        {"MkOpLexLt":
+                                                                                                        {"MkOpDotLt":
                                                                                                              [{"Op":
                                                                                                                    {"MkOpFlatten":
                                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/stdout.expected
index bda2c30910..b63161e0db 100644
--- a/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/10c99281fb90ea99297131629d79951b/stdout.expected
@@ -7,8 +7,7 @@ find var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet
         matrix indexed by [int(1..5), int(1..4), int(1), int(1..3)] of bool
 such that
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, .., ..])
-         <lex
+         flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, .., ..]) .<
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1 + 1, .., ..])
          \/
          and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, q12, 1] =
@@ -17,7 +16,7 @@ such that
          /\
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                      [q1, .., .., ..])
-         <lex
+         .<
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                      [q1 + 1, .., .., ..])
              | q1 : int(1..4)]),
@@ -34,7 +33,7 @@ such that
     5 <= sum([toInt(var1_ExplicitVarSizeWithFlags_Flags[q4]) | q4 : int(1..5)]),
     sum([toInt(var1_ExplicitVarSizeWithFlags_Flags[q4]) | q4 : int(1..5)]) <= 5,
     and([var1_ExplicitVarSizeWithFlags_Flags[q5] ->
-         and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, ..] <lex
+         and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, ..] .<
               var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6 + 1, ..]
               \/
               var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, 1] =
@@ -42,7 +41,7 @@ such that
               /\
               flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                           [q5, q6, .., ..])
-              <lex
+              .<
               flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                           [q5, q6 + 1, .., ..])
                   | q6 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/model.expected.json b/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/model.expected.json
index 9a5cf0cd7f..b6bcf16929 100644
--- a/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/model.expected.json
@@ -443,7 +443,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/stdout.expected b/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/stdout.expected
index 37e9c3d172..341bed6e3c 100644
--- a/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/10ee9f7ba50dfd3e0bdcc8ad341640d3/stdout.expected
@@ -32,7 +32,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13 + 1, ..]
              | q13 : int(1..2)]),
     and([q14 > var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/model.expected.json
index ecb58f110b..000183606d 100644
--- a/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/model.expected.json
@@ -336,7 +336,7 @@
                                                                    null]},
                                                              {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -508,7 +508,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -642,7 +642,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1278,7 +1278,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/stdout.expected
index 9e05388a52..addf1cc77f 100644
--- a/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/1191a8fe91feb6b1ae455420e223bf6e/stdout.expected
@@ -28,7 +28,7 @@ such that
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1],
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] >= 1,
     and([q8 + 1 <= var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] <lex
+         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] .<
          var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8 + 1, ..]
              | q8 : int(1..23)]),
     and([q9 > var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
@@ -36,14 +36,14 @@ such that
              | q9 : int(1..24)]),
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] <= 24,
     and([q13 + 1 <= var2_ExplicitVarSizeWithMarkerR10_Marker ->
-         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13, ..] <lex
+         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13, ..] .<
          var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13, q21] =
               var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13 + 1, q21]
                   | q21 : bool])
          /\
-         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Values[q13, ..] <lex
+         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Values[q13, ..] .<
          var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Values[q13 + 1, ..]
              | q13 : int(1..119)]),
     and([q14 > var2_ExplicitVarSizeWithMarkerR10_Marker ->
@@ -85,7 +85,7 @@ such that
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q34] =
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q34 + 1]
          /\
-         var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q34, ..] <lex
+         var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q34, ..] .<
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q34 + 1, ..]
              | q34 : int(1..4)]),
     and([q35 > var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/model.expected.json
index 7d01e23c4f..c02f80949f 100644
--- a/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/model.expected.json
@@ -1201,7 +1201,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1769,7 +1769,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1903,7 +1903,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/stdout.expected
index e036979c02..ba08b39147 100644
--- a/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/1291155001a2b89117838f7032c4ab5e/stdout.expected
@@ -95,7 +95,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
@@ -124,14 +124,14 @@ such that
     and([var4_1_ExplicitWithFlags_Flags[q17] = 0 \/ var4_1_ExplicitWithFlags_Flags[q17] >= 0 | q17 : int(1..3)]),
     3 = sum([var4_1_ExplicitWithFlags_Flags[q18] | q18 : int(1..3)]),
     and([var5_ExplicitWithFlagsR10_Flags[q20 + 1] > 0 ->
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20 + 1, ..]
          \/
          and([var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20, q31] =
               var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20 + 1, q31]
                   | q31 : bool])
          /\
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q20, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q20, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q20 + 1, ..]
              | q20 : int(1..63)]),
     and([var5_ExplicitWithFlagsR10_Flags[q21] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/model.expected.json
index 92ce2a1904..8e9473edfb 100644
--- a/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/model.expected.json
@@ -245,7 +245,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1095,7 +1095,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -2010,7 +2010,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -2160,7 +2160,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2592,7 +2592,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/stdout.expected
index 6e7ebca664..f5ade1fd55 100644
--- a/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/13700d10e259531c00b3ea61a5a5222e/stdout.expected
@@ -25,7 +25,7 @@ find var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMar
 find var6: int(-1..1)
 such that
     and([q1 + 1 <= var2_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q35] ->
@@ -69,7 +69,7 @@ such that
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q9] =
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q9 + 1]
          /\
-         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q9, ..] <lex
+         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q9, ..] .<
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q9 + 1, ..]
              | q9 : int(1..3)]),
     and([q10 > var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -129,7 +129,7 @@ such that
          /\
          (var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q19, ..]
-          <lex
+          .<
           var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q19 + 1, ..]
           \/
@@ -142,7 +142,7 @@ such that
           /\
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q19, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q19 + 1, .., ..]))
              | q19 : int(1..15)]),
@@ -173,7 +173,7 @@ such that
               /\
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q21, q22, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q21, q22 + 1, ..]
                   | q22 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/model.expected.json b/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/model.expected.json
index e0c65bdc1a..f500bfb236 100644
--- a/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/model.expected.json
@@ -92,7 +92,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -347,7 +347,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             0]}}}]]}]}}]]}}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/stdout.expected b/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/stdout.expected
index 67c5a9421b..af2e6b1915 100644
--- a/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/139f9520357e237c8f0d1489daa512e8/stdout.expected
@@ -8,7 +8,7 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2:
 such that
     false,
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q18] ->
@@ -19,7 +19,7 @@ such that
               var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q19]
                   | q19 : int(3..5, 0)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/model.expected.json b/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/model.expected.json
index 69da04eb26..cb7c86d016 100644
--- a/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/model.expected.json
@@ -1050,7 +1050,7 @@
                                        [{"Constant": {"ConstantAbstract": {"AbsLitMSet": []}}},
                                         {"TypeMSet": {"TypeBool": []}}]}]}}]}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Comprehension":
                             [{"Reference": [{"Name": "l_4"}, null]},
                              [{"Generator": {"GenDomainNoRepr": [{"Single": {"Name": "l_3"}}, {"DomainBool": []}]}},
diff --git a/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/stdout.expected b/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/stdout.expected
index abfb46f0f3..01207ecd5e 100644
--- a/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/13eda547bb0b8ccccb4b8cc348f66d91/stdout.expected
@@ -80,4 +80,4 @@ such that
      (relation() : `relation of (tuple(int))`)},
     [l_2 | l_1 : bool, l_2 : bool, true]
         [freq(mset(mset(true), (mset() : `mset of bool`), (mset() : `mset of bool`)), (mset() : `mset of bool`))],
-    [l_4 | l_3 : bool, l_4 : bool, l_4] <lex [l_5 | l_5 : bool, l_6 : bool, l_5]
+    [l_4 | l_3 : bool, l_4 : bool, l_4] .< [l_5 | l_5 : bool, l_6 : bool, l_5]
diff --git a/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/model.expected.json
index d0e21ba455..8ca184af7e 100644
--- a/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/model.expected.json
@@ -555,7 +555,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -707,7 +707,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/stdout.expected
index d951770e55..952bcf84a9 100644
--- a/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/15916e89942607cd189f87dbe1a6552b/stdout.expected
@@ -36,7 +36,7 @@ such that
                   | q28 : int(-4, 4)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q14]
@@ -45,7 +45,7 @@ such that
                   [q1 + 1, q14]
                   | q14 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q17]
diff --git a/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/model.expected.json b/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/model.expected.json
index 901e00b45f..d1ab24e40b 100644
--- a/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/model.expected.json
@@ -115,7 +115,7 @@
                              {"DomainBool": []}]}]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"AbstractLiteral":
                             {"AbsLitMatrix":
                                  [{"DomainInt":
@@ -280,7 +280,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/stdout.expected b/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/stdout.expected
index 2655866f1c..84a9b007d2 100644
--- a/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/16fd8e97c063710963e8c810fe6d2065/stdout.expected
@@ -15,7 +15,7 @@ find var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Marker: ma
 find var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Values:
         matrix indexed by [int(1..4), int(1..5)] of bool
 such that
-    [var3; int(0)] <lex [var3, var4, var4, false; int(5..8)],
+    [var3; int(0)] .< [var3, var4, var4, false; int(5..8)],
     var4,
     and([var5_ExplicitVarSizeWithFlagsR5_Flags[q10 + 1] ->
          var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Marker[q10] <
@@ -24,7 +24,7 @@ such that
          var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Marker[q10] =
          var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Marker[q10 + 1]
          /\
-         var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Values[q10, ..] <lex
+         var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Values[q10, ..] .<
          var5_ExplicitVarSizeWithFlagsR5_Values_ExplicitVarSizeWithMarker_Values[q10 + 1, ..]
              | q10 : int(1..3)]),
     and([var5_ExplicitVarSizeWithFlagsR5_Flags[q11] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/model.expected.json
index ada5d1446c..c0eecbdcca 100644
--- a/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/model.expected.json
@@ -238,7 +238,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -678,7 +678,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/stdout.expected
index bd3995eeac..39b1c7a6db 100644
--- a/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/176498a86f4f6aa56d13e84f835917e5/stdout.expected
@@ -20,7 +20,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1 + 1, ..]
          \/
@@ -56,7 +56,7 @@ such that
                       | q29 : int(1..2)])
                   | q27 : int(1..2)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/model.expected.json b/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/model.expected.json
index f987214317..f538545442 100644
--- a/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/model.expected.json
@@ -418,7 +418,7 @@
                                        [{"TypeInt": {"TagInt": []}},
                                         {"TypeFunction": [{"TypeInt": {"TagInt": []}}, {"TypeBool": []}]}]}}]}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpImage":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/stdout.expected b/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/stdout.expected
index ea4fbaff95..03685881c5 100644
--- a/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/183ea55a9258e18d69a7b15d4f823c67/stdout.expected
@@ -56,7 +56,7 @@ such that
                    mset(false, true) --> [0, 3, 1; int(4, 3, 6)], mset(true) --> [3; int(2)],
                    mset(false, false, false) --> [5, 2, 0; int(1, 7..8)]),
           (mset() : `mset of bool`))
-    <=lex
+    .<=
     image(function(relation((true, 2), (false, 2), (false, 3)) --> [3, 2, 2, 0, 4; int(11, 2, 5..7)],
                    relation((true, 0), (false, 4)) --> [0; int(0)],
                    relation((false, 0)) --> [3, 5, 3, 3; int(2, 7, 5, 0)],
diff --git a/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/model.expected.json b/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/model.expected.json
index b191c9d248..83dc283a4c 100644
--- a/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/model.expected.json
@@ -238,7 +238,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -678,7 +678,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/stdout.expected b/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/stdout.expected
index 4203d34567..22101efcf2 100644
--- a/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/18bf9a38ee59e4bcaebd478b9f980662/stdout.expected
@@ -20,7 +20,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1 + 1, ..]
          \/
@@ -56,7 +56,7 @@ such that
                       | q27 : int(1..2)])
                   | q25 : int(1..2)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/model.expected.json b/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/model.expected.json
index 050ed6c04a..1dd6e04c93 100644
--- a/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/model.expected.json
@@ -175,7 +175,7 @@
                                                                     {"ConstantInt": [{"TagInt": []}, 4]}}}]]}]}}]]}}},
                        {"Constant": {"ConstantInt": [{"TagInt": []}, 3]}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpImage":
                                  [{"AbstractLiteral":
diff --git a/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/stdout.expected b/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/stdout.expected
index 3407e1c78e..88597481ca 100644
--- a/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/1a4f723156644e60a38ec0e325765e17/stdout.expected
@@ -17,7 +17,7 @@ such that
     image(function(mset(1, 4) --> [0, 1, 0; int(3, 5, 1)], (mset() : `mset of int`) --> [1, 4; int(5, 0)],
                    mset(1, 5, 2) --> [4, 4, 2, 4, 1; int(8..10, 4, 14)]),
           toMSet({0, 1}))
-    <=lex [l_3 | l_2 : int(0..3, 5), l_3 : int(5, 4)],
+    .<= [l_3 | l_2 : int(0..3, 5), l_3 : int(5, 4)],
     true,
     or([l_4 | l_4 : bool, l_5 : bool, l_4]),
     mset(mset([2, 1, 3, 5, 4; int(0, 2..3, 15, 4)], [1, 1, 5, 1, 4; int(2..6)], [2, 3, 0, 3, 3; int(5, 3, 9, 14, 6)]))
diff --git a/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/model.expected.json
index d52041a5ef..391382dac9 100644
--- a/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/model.expected.json
@@ -218,7 +218,7 @@
                                                              "var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/stdout.expected
index 0a704d4883..bd86021830 100644
--- a/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/1abb07c9ef975b96bf575bfbe8f442b5/stdout.expected
@@ -19,7 +19,7 @@ such that
          sum([var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q19, q20] | q20 : int(2..4, 1)]) >= 1
              | q19 : int(1..16)]),
     and([q9 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q9, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q9, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q9 + 1, ..]
              | q9 : int(1..15)]),
     and([q10 > var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/model.expected.json b/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/model.expected.json
index 9f8eab60a1..50f2d9698e 100644
--- a/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/model.expected.json
@@ -317,7 +317,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/stdout.expected b/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/stdout.expected
index 57afdc3778..9695536f7f 100644
--- a/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/1b6c1179b1a92bd88edaeed5c5bfb398/stdout.expected
@@ -28,7 +28,7 @@ such that
          /\
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4 + 1, .., ..])
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/model.expected.json b/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/model.expected.json
index 66d37af3ac..68f7f0e712 100644
--- a/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/model.expected.json
@@ -1103,7 +1103,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1661,7 +1661,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1795,7 +1795,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/stdout.expected b/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/stdout.expected
index 5a33b15cff..664ec5a2d2 100644
--- a/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/1cc14f70f3fd8130affee799d5120a35/stdout.expected
@@ -86,7 +86,7 @@ such that
          >= 1
              | q53 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
@@ -115,14 +115,14 @@ such that
     and([var4_1_ExplicitWithFlags_Flags[q18] = 0 \/ var4_1_ExplicitWithFlags_Flags[q18] >= 0 | q18 : int(1..3)]),
     3 = sum([var4_1_ExplicitWithFlags_Flags[q19] | q19 : int(1..3)]),
     and([q21 + 1 <= var5_ExplicitWithRepetitionR10_Flag ->
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21, ..] <lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21, ..] .<
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21 + 1, ..]
          \/
          and([var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21, q31] =
               var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21 + 1, q31]
                   | q31 : bool])
          /\
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q21, ..] <=lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q21, ..] .<=
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q21 + 1, ..]
              | q21 : int(1..255)]),
     and([q22 > var5_ExplicitWithRepetitionR10_Flag ->
diff --git a/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/model.expected.json b/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/model.expected.json
index 0af0c6af6e..6d7ffeaea7 100644
--- a/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/model.expected.json
@@ -342,7 +342,7 @@
                                                                    null]},
                                                              {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -514,7 +514,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -648,7 +648,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/stdout.expected b/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/stdout.expected
index 2a191d4fef..b2bbbebb3d 100644
--- a/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/1e3c2ea5eb1b0a1eb092e59c73e21e65/stdout.expected
@@ -27,7 +27,7 @@ such that
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1],
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] >= 1,
     and([q8 + 1 <= var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] <lex
+         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] .<
          var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8 + 1, ..]
              | q8 : int(1..23)]),
     and([q9 > var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
@@ -35,14 +35,14 @@ such that
              | q9 : int(1..24)]),
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] <= 24,
     and([var2_ExplicitVarSizeWithFlagsR10_Flags[q13 + 1] ->
-         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13, ..] <lex
+         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13, ..] .<
          var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13, q23] =
               var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13 + 1, q23]
                   | q23 : bool])
          /\
-         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Values[q13, ..] <lex
+         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Values[q13, ..] .<
          var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Values[q13 + 1, ..]
              | q13 : int(1..119)]),
     and([var2_ExplicitVarSizeWithFlagsR10_Flags[q14] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/model.expected.json b/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/model.expected.json
index d8f834f1d4..d0df0b72cb 100644
--- a/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/model.expected.json
@@ -889,7 +889,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1063,7 +1063,7 @@
                                                                                                                                             []},
                                                                                                                                        2]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/stdout.expected b/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/stdout.expected
index de0c254e7c..8b2adbe215 100644
--- a/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/200d78834a42ebeb6f12a80d41000004/stdout.expected
@@ -60,7 +60,7 @@ such that
              | q38 : int(1..4)]),
     3 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker,
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-    and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, ..] <lex
+    and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9 + 1, ..]
          \/
          and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, q36] =
@@ -68,7 +68,7 @@ such that
                   [1, q9 + 1, q36]
                   | q36 : int(1..2)])
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9 + 1, ..]
              | q9 : int(1..3)]),
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/model.expected.json b/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/model.expected.json
index 739bc00b3c..0f71b9c086 100644
--- a/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/model.expected.json
@@ -850,7 +850,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1000,7 +1000,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1431,7 +1431,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
@@ -2202,7 +2202,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/stdout.expected b/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/stdout.expected
index 351437d100..531a0e03b1 100644
--- a/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/208ec24add8f7b331f0829f7296b04c7/stdout.expected
@@ -67,7 +67,7 @@ such that
          /\
          (var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q5, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q5 + 1, ..]
           \/
@@ -80,7 +80,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..15)]),
@@ -111,7 +111,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q8 + 1, ..]
                   | q8 : int(1..3)])
@@ -168,7 +168,7 @@ such that
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q18] =
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q18 + 1]
          /\
-         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q18, ..] <lex
+         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q18, ..] .<
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q18 + 1, ..]
              | q18 : int(1..3)]),
     and([q19 > var4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/model.expected.json
index b617e629af..e5b5083f6e 100644
--- a/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/model.expected.json
@@ -469,7 +469,7 @@
                        {"AbstractLiteral":
                             {"AbsLitRelation":
                                  [[{"Op":
-                                        {"MkOpLexLeq":
+                                        {"MkOpDotLeq":
                                              [{"Comprehension":
                                                    [{"Reference": [{"Name": "l_2"}, null]},
                                                     [{"Generator":
diff --git a/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/stdout.expected
index af2c769789..bd6bcb116c 100644
--- a/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/20a87ed854619dfbc1f01b026e5db67b/stdout.expected
@@ -39,7 +39,7 @@ such that
                         ([true; int(2)], partition({true, false, true, true}), mset(false)));
                    int(0)]))
     subsetEq
-    relation(([l_2 | l_2 : bool, l_3 : bool, l_3 <= false, l_2] <=lex [5 >= 0 | l_4 : bool, l_5 : bool],
+    relation(([l_2 | l_2 : bool, l_3 : bool, l_3 <= false, l_2] .<= [5 >= 0 | l_4 : bool, l_5 : bool],
               ([] : `matrix indexed by [int] of relation of (matrix indexed by [int] of bool * partition from bool *
                                                              mset of bool)`)),
              (inverse(function(relation(tuple (true)) --> (false, true, true, false),
diff --git a/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/model.expected.json b/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/model.expected.json
index b10551db1c..b42d9d8f5d 100644
--- a/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/model.expected.json
@@ -909,7 +909,7 @@
                              {"Condition": {"Reference": [{"Name": "l_2"}, null]}},
                              {"Condition": {"Reference": [{"Name": "l_2"}, null]}}]]}}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Comprehension":
                             [{"Reference": [{"Name": "l_4"}, null]},
                              [{"Generator":
diff --git a/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/stdout.expected b/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/stdout.expected
index 9c6a86a0b2..2a0599880c 100644
--- a/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/21be920dffbaacd7e2b6b06b72cb75c0/stdout.expected
@@ -61,5 +61,5 @@ such that
               function((5, false, 4, 4) --> mset(0, 5, 0), (5, true, 4, 0) --> mset(5),
                        (0, false, 5, 5) --> mset(2, 0, 4), (2, true, 0, 1) --> (mset() : `mset of int`)))),
     or([l_2 | l_1 : bool, l_2 : bool, l_2, l_2]),
-    [l_4 | l_3 : int(3, 5), l_4 : int(1..2, 3)] <lex [l_5 | l_5 : int(0..5, 2..5), l_6 : int(3..5, 5)],
+    [l_4 | l_3 : int(3, 5), l_4 : int(1..2, 3)] .< [l_5 | l_5 : int(0..5, 2..5), l_6 : int(3..5, 5)],
     2 <= max({2, 2, 5})
diff --git a/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/model.expected.json b/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/model.expected.json
index ff3e2d411a..c48d7eefba 100644
--- a/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/model.expected.json
@@ -1878,7 +1878,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2077,7 +2077,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2404,7 +2404,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2579,7 +2579,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  4]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/stdout.expected b/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/stdout.expected
index e426f06a3d..630eb5f752 100644
--- a/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/22477309ce0401a8d76f05db531a8477/stdout.expected
@@ -112,7 +112,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -126,7 +126,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -147,7 +147,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -160,7 +160,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/model.expected.json b/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/model.expected.json
index 38c8c7452a..bcb46a5967 100644
--- a/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/model.expected.json
@@ -1059,7 +1059,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1233,7 +1233,7 @@
                                                                                                                                             []},
                                                                                                                                        8]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/stdout.expected b/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/stdout.expected
index cadf1479a3..a2cf472189 100644
--- a/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/23bad3eae7b82e1742600d53802770fd/stdout.expected
@@ -67,7 +67,7 @@ such that
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker,
     var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker <= 1,
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-    and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, ..] <lex
+    and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9 + 1, ..]
          \/
          and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, q51] =
@@ -75,7 +75,7 @@ such that
                   [1, q9 + 1, q51]
                   | q51 : int(1..8)])
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9 + 1, ..]
              | q9 : int(1..3)]),
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/model.expected.json
index e14d70140b..27893ba094 100644
--- a/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/model.expected.json
@@ -296,7 +296,7 @@
                                                              "var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/stdout.expected
index 43bb597b16..d9ffb4cc15 100644
--- a/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/23f59fd02b1d9c3816b417a8727e418c/stdout.expected
@@ -17,7 +17,7 @@ such that
              | q1_Occurrence : matrix indexed by [int(2, 1..2)] of bool,
                sum([q1_Occurrence[q10] | q10 : int(2, 1..2)]) <= 5]),
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4, .., ..]) <lex
+         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4, .., ..]) .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4 + 1, .., ..])
              | q4 : int(1..3)]),
     and([q5 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/model.expected.json
index 56b2b309ba..5330d79341 100644
--- a/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/model.expected.json
@@ -153,7 +153,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1281,7 +1281,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/stdout.expected
index 39789b4b80..76b67d12b9 100644
--- a/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/256afa47464e2a7d839a0636d335714b/stdout.expected
@@ -15,7 +15,7 @@ find var2_2_Function1DPartial_Values: matrix indexed by [int(0, 4..5)] of int(0)
 find var2_3: bool
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q28] ->
@@ -71,7 +71,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11 + 1, ..]
              | q11 : int(1..3)]),
     and([q12 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/model.expected.json b/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/model.expected.json
index 9b45c678f8..14b6f8ffe7 100644
--- a/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Comprehension":
                             [{"Constant": {"ConstantBool": false}},
                              [{"Generator": {"GenDomainNoRepr": [{"Single": {"Name": "l_1"}}, {"DomainBool": []}]}}]]},
diff --git a/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/stdout.expected b/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/stdout.expected
index 509f5acfbb..04eed9979e 100644
--- a/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/25c731b81cdfba9a1930f6d921e9fc53/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find unused: bool
-such that [false | l_1 : bool] <lex [[false; int(1)]; int(1)][0]
+such that [false | l_1 : bool] .< [[false; int(1)]; int(1)][0]
diff --git a/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/model.expected.json
index 29776941ef..e7657ff16f 100644
--- a/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpIndexing":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/stdout.expected
index c2eb74a6ff..c091ee81e9 100644
--- a/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/27751403de10fefc991154fbb6c3f49a/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find unused: bool
-such that [[false; int(1)]; int(1)][0] <lex [true | l_1 : bool, l_2 : bool]
+such that [[false; int(1)]; int(1)][0] .< [true | l_1 : bool, l_2 : bool]
diff --git a/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/model.expected.json
index a92c2d008a..c64dc7090f 100644
--- a/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/stdout.expected
index 224c46ec30..23e818d773 100644
--- a/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/2835cf8d0df29e21336c9c33319cc86f/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find unused: bool
-such that [5; int(1)] <=lex image(function(relation((false, 1)) --> [0; int(1)]), relation((false, 4)))
+such that [5; int(1)] .<= image(function(relation((false, 1)) --> [0; int(1)]), relation((false, 4)))
diff --git a/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/model.expected.json b/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/model.expected.json
index 85d420f923..e7aa026345 100644
--- a/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/model.expected.json
@@ -87,7 +87,7 @@
                                                         [{"Constant": {"ConstantInt": [{"TagInt": []}, 1]}},
                                                          {"Constant": {"ConstantInt": [{"TagInt": []}, 2]}}]}]]},
                                             [{"Op":
-                                                  {"MkOpLexLt":
+                                                  {"MkOpDotLt":
                                                        [{"Op":
                                                              {"MkOpSlicing":
                                                                   [{"Op":
@@ -179,7 +179,7 @@
                                                                                                                      []},
                                                                                                                 2]}}]}]]},
                                                                                         [{"Op":
-                                                                                              {"MkOpLexLt":
+                                                                                              {"MkOpDotLt":
                                                                                                    [{"Op":
                                                                                                          {"MkOpSlicing":
                                                                                                               [{"Op":
@@ -211,7 +211,7 @@
                                                                                                                null,
                                                                                                                null]}}]}},
                                                                                          {"Op":
-                                                                                              {"MkOpLexLt":
+                                                                                              {"MkOpDotLt":
                                                                                                    [{"Op":
                                                                                                          {"MkOpSlicing":
                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/stdout.expected b/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/stdout.expected
index 0df25e7b2a..9775e5c800 100644
--- a/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/2910579caa938519c953fccd48611fee/stdout.expected
@@ -9,17 +9,16 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Ex
         matrix indexed by [int(1..2), int(1..0)] of bool
 such that
     2 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-    var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[1, ..] <lex
+    var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[1, ..] .<
     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[2, ..]
     \/
     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[1, 3] =
     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[2, 3]
     /\
-    (var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[1, ..] <lex
+    (var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[1, ..] .<
      var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[2, ..]
      \/
-     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[1, ..]
-     <lex
+     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[1, ..] .<
      var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[2, ..]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q2, 3] = false
diff --git a/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/model.expected.json
index 7fb0cc5c74..d4f675e746 100644
--- a/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/model.expected.json
@@ -599,7 +599,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -751,7 +751,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/stdout.expected
index b9fdf38dad..eb58c775bd 100644
--- a/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/2abab26b761b711b383086f57689adc5/stdout.expected
@@ -42,7 +42,7 @@ such that
                   | q28 : int(-4, 4)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q14]
@@ -51,7 +51,7 @@ such that
                   [q1 + 1, q14]
                   | q14 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q17]
diff --git a/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/model.expected.json
index 904119c477..756d56aec6 100644
--- a/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/model.expected.json
@@ -320,7 +320,7 @@
                                                                    null]},
                                                              {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -504,7 +504,7 @@
                                  [{"Constant": {"ConstantInt": [{"TagInt": []}, 2]}},
                                   {"Reference": [{"Name": "var3_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                        {"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Op":
                                        {"MkOpFlatten":
                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/stdout.expected
index c8558f8143..fb54010df4 100644
--- a/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/2c66ae20ba104065bc0b14b9b0eb8e2c/stdout.expected
@@ -23,7 +23,7 @@ such that
              | q1_Function1D : matrix indexed by [bool] of int(3..5, 4), allDiff(q1_Function1D), false, true]),
     var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] >= 1,
     and([q6 + 1 <= var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6, ..] <lex
+         var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6, ..] .<
          var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6 + 1, ..]
              | q6 : int(1..255)]),
     and([q7 > var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] ->
@@ -34,7 +34,7 @@ such that
              | q8 : int(1..256)]),
     and([q8 <= var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] -> false | q8 : int(1..256)]),
     2 <= var3_ExplicitVarSizeWithMarker_Marker ->
-    flatten(var3_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[1, .., .., .., ..]) <lex
+    flatten(var3_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[1, .., .., .., ..]) .<
     flatten(var3_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[2, .., .., .., ..]),
     and([q11 > var3_ExplicitVarSizeWithMarker_Marker ->
          and([and([and([and([var3_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q11, q37, q38, q39, q40] = false
diff --git a/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/model.expected.json b/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/model.expected.json
index 9ac3d3aa5d..eb9454aaf0 100644
--- a/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/model.expected.json
@@ -1947,7 +1947,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2146,7 +2146,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2473,7 +2473,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2648,7 +2648,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  3]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/stdout.expected b/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/stdout.expected
index 71b944507c..42b85e6b25 100644
--- a/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/2cb879c833748cef779f84df872b0d71/stdout.expected
@@ -116,7 +116,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -130,7 +130,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -151,7 +151,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -164,7 +164,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/model.expected.json
index 7566f184e7..9d00c42fc6 100644
--- a/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/model.expected.json
@@ -273,7 +273,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -546,7 +546,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -696,7 +696,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpSlicing":
                                                                                                                                                     [{"Op":
@@ -1487,7 +1487,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/stdout.expected
index 17b544bf15..2d36f8321c 100644
--- a/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/2e2ad8fe1fae6676863edda2c078d2f2/stdout.expected
@@ -27,7 +27,7 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Marker ->
-         var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6, ..] <lex
+         var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6, ..] .<
          var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6 + 1, ..]
          \/
          and([var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6, q19]
@@ -44,7 +44,7 @@ such that
          /\
          (var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6 + 1, ..]
           \/
@@ -57,7 +57,7 @@ such that
           /\
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -131,7 +131,7 @@ such that
     and([q30 <= var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Marker /\
          q31 <= var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Marker
          ->
-         (var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q30, ..] <lex
+         (var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q30, ..] .<
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q31, ..]
           ->
           or([var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Flags
diff --git a/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/model.expected.json
index 340986ca17..b459e3232d 100644
--- a/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/model.expected.json
@@ -251,7 +251,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -401,7 +401,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1278,7 +1278,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/stdout.expected
index 2e4ec29a18..cc6e6b9b89 100644
--- a/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/3092be0de62c362cd1c49042c585105f/stdout.expected
@@ -19,7 +19,7 @@ such that
          /\
          (var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1, ..]
-          <lex
+          .<
           var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1 + 1, ..]
           \/
@@ -32,7 +32,7 @@ such that
           /\
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..4)]),
@@ -99,7 +99,7 @@ such that
               /\
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11 + 1, ..]
                   | q11 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/model.expected.json b/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/model.expected.json
index 60ce632e08..3758e08ebb 100644
--- a/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/model.expected.json
@@ -240,7 +240,7 @@
                                                                                                                                     []},
                                                                                                                                1]}}]]}}}}]}}]}},
                                                                         {"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/stdout.expected b/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/stdout.expected
index 4256c5648e..7768561695 100644
--- a/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/31f683d305b86f1023d4853cf84d6901/stdout.expected
@@ -12,7 +12,7 @@ such that
     ([] : `matrix indexed by [int] of bool`)[min(([] : `matrix indexed by [int] of int`))],
     and([var1_Explicit_ExplicitVarSizeWithMarker_Marker[q1] < var1_Explicit_ExplicitVarSizeWithMarker_Marker[q1 + 1] \/
          var1_Explicit_ExplicitVarSizeWithMarker_Marker[q1] = var1_Explicit_ExplicitVarSizeWithMarker_Marker[q1 + 1] /\
-         var1_Explicit_ExplicitVarSizeWithMarker_Values[q1, ..] <lex
+         var1_Explicit_ExplicitVarSizeWithMarker_Values[q1, ..] .<
          var1_Explicit_ExplicitVarSizeWithMarker_Values[q1 + 1, ..]
              | q1 : int(1..23)]),
     and([2 <= var1_Explicit_ExplicitVarSizeWithMarker_Marker[q2] ->
diff --git a/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/model.expected.json b/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/model.expected.json
index 3b1daf1c1c..4a20e5115a 100644
--- a/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpSlicing":
                                  [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/stdout.expected b/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/stdout.expected
index 05ae18456c..624d31a534 100644
--- a/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/32ba15f900d2899e277de2884b82db33/stdout.expected
@@ -1,4 +1,4 @@
 language ESSENCE' 1.0
 
 find unused: bool
-such that [[false; int(1)]; int(1)][0, ..] <lex [true, true, true, true; int(1..4)]
+such that [[false; int(1)]; int(1)][0, ..] .< [true, true, true, true; int(1..4)]
diff --git a/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/model.expected.json b/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/model.expected.json
index 7be7f79c8d..9686ec66ee 100644
--- a/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/model.expected.json
@@ -16,7 +16,7 @@
                               {"Constant": {"ConstantInt": [{"TagInt": []}, 5]}}]}]]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpSlicing":
                                  [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/stdout.expected b/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/stdout.expected
index dd7b249d16..075a7b0028 100644
--- a/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/32f8563c6daa93f905b86ab15f412aa7/stdout.expected
@@ -1,4 +1,4 @@
 language ESSENCE' 1.0
 
 find var1: int(2, 3..5)
-such that [[true; int(3, 11)], [true, true; int(0, 5)]; int(1..2)][var1, ..] <=lex [true; int(1)]
+such that [[true; int(3, 11)], [true, true; int(0, 5)]; int(1..2)][var1, ..] .<= [true; int(1)]
diff --git a/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/model.expected.json b/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/model.expected.json
index 86d5187f64..04e544c88b 100644
--- a/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/model.expected.json
@@ -352,7 +352,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -419,7 +419,7 @@
                                                                                                                                           null,
                                                                                                                                           null]}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/stdout.expected b/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/stdout.expected
index ff6625e2a6..fee445679c 100644
--- a/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/34552e2be8dd2ea63930ffe4b5a015aa/stdout.expected
@@ -30,13 +30,13 @@ such that
          /\
          (flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags
                       [q4 + 1, .., ..])
           \/
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values
                       [q4 + 1, .., ..]))
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/model.expected.json b/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/model.expected.json
index d43140172d..705b12c44f 100644
--- a/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/model.expected.json
@@ -736,7 +736,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -977,7 +977,7 @@
                                                                                              [{"Name": "q7"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
@@ -1458,7 +1458,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/stdout.expected b/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/stdout.expected
index 5f7d3bae83..cd5296ccd4 100644
--- a/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/34efe399d190ea2b129f8a3c0e7a0e52/stdout.expected
@@ -57,7 +57,7 @@ such that
          /\
          flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                      [q5, .., ..])
-         <lex
+         .<
          flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                      [q5 + 1, .., ..])
              | q5 : int(1..15)]),
@@ -73,7 +73,7 @@ such that
          and([q8 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                   [q7, q8 + 1, ..]
                   | q8 : int(1..3)])
@@ -103,7 +103,7 @@ such that
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q16] =
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q16 + 1]
          /\
-         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q16, ..] <lex
+         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q16, ..] .<
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q16 + 1, ..]
              | q16 : int(1..3)]),
     and([q17 > var4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/model.expected.json b/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/model.expected.json
index 45a3ee31aa..85ec64e0a4 100644
--- a/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/model.expected.json
@@ -771,7 +771,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -923,7 +923,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/stdout.expected b/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/stdout.expected
index d7ac28c526..edaab7f682 100644
--- a/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/35a9b9aabd733bd1da92dcfbbafbb0e0/stdout.expected
@@ -50,7 +50,7 @@ such that
                   | q35 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q14]
@@ -59,7 +59,7 @@ such that
                   [q1 + 1, q14]
                   | q14 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q17]
diff --git a/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/model.expected.json
index a99422e8af..42cfaf3cd3 100644
--- a/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/model.expected.json
@@ -153,7 +153,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1220,7 +1220,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/stdout.expected
index 98dba81e15..338cd7caf2 100644
--- a/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/35aec2a8434e0ae0a0041beca9f1d91e/stdout.expected
@@ -15,7 +15,7 @@ find var2_2_Function1DPartial_Values: matrix indexed by [int(0, 4..5)] of int(0)
 find var2_3: bool
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q26] ->
@@ -69,7 +69,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11 + 1, ..]
              | q11 : int(1..3)]),
     and([q12 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/model.expected.json b/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/model.expected.json
index d04b3cadfe..d10cbb3449 100644
--- a/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/model.expected.json
@@ -763,7 +763,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -931,7 +931,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1081,7 +1081,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/stdout.expected b/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/stdout.expected
index 157a1281c1..a4bca77b17 100644
--- a/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/35bd3096c398059a5f4e2e9de6159866/stdout.expected
@@ -64,21 +64,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/model.expected.json
index 8248f46ead..6363625608 100644
--- a/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/model.expected.json
@@ -1576,7 +1576,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1775,7 +1775,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2102,7 +2102,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2277,7 +2277,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  4]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/stdout.expected
index a422048919..fc83819916 100644
--- a/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/360166fcf3210cf2cc730698c7561f1a/stdout.expected
@@ -94,7 +94,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -108,7 +108,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -129,7 +129,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -142,7 +142,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/model.expected.json
index 01a9d0620d..bf625c976a 100644
--- a/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/model.expected.json
@@ -273,7 +273,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -546,7 +546,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -696,7 +696,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpSlicing":
                                                                                                                                                     [{"Op":
@@ -1379,7 +1379,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/stdout.expected
index 38e9822fe2..b36f8d416e 100644
--- a/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/3620a44b9d1882d1b8d68ebb7c2e267b/stdout.expected
@@ -27,7 +27,7 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Marker ->
-         var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6, ..] <lex
+         var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6, ..] .<
          var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6 + 1, ..]
          \/
          and([var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q6, q19]
@@ -44,7 +44,7 @@ such that
          /\
          (var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6 + 1, ..]
           \/
@@ -57,7 +57,7 @@ such that
           /\
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -126,7 +126,7 @@ such that
     and([q34 <= var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Marker /\
          q35 <= var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Marker
          ->
-         (var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q34, ..] <lex
+         (var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q34, ..] .<
           var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_1_Occurrence[q35, ..]
           ->
           or([var1_FunctionAsRelationR2R4_RelationAsSetR2R4_ExplicitVarSizeWithMarkerR2R4_Values_2_ExplicitVarSizeWithFlags_Flags
diff --git a/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/model.expected.json
index 75fbfae968..43e3da629e 100644
--- a/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/model.expected.json
@@ -803,7 +803,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -955,7 +955,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/stdout.expected
index 4f39b51b19..de6fbc1b18 100644
--- a/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/36adf65748e3aabfd49290654b8b9ec2/stdout.expected
@@ -53,7 +53,7 @@ such that
                   | q36 : int(-4, 4)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
@@ -62,7 +62,7 @@ such that
                   [q1 + 1, q16]
                   | q16 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q19]
diff --git a/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/model.expected.json b/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/model.expected.json
index d099b07212..b626876557 100644
--- a/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/model.expected.json
@@ -1795,7 +1795,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1981,7 +1981,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2284,7 +2284,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2446,7 +2446,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/stdout.expected b/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/stdout.expected
index 5a70d37fc9..364ea91e73 100644
--- a/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/37b6d848c391d03c123e6e8c55e6b822/stdout.expected
@@ -117,7 +117,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -131,7 +131,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..15)]),
@@ -152,7 +152,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -165,7 +165,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/model.expected.json
index cb7958c09e..8f29bafe1b 100644
--- a/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/model.expected.json
@@ -94,7 +94,7 @@
                                          {"DomainMatrix": [{"DomainBool": []}, {"DomainBool": []}]}]}]}]}]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpSlicing":
                                  [{"Op":
@@ -208,7 +208,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -354,7 +354,7 @@
                                                                                                                                             []},
                                                                                                                                        2]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1567,7 +1567,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -1844,7 +1844,7 @@
                                                                                              [{"Name": "q18"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpFlatten":
                                                                                        [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/stdout.expected
index c6db14726f..c424b21b64 100644
--- a/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/39936b90fd0cf508557865456d964b8b/stdout.expected
@@ -11,18 +11,18 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMar
 find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_RelationAsMatrix:
         matrix indexed by [int(1..256), int(1..8), bool, bool, bool] of bool
 such that
-    [[true, true; int(0..1)], [true, true, true; int(1, 2, 8)], [true; int(1)]; int(2, 4, 5)][0, ..] <lex
+    [[true, true; int(0..1)], [true, true, true; int(1, 2, 8)], [true; int(1)]; int(2, 4, 5)][0, ..] .<
     [false, true; int(1..2)],
     false,
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, q32] =
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, q32]
                   | q32 : int(1..2)])
          /\
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..3)]),
     and([var1_ExplicitVarSizeWithFlags_Flags[q2] = false ->
@@ -87,7 +87,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_RelationAsMatrix
                      [q16, .., .., .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_RelationAsMatrix
                      [q16 + 1, .., .., .., ..])
              | q16 : int(1..255)]),
@@ -105,7 +105,7 @@ such that
          and([q19 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q18] ->
               flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_RelationAsMatrix
                           [q18, q19, .., .., ..])
-              <lex
+              .<
               flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_RelationAsMatrix
                           [q18, q19 + 1, .., .., ..])
                   | q19 : int(1..7)])
diff --git a/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/model.expected.json b/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/model.expected.json
index 79d680e291..c24a115cb5 100644
--- a/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/model.expected.json
@@ -1189,7 +1189,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1824,7 +1824,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1958,7 +1958,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/stdout.expected b/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/stdout.expected
index 3f237bfb3d..094337451d 100644
--- a/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/39a705752a0c5e219408facaeb5079d9/stdout.expected
@@ -95,7 +95,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
@@ -133,14 +133,14 @@ such that
              | q16 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([q23 + 1 <= var5_ExplicitWithRepetitionR10_Flag ->
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23, ..] <lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23, ..] .<
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23 + 1, ..]
          \/
          and([var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23, q33] =
               var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23 + 1, q33]
                   | q33 : bool])
          /\
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q23, ..] <=lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q23, ..] .<=
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q23 + 1, ..]
              | q23 : int(1..255)]),
     and([q24 > var5_ExplicitWithRepetitionR10_Flag ->
diff --git a/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/model.expected.json
index df5126ea45..4d0e7be533 100644
--- a/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/model.expected.json
@@ -177,7 +177,7 @@
                                          {"TypeMSet": {"TypeMSet": {"TypeInt": {"TagInt": []}}}}]},
                                    {"Constant": {"ConstantAbstract": {"AbsLitMSet": [{"ConstantBool": true}]}}}]]}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpImage":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/stdout.expected
index 21303d225c..ae1c46d924 100644
--- a/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/39fc0816e0aea89208c87fa4d39edf4d/stdout.expected
@@ -20,7 +20,7 @@ such that
              (mset() : `mset of mset of int`) --> mset(true)),
     image(function([1, 0; int(3, 0)] --> [false, true, false, false, false; int(3, 15, 0, 4, 2)]),
           [5, 2 - 5; int(2, 5)])
-    <=lex [l_2 | l_1 : bool, l_2 : bool, and(([] : `matrix indexed by [int] of bool`)), l_2],
+    .<= [l_2 | l_1 : bool, l_2 : bool, and(([] : `matrix indexed by [int] of bool`)), l_2],
     image(function((tuple (0), false, false, partition({true}, {false})) --> true,
                    (tuple (4), true = false, true, partition({false, true, true})) --> true > false,
                    (tuple (1), false, false,
diff --git a/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/model.expected.json b/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/model.expected.json
index 39e78c1152..6123827764 100644
--- a/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/model.expected.json
@@ -306,7 +306,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -456,7 +456,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1333,7 +1333,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/stdout.expected b/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/stdout.expected
index 5f31abe877..788f7df3ec 100644
--- a/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/3b5e1803eab57ae500a891f3bfadce58/stdout.expected
@@ -24,7 +24,7 @@ such that
          /\
          (var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1, ..]
-          <lex
+          .<
           var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1 + 1, ..]
           \/
@@ -37,7 +37,7 @@ such that
           /\
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..4)]),
@@ -104,7 +104,7 @@ such that
               /\
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11 + 1, ..]
                   | q11 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/model.expected.json
index 5208d298d5..f49d927afd 100644
--- a/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/model.expected.json
@@ -250,7 +250,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -708,7 +708,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -761,7 +761,7 @@
                                                                                                                                null,
                                                                                                                                null]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/stdout.expected
index b72d7fa3b2..18fb628293 100644
--- a/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/3cc911ee89eb40d0d5e49b63286e8f7f/stdout.expected
@@ -17,7 +17,7 @@ such that
          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1] =
          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1 + 1]
          /\
-         var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1, ..] <lex
+         var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1, ..] .<
          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1 + 1, ..]
          \/
          and([q14 <= var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1] ->
@@ -35,10 +35,10 @@ such that
                       | q20 : int(1..2)])
                   | q18 : int(1..2)])
          /\
-         (var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         (var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
           var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
           \/
-          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[q1, ..] .<
           var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[q1 + 1, ..])
              | q1 : int(1..3)]),
     and([q2 > var1_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/model.expected.json b/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/model.expected.json
index b76e94f5d2..186f1d5c2c 100644
--- a/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/model.expected.json
@@ -657,7 +657,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -783,7 +783,7 @@
                                                                                                                          []},
                                                                                                                     1]}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/stdout.expected b/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/stdout.expected
index 1704873bff..5f930df9f2 100644
--- a/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/3d535f0ac7272986482b759dae43c292/stdout.expected
@@ -40,7 +40,7 @@ such that
                         | q14 : int(1..4)]),
                sum([q1_ExplicitVarSizeWithFlags_Flags[q15] | q15 : int(1..5)]) <= 5]),
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4 + 1, ..]
          \/
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, 1] =
@@ -48,7 +48,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q4 + 1, .., ..])
              | q4 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/model.expected.json
index faa0cf1844..cd9ffb7811 100644
--- a/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/model.expected.json
@@ -397,7 +397,7 @@
                                                              "var2_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/stdout.expected
index d8410b91d1..0215b9c37b 100644
--- a/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/3ec03da1ddc427cf36261757e735114e/stdout.expected
@@ -33,7 +33,7 @@ such that
          >= 1
              | q17 : int(1..16)]),
     and([q6 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q6 + 1, ..]
              | q6 : int(1..15)]),
     and([q7 > var2_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/model.expected.json
index 0aa09fc13f..34a68942c2 100644
--- a/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/model.expected.json
@@ -2047,7 +2047,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2255,7 +2255,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2600,7 +2600,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2784,7 +2784,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             4]}}}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/stdout.expected
index 3527753bd8..dafe07cfaf 100644
--- a/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/3f487c8189ea7cd34b26c9482423c22f/stdout.expected
@@ -112,7 +112,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -126,7 +126,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -147,7 +147,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -160,7 +160,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/model.expected.json
index 7575538127..d0e60d5b32 100644
--- a/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/model.expected.json
@@ -360,7 +360,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1093,7 +1093,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/stdout.expected
index e435eb84f2..016495e6a7 100644
--- a/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/406db1c9f1d0b024a8ba6de04ada1fa2/stdout.expected
@@ -33,7 +33,7 @@ such that
          var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Flag[q1] =
          var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Flag[q1 + 1]
          /\
-         var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([var1_ExplicitVarSizeWithFlagsR8_Flags[q2] = false ->
@@ -77,7 +77,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q20] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q20 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20 + 1, ..]
              | q20 : int(1..3)]),
     and([q21 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/model.expected.json b/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/model.expected.json
index 907a163aa2..4624ae7092 100644
--- a/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/model.expected.json
@@ -28,7 +28,7 @@
                                       [{"ConstantBool": false}, {"ConstantBool": true}, {"ConstantBool": true}]}}}]}},
             {"Constant": {"ConstantBool": true}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/stdout.expected b/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/stdout.expected
index d090321f9b..99f90e3ebb 100644
--- a/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/40c777188c96f06f23b379634df5be19/stdout.expected
@@ -4,4 +4,4 @@ find var1: set (maxSize -0) of partition (numParts 5, partSize 3) from bool
 such that
     {true, false} = {false, true, true},
     true,
-    [false, false, true, false; int(6..9)] <lex [false, true; int(0, 4)]
+    [false, false, true, false; int(6..9)] .< [false, true; int(0, 4)]
diff --git a/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/model.expected.json
index d8cd500b54..81408e3520 100644
--- a/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/model.expected.json
@@ -1491,7 +1491,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1625,7 +1625,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/stdout.expected
index 2267fb99d5..e429ec7197 100644
--- a/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/40ce6cdb722c1098a95e3150cf28137a/stdout.expected
@@ -96,14 +96,14 @@ such that
     and([var4_1_ExplicitWithFlags_Flags[q17] = 0 \/ var4_1_ExplicitWithFlags_Flags[q17] >= 0 | q17 : int(1..3)]),
     3 = sum([var4_1_ExplicitWithFlags_Flags[q18] | q18 : int(1..3)]),
     and([q20 + 1 <= var5_ExplicitWithRepetitionR10_Flag ->
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q20, ..] <lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q20, ..] .<
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q20 + 1, ..]
          \/
          and([var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q20, q30] =
               var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q20 + 1, q30]
                   | q30 : bool])
          /\
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q20, ..] <=lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q20, ..] .<=
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q20 + 1, ..]
              | q20 : int(1..255)]),
     and([q21 > var5_ExplicitWithRepetitionR10_Flag ->
diff --git a/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/model.expected.json
index 164282cd6f..c9e4c16a3d 100644
--- a/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/model.expected.json
@@ -182,7 +182,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -319,7 +319,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -934,7 +934,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1313,7 +1313,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1447,7 +1447,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/stdout.expected
index f54ea3e828..f94579258f 100644
--- a/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/4280cfb278486b51961b41fb8309b68d/stdout.expected
@@ -17,14 +17,14 @@ such that
                q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values : matrix indexed by [int(1..4), bool] of
                                                                                   int(5),
                and([q_4_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, ..] .<
                     q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1 + 1, ..]
                     \/
                     and([q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, q9] =
                          q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1 + 1, q9]
                              | q9 : bool])
                     /\
-                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1, ..] .<
                     q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1 + 1, ..]
                         | q1 : int(1..3)]),
                and([q_4_ExplicitVarSizeWithFlags_Flags[q1] = false ->
@@ -55,7 +55,7 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3 + 1]
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3 + 1, ..]
              | q3 : int(1..7)]),
     and([q3 > var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -75,14 +75,14 @@ such that
                   | q4 : int(1..3)])
              | q3 : int(1..8)]),
     and([q5 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5, ..] <lex
+         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5, ..] .<
          var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5, q10] =
               var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5 + 1, q10]
                   | q10 : bool])
          /\
-         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q5, ..] <lex
+         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q5, ..] .<
          var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q5 + 1, ..]
              | q5 : int(1..3)]),
     and([q5 > var2_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/model.expected.json
index 823fcccae9..ee60d9f92e 100644
--- a/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/model.expected.json
@@ -1564,7 +1564,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1746,7 +1746,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2003,7 +2003,7 @@
                                                                                               [{"TagInt": []},
                                                                                                2]}}]}]]},
                                                                        [{"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
@@ -2116,7 +2116,7 @@
                                                                                                                                               []},
                                                                                                                                          2]}}}}]}}]}},
                                                                                               {"Op":
-                                                                                                   {"MkOpLexLt":
+                                                                                                   {"MkOpDotLt":
                                                                                                         [{"Op":
                                                                                                               {"MkOpSlicing":
                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/stdout.expected
index fe55a1778f..554efdccde 100644
--- a/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/42c5a23fafc955d441461af4184f86f2/stdout.expected
@@ -97,7 +97,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -110,7 +110,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..3)]),
@@ -129,7 +129,7 @@ such that
          (2 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 2, ..]
           \/
@@ -141,7 +141,7 @@ such that
           /\
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 2, ..])
              | q7 : int(1..4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/model.expected.json b/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/model.expected.json
index 715e6586b8..fdaa714594 100644
--- a/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/model.expected.json
@@ -363,7 +363,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1608,7 +1608,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -2438,7 +2438,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -2680,7 +2680,7 @@
                                                                                              [{"Name": "q23"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/stdout.expected b/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/stdout.expected
index 4381a2650b..95e470ea8d 100644
--- a/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/434c784a35b841f5f825ff3ec5fbff68/stdout.expected
@@ -31,7 +31,7 @@ such that
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1] =
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1 + 1]
          /\
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1 + 1, ..]
          \/
          and([q38 <= var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1] ->
@@ -94,7 +94,7 @@ such that
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11] =
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11 + 1]
          /\
-         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] <lex
+         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] .<
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11 + 1, ..]
              | q11 : int(1..3)]),
     and([q12 > var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -146,7 +146,7 @@ such that
          /\
          flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                      [q21, .., ..])
-         <lex
+         .<
          flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                      [q21 + 1, .., ..])
              | q21 : int(1..15)]),
@@ -162,7 +162,7 @@ such that
          and([q24 + 1 <= var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q23] ->
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                   [q23, q24, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                   [q23, q24 + 1, ..]
                   | q24 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/model.expected.json
index 626a622c05..82a33a297e 100644
--- a/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/model.expected.json
@@ -286,7 +286,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -435,7 +435,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              3]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1794,7 +1794,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -2727,7 +2727,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2925,7 +2925,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -3251,7 +3251,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -3425,7 +3425,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   2]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/stdout.expected
index 029dd972d9..2ec512b50d 100644
--- a/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/444f84074522a17b89cf4e24e859558a/stdout.expected
@@ -27,14 +27,14 @@ find var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMar
 find var6: int(-1..1)
 such that
     and([q1 + 1 <= var2_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, q43] =
               var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1 + 1, q43]
                   | q43 : int(1..3)])
          /\
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
          \/
          and([var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, q46] ->
@@ -103,7 +103,7 @@ such that
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13] =
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13 + 1]
          /\
-         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] <lex
+         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] .<
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13 + 1, ..]
              | q13 : int(1..3)]),
     and([q14 > var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -162,7 +162,7 @@ such that
          /\
          (flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q23, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q23 + 1, .., ..])
           \/
@@ -176,7 +176,7 @@ such that
           /\
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q23, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q23 + 1, .., ..]))
              | q23 : int(1..15)]),
@@ -196,7 +196,7 @@ such that
          and([q26 + 1 <= var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q25] ->
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q25, q26, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q25, q26 + 1, ..]
               \/
@@ -209,7 +209,7 @@ such that
               /\
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q25, q26, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q25, q26 + 1, ..]
                   | q26 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/model.expected.json b/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/model.expected.json
index 9c616838fb..c58a9c4fbe 100644
--- a/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/model.expected.json
@@ -503,7 +503,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -659,7 +659,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -809,7 +809,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/stdout.expected b/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/stdout.expected
index b0b81bcb99..34a84214d1 100644
--- a/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/44dd846c20ee4eb39d7cc4a19408a0ae/stdout.expected
@@ -36,21 +36,21 @@ such that
          var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_NumParts[q6] =
          var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_NumParts[q6 + 1]
          /\
-         (var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_WhichPart[q6, ..] <lex
+         (var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_WhichPart[q6, ..] .<
           var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_WhichPart[q6 + 1, ..]
           \/
           and([var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_WhichPart[q6, q20] =
                var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_WhichPart[q6 + 1, q20]
                    | q20 : bool])
           /\
-          (var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_PartSizes[q6, ..] <lex
+          (var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_PartSizes[q6, ..] .<
            var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_PartSizes[q6 + 1, ..]
            \/
            and([var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_PartSizes[q6, q22] =
                 var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_PartSizes[q6 + 1, q22]
                     | q22 : int(1..2)])
            /\
-           var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_FirstIndex[q6, ..] <lex
+           var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_FirstIndex[q6, ..] .<
            var4_ExplicitVarSizeWithMarkerR18_Values_PartitionOccurrence_FirstIndex[q6 + 1, ..]))
              | q6 : int(1..15)]),
     and([q7 > var4_ExplicitVarSizeWithMarkerR18_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/model.expected.json b/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/model.expected.json
index 5acc08338c..98d37946fe 100644
--- a/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/model.expected.json
@@ -172,7 +172,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -424,7 +424,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/stdout.expected b/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/stdout.expected
index 3d813a24e4..0971ddb11e 100644
--- a/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/461bdf3c29b2f09b541034b080952550/stdout.expected
@@ -14,7 +14,7 @@ find var6_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..3), int(0,
 such that
     var4,
     and([var2_ExplicitVarSizeWithFlags_Flags[q10 + 1] ->
-         var2_ExplicitVarSizeWithFlags_Values[q10, ..] <lex var2_ExplicitVarSizeWithFlags_Values[q10 + 1, ..]
+         var2_ExplicitVarSizeWithFlags_Values[q10, ..] .< var2_ExplicitVarSizeWithFlags_Values[q10 + 1, ..]
              | q10 : int(1..3)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q11] = false ->
          and([var2_ExplicitVarSizeWithFlags_Values[q11, q31] = false | q31 : int(4, 5)])
@@ -26,7 +26,7 @@ such that
     var5_ExplicitVarSizeWithFlags_Flags[1] >= -4,
     1 = var5_ExplicitVarSizeWithFlags_Flags[1],
     and([var6_ExplicitVarSizeWithFlags_Flags[q25 + 1] ->
-         var6_ExplicitVarSizeWithFlags_Values[q25, ..] <lex var6_ExplicitVarSizeWithFlags_Values[q25 + 1, ..]
+         var6_ExplicitVarSizeWithFlags_Values[q25, ..] .< var6_ExplicitVarSizeWithFlags_Values[q25 + 1, ..]
              | q25 : int(1..2)]),
     and([var6_ExplicitVarSizeWithFlags_Flags[q26] = false ->
          and([var6_ExplicitVarSizeWithFlags_Values[q26, q32] = false | q32 : int(0, 1)])
diff --git a/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/model.expected.json b/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/model.expected.json
index 2f57961704..53cda086c3 100644
--- a/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/stdout.expected b/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/stdout.expected
index 7aa872dd7e..b5ea3208e3 100644
--- a/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/463c263b7ca3948dadc72aac12f03675/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find unused: bool
-such that [false; int(1)] <lex image(function([true; int(1)] --> [true; int(1)]), [false; int(1)])
+such that [false; int(1)] .< image(function([true; int(1)] --> [true; int(1)]), [false; int(1)])
diff --git a/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/model.expected.json b/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/model.expected.json
index d586b2e968..c464c92ddd 100644
--- a/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/model.expected.json
@@ -240,7 +240,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -293,7 +293,7 @@
                                                                                                                                null,
                                                                                                                                null]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/stdout.expected b/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/stdout.expected
index 0530f0a4f9..9df5b951b4 100644
--- a/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/48929a67dab909763280169f5d4632b9/stdout.expected
@@ -17,13 +17,13 @@ such that
          /\
          (var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1, ..]
-          <lex
+          .<
           var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1 + 1, ..]
           \/
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/model.expected.json b/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/model.expected.json
index 2dcd97554b..e149e89731 100644
--- a/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/model.expected.json
@@ -299,7 +299,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1907,7 +1907,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/stdout.expected b/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/stdout.expected
index e956bfc3e5..3480c89450 100644
--- a/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/48faac38ade4e0680ba7f0e26fc7d315/stdout.expected
@@ -27,7 +27,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1 + 1, ..]
          \/
@@ -144,7 +144,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13 + 1, ..]
              | q13 : int(1..3)]),
     and([q14 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/model.expected.json b/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/model.expected.json
index deb3598acf..0a9287f40e 100644
--- a/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/model.expected.json
@@ -805,7 +805,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -957,7 +957,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/stdout.expected b/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/stdout.expected
index 99fdc9d2fe..b460ffe778 100644
--- a/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/499e079eb49364e5f37956fbd5635887/stdout.expected
@@ -53,7 +53,7 @@ such that
                   | q39 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q18]
@@ -62,7 +62,7 @@ such that
                   [q1 + 1, q18]
                   | q18 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q21]
diff --git a/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/model.expected.json
index 59624ebfc5..e5ae36a905 100644
--- a/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/model.expected.json
@@ -299,7 +299,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1846,7 +1846,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/stdout.expected
index 67d8533549..a0788612c1 100644
--- a/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/49c4bb2084ae145c951d6e363a90ea9f/stdout.expected
@@ -27,7 +27,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1 + 1, ..]
          \/
@@ -142,7 +142,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13 + 1, ..]
              | q13 : int(1..3)]),
     and([q14 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/model.expected.json b/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/model.expected.json
index 3b47073f8f..78477a6e6d 100644
--- a/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/model.expected.json
@@ -151,7 +151,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}}]}},
                                                                               {"Op":
-                                                                                   {"MkOpLexLt":
+                                                                                   {"MkOpDotLt":
                                                                                         [{"Op":
                                                                                               {"MkOpSlicing":
                                                                                                    [{"Op":
@@ -490,7 +490,7 @@
                                                                                                     [{"TagInt": []},
                                                                                                      2]}}]}]]},
                                                                              [{"Op":
-                                                                                   {"MkOpLexLt":
+                                                                                   {"MkOpDotLt":
                                                                                         [{"Op":
                                                                                               {"MkOpSlicing":
                                                                                                    [{"Op":
@@ -520,7 +520,7 @@
                                                                                                                           2]}}]}},
                                                                                                     null, null]}}]}},
                                                                               {"Op":
-                                                                                   {"MkOpLexLt":
+                                                                                   {"MkOpDotLt":
                                                                                         [{"Op":
                                                                                               {"MkOpSlicing":
                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/stdout.expected b/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/stdout.expected
index 31a91dee5e..9ec7510dc6 100644
--- a/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/49c6df33edfc97e3f0f7b81aa6940880/stdout.expected
@@ -11,7 +11,7 @@ such that
     var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Marker[1] =
     var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Marker[2]
     /\
-    var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Values[1, ..] <lex
+    var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Values[1, ..] .<
     var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Values[2, ..]
     \/
     and([q13 <= var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Marker[1] ->
@@ -28,10 +28,10 @@ such that
                  | q19 : int(1..2)])
              | q17 : int(1..2)])
     /\
-    (var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Flags[1, ..] <lex
+    (var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Flags[1, ..] .<
      var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Flags[2, ..]
      \/
-     var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Values[1, ..] <lex
+     var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Values[1, ..] .<
      var1_RelationAsSet_Explicit_2_ExplicitVarSizeWithFlags_Values[2, ..]),
     and([2 <= var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Marker[q2] ->
          var1_RelationAsSet_Explicit_1_ExplicitVarSizeWithMarker_Values[q2, 1] <
diff --git a/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/model.expected.json b/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/model.expected.json
index 6d71c18c54..49df3f8549 100644
--- a/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/model.expected.json
@@ -1372,7 +1372,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1554,7 +1554,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1811,7 +1811,7 @@
                                                                                               [{"TagInt": []},
                                                                                                2]}}]}]]},
                                                                        [{"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
@@ -1924,7 +1924,7 @@
                                                                                                                                               []},
                                                                                                                                          2]}}}}]}}]}},
                                                                                               {"Op":
-                                                                                                   {"MkOpLexLt":
+                                                                                                   {"MkOpDotLt":
                                                                                                         [{"Op":
                                                                                                               {"MkOpSlicing":
                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/stdout.expected b/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/stdout.expected
index b5984218b1..669a5b2e33 100644
--- a/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/4a598ea5ec7744cc20c3a53601371daf/stdout.expected
@@ -85,7 +85,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -98,7 +98,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..3)]),
@@ -117,7 +117,7 @@ such that
          (2 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 2, ..]
           \/
@@ -129,7 +129,7 @@ such that
           /\
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 2, ..])
              | q7 : int(1..4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/model.expected.json
index df0deb9ec6..fa5ea8c7db 100644
--- a/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/model.expected.json
@@ -676,7 +676,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1247,7 +1247,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/stdout.expected
index 7c921b3acc..e9e0576bca 100644
--- a/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/4aba79f85e75b7880783738a0de5456f/stdout.expected
@@ -42,7 +42,7 @@ such that
          var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q2] =
          var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q2 + 1]
          /\
-         var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q2, ..] <lex
+         var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q2, ..] .<
          var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q2 + 1, ..]
              | q2 : int(1..3)]),
     and([q2 > var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -77,7 +77,7 @@ such that
          var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q2] =
          var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q2 + 1]
          /\
-         var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q2, ..] <lex
+         var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q2, ..] .<
          var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q2 + 1, ..]
              | q2 : int(1..3)]),
     and([q2 > var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/model.expected.json b/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/model.expected.json
index 22be24e4a2..479ccb279e 100644
--- a/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/model.expected.json
@@ -815,7 +815,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -983,7 +983,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1133,7 +1133,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/stdout.expected b/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/stdout.expected
index ecff948fc0..a62a7bec4d 100644
--- a/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/4b23607e697a7b33b7855bb9e6d8e164/stdout.expected
@@ -68,21 +68,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/model.expected.json b/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/model.expected.json
index 7dd0b2d4bd..e192e37360 100644
--- a/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/model.expected.json
@@ -180,7 +180,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -232,7 +232,7 @@
                                                                                                          null,
                                                                                                          null]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -284,7 +284,7 @@
                                                                                                          null,
                                                                                                          null]}}]}}]]}}}},
                                                              {"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/stdout.expected b/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/stdout.expected
index 0c5576a336..3e70532e56 100644
--- a/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/4be21fd12a8819847cbd51dea1e370a3/stdout.expected
@@ -17,18 +17,18 @@ such that
     var4,
     and([q4 + 1 <= var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q4, ..]
-         <lex
+         .<
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q4 + 1, ..]
          \/
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q4, ..]
-         <lex
+         .<
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q4 + 1, ..]
          \/
          flatten(var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_RelationAsMatrix[q4, .., ..])
-         <lex
+         .<
          flatten(var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_RelationAsMatrix
                      [q4 + 1, .., ..])
              | q4 : int(1..2)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/model.expected.json b/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/model.expected.json
index 7519226344..22893b6e5a 100644
--- a/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/model.expected.json
@@ -25,7 +25,7 @@
                             {"ConstantAbstract":
                                  {"AbsLitFunction": [[{"ConstantBool": true}, {"ConstantBool": false}]]}}},
                        {"Op":
-                            {"MkOpLexLeq":
+                            {"MkOpDotLeq":
                                  [{"Reference": [{"Name": "var1"}, null]},
                                   {"Constant":
                                        {"ConstantAbstract":
diff --git a/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/stdout.expected b/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/stdout.expected
index 02ae74592d..3b7d4be98d 100644
--- a/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/4ea83cdfbcaf661ef1707eb376d12dcb/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find var1: matrix indexed by [int(2..4, 2)] of bool
-such that image(function(true --> false), var1 <=lex [true; int(1)])
+such that image(function(true --> false), var1 .<= [true; int(1)])
diff --git a/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/model.expected.json
index d7330d88ff..28102d11da 100644
--- a/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/model.expected.json
@@ -557,7 +557,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -709,7 +709,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/stdout.expected
index 6ad4698c71..4d41bfec15 100644
--- a/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/4f9ae4ffb009a3b226c8414061bd362f/stdout.expected
@@ -38,7 +38,7 @@ such that
                   | q28 : int(-4, 4)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q14]
@@ -47,7 +47,7 @@ such that
                   [q1 + 1, q14]
                   | q14 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q17]
diff --git a/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/model.expected.json
index 9459fcc9a4..0e3f4fbc14 100644
--- a/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/model.expected.json
@@ -350,7 +350,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -403,7 +403,7 @@
                                                                                                                                null,
                                                                                                                                null]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/stdout.expected
index 3c2803e0a2..f4419375e8 100644
--- a/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5066c398855444982cf41c9d767fd995/stdout.expected
@@ -30,13 +30,13 @@ such that
          /\
          (var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q4, ..]
-          <lex
+          .<
           var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q4 + 1, ..]
           \/
           flatten(var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q4 + 1, .., ..]))
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/model.expected.json
index 7329efef9e..a1d378c9f5 100644
--- a/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpIndexing":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/stdout.expected
index aa77df8cc4..ab0a9f4484 100644
--- a/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5068bddda9fe656697ec6de2579580db/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find unused: bool
-such that [[true; int(1)]; int(1)][2] <lex [false | l_1 : bool, l_2 : bool]
+such that [[true; int(1)]; int(1)][2] .< [false | l_1 : bool, l_2 : bool]
diff --git a/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/model.expected.json
index 31f03a69b5..5e6a9d4813 100644
--- a/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/model.expected.json
@@ -356,7 +356,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1097,7 +1097,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/stdout.expected
index 3a00d05db0..869008f556 100644
--- a/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5389d8ae83d9b2260e7c5697c481970a/stdout.expected
@@ -33,7 +33,7 @@ such that
          var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Flag[q1] =
          var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Flag[q1 + 1]
          /\
-         var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlagsR8_Values_ExplicitWithRepetition_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([var1_ExplicitVarSizeWithFlagsR8_Flags[q2] = false ->
@@ -79,7 +79,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q19, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q19, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q19 + 1, ..]
              | q19 : int(1..3)]),
     and([q20 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/model.expected.json
index b471c9d6b8..db19f8b5c6 100644
--- a/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/model.expected.json
@@ -1071,7 +1071,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1223,7 +1223,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/stdout.expected
index 1cc1151af3..cbcb3a31f6 100644
--- a/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/54c995d240bca20d3853847acef38f4b/stdout.expected
@@ -63,7 +63,7 @@ such that
                   | q47 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
@@ -72,7 +72,7 @@ such that
                   [q1 + 1, q16]
                   | q16 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q19]
diff --git a/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/model.expected.json
index cc52596b25..0becb3447f 100644
--- a/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/model.expected.json
@@ -209,7 +209,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -355,7 +355,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1451,7 +1451,7 @@
                                                                                                                                                                []},
                                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                                    {"Op":
-                                                                                                        {"MkOpLexLt":
+                                                                                                        {"MkOpDotLt":
                                                                                                              [{"Op":
                                                                                                                    {"MkOpSlicing":
                                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/stdout.expected
index ea376cc8fd..25ad044e3a 100644
--- a/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5537b34a9991a0fb4580102062c0b795/stdout.expected
@@ -20,14 +20,14 @@ such that
     4 <= var3,
     false,
     and([q1 + 1 <= var1_ExplicitWithRepetitionR4_Flag ->
-         var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Flags[q1, q11] =
               var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, q11]
                   | q11 : int(1..4)])
          /\
-         var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Values[q1, ..] <=lex
+         var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Values[q1, ..] .<=
          var1_ExplicitWithRepetitionR4_Values_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..2047)]),
     and([q2 > var1_ExplicitWithRepetitionR4_Flag ->
@@ -82,7 +82,7 @@ such that
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_1[q25, q26] =
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_1[q25, q26 + 1]
               /\
-              var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q25, q26, ..] <lex
+              var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q25, q26, ..] .<
               var2_RelationAsSetR9_ExplicitVarSizeWithMarkerR9_Values_2_Function1D[q25, q26 + 1, ..]
                   | q26 : int(1..3)])
              | q25 : int(5, 4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/model.expected.json
index fd934cbf06..9a0ef79878 100644
--- a/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/model.expected.json
@@ -2017,7 +2017,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2216,7 +2216,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2543,7 +2543,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2718,7 +2718,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  3]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/stdout.expected
index b5112a7a1f..addcd1e500 100644
--- a/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5730851ebaf12a1212be46cc5a31235d/stdout.expected
@@ -120,7 +120,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -134,7 +134,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -155,7 +155,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -168,7 +168,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/model.expected.json
index 3ba4c61104..6a0fc9a0f8 100644
--- a/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/model.expected.json
@@ -358,7 +358,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -425,7 +425,7 @@
                                                                                                                                           null,
                                                                                                                                           null]}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/stdout.expected
index e1b9391e4b..0b14228a2d 100644
--- a/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5b7f553219b00b0d37cfc5bec0f2eaf6/stdout.expected
@@ -30,13 +30,13 @@ such that
          /\
          (flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags
                       [q4 + 1, .., ..])
           \/
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values
                       [q4 + 1, .., ..]))
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/model.expected.json
index adf9b6e871..4113d2002c 100644
--- a/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/model.expected.json
@@ -79,7 +79,7 @@
                         {"RangeSingle": {"Constant": {"ConstantInt": [{"TagInt": []}, 4]}}}]]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/stdout.expected
index 0cfb0acd5e..7739a571c6 100644
--- a/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5c05f9d9fdff466f29cbe3e931304e9a/stdout.expected
@@ -9,7 +9,7 @@ find var2_3_2: bool
 find var3: matrix indexed by [int(2, 0..5)] of int(0..3, 2..3)
 find var4: int(5, 4)
 such that
-    [true; int(1)] <lex [[true; int(0)], [true, true; int(1, 5)]; int(2, 5)][0, ..],
+    [true; int(1)] .< [[true; int(0)], [true, true; int(1, 5)]; int(2, 5)][0, ..],
     false,
     allDiff(var2_1_Function1D),
     and([or([var2_1_Function1D[q2] = q1 | q2 : bool]) | q1 : int(3, 2)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/model.expected.json
index 550204008e..81b4f9a96e 100644
--- a/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/model.expected.json
@@ -993,7 +993,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1191,7 +1191,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1518,7 +1518,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -1692,7 +1692,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   2]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/stdout.expected
index ab11926231..1897ba76c2 100644
--- a/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5cfc3c0f1cdd912aca8ac526cf3a7102/stdout.expected
@@ -66,7 +66,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q4 + 1, .., ..])
           \/
@@ -80,7 +80,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q4 + 1, .., ..]))
              | q4 : int(1..15)]),
@@ -99,7 +99,7 @@ such that
          and([q7 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q6, q7, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q6, q7 + 1, ..]
               \/
@@ -112,7 +112,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q6, q7, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q6, q7 + 1, ..]
                   | q7 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/model.expected.json
index f647d2cdc8..15855b55dd 100644
--- a/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/model.expected.json
@@ -168,7 +168,7 @@
                                                   {"Reference":
                                                        [{"Name": "var2_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -359,7 +359,7 @@
                                                   {"Reference":
                                                        [{"Name": "var6_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/stdout.expected
index 170a56a284..c2991240f1 100644
--- a/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5df0ac9ae39fb7bfbf5f990f89cd23d5/stdout.expected
@@ -14,7 +14,7 @@ find var6_ExplicitVarSizeWithMarker_Values: matrix indexed by [int(1..3), int(0,
 such that
     var4,
     and([q10 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         var2_ExplicitVarSizeWithMarker_Values[q10, ..] <lex var2_ExplicitVarSizeWithMarker_Values[q10 + 1, ..]
+         var2_ExplicitVarSizeWithMarker_Values[q10, ..] .< var2_ExplicitVarSizeWithMarker_Values[q10 + 1, ..]
              | q10 : int(1..3)]),
     and([q11 > var2_ExplicitVarSizeWithMarker_Marker ->
          and([var2_ExplicitVarSizeWithMarker_Values[q11, q27] = false | q27 : int(4, 5)])
@@ -25,7 +25,7 @@ such that
     var5_ExplicitVarSizeWithFlags_Flags[1] >= -4,
     1 = var5_ExplicitVarSizeWithFlags_Flags[1],
     and([q23 + 1 <= var6_ExplicitVarSizeWithMarker_Marker ->
-         var6_ExplicitVarSizeWithMarker_Values[q23, ..] <lex var6_ExplicitVarSizeWithMarker_Values[q23 + 1, ..]
+         var6_ExplicitVarSizeWithMarker_Values[q23, ..] .< var6_ExplicitVarSizeWithMarker_Values[q23 + 1, ..]
              | q23 : int(1..2)]),
     and([q24 > var6_ExplicitVarSizeWithMarker_Marker ->
          and([var6_ExplicitVarSizeWithMarker_Values[q24, q28] = false | q28 : int(0, 1)])
diff --git a/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/model.expected.json b/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/model.expected.json
index 10f2d43a31..9c1b5c4c19 100644
--- a/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/model.expected.json
@@ -354,7 +354,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1032,7 +1032,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/stdout.expected b/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/stdout.expected
index 9a52e4b7cd..753a7627af 100644
--- a/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/5f8abcfb913c155e5fcf9aad1689ee48/stdout.expected
@@ -33,7 +33,7 @@ such that
          var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Flag[q1] =
          var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Flag[q1 + 1]
          /\
-         var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Values[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_ExplicitVarSizeWithMarkerR8_Marker ->
@@ -78,7 +78,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q17] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q17 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q17, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q17, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q17 + 1, ..]
              | q17 : int(1..3)]),
     and([q18 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/model.expected.json b/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/model.expected.json
index 7406b6dbcf..f22ab4b65e 100644
--- a/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/model.expected.json
@@ -813,7 +813,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -981,7 +981,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1131,7 +1131,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/stdout.expected b/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/stdout.expected
index 26ab55f995..e3de862ffe 100644
--- a/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/603465a931823cf8433459de2d015883/stdout.expected
@@ -68,21 +68,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/model.expected.json b/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/model.expected.json
index a4750f341d..34456ab204 100644
--- a/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/model.expected.json
@@ -35,7 +35,7 @@
                                        [{"ConstantBool": true}, {"ConstantInt": [{"TagInt": []}, 4]}],
                                        [{"ConstantBool": true}, {"ConstantInt": [{"TagInt": []}, 0]}]]}}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/stdout.expected b/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/stdout.expected
index f822e02678..1ba4fe8315 100644
--- a/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/612a3b4f1e02d37d3c58b3ade9b248ef/stdout.expected
@@ -5,7 +5,7 @@ such that
     3 - 5 > var1,
     false,
     (function() : `function bool --> int`) = function(true --> 0, true --> 4, true --> 0),
-    [false, true, true, false; int(6..9)] <=lex [true, true, false, false, false; int(10..11, 1..3)],
+    [false, true, true, false; int(6..9)] .<= [true, true, false, false, false; int(10..11, 1..3)],
     image(function(5 --> true), 3 / var1),
     true in mset(false),
     false
diff --git a/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/model.expected.json b/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/model.expected.json
index 623a159818..a966dff4c5 100644
--- a/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/model.expected.json
@@ -327,7 +327,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -500,7 +500,7 @@
                                                                                                                                             []},
                                                                                                                                        3]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/stdout.expected b/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/stdout.expected
index 5b7490cce7..eeda9f43d2 100644
--- a/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/62efe6787e7be32b6775a9054b5e7a90/stdout.expected
@@ -27,7 +27,7 @@ such that
     and([q13 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q13, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q13 + 1, .., ..])
          \/
@@ -39,7 +39,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q13, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q13 + 1, .., ..])
              | q13 : int(1..2)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/model.expected.json
index 9de366f981..c7ba69251c 100644
--- a/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/model.expected.json
@@ -770,7 +770,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -938,7 +938,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1088,7 +1088,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/stdout.expected
index 947138277d..798e6eb171 100644
--- a/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/635d068c0ed6bbf9ed532bcb7160ca5b/stdout.expected
@@ -65,21 +65,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/model.expected.json b/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/model.expected.json
index 8a0cb6b07c..787e707bc0 100644
--- a/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/model.expected.json
@@ -317,7 +317,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/stdout.expected b/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/stdout.expected
index 5b4c650c63..1e0b91a649 100644
--- a/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/67856b9617d62beaf659a45708f21210/stdout.expected
@@ -28,7 +28,7 @@ such that
          /\
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4 + 1, .., ..])
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/model.expected.json b/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/model.expected.json
index 2b281cddd1..5b6b10f1bd 100644
--- a/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/model.expected.json
@@ -91,7 +91,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/stdout.expected b/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/stdout.expected
index 7cec744d64..939f8691bf 100644
--- a/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/6816e93188da042831d6849d9fc88b51/stdout.expected
@@ -8,7 +8,7 @@ find var3: bool
 such that
     var3,
     and([var2_ExplicitVarSizeWithFlags_Flags[q8 + 1] ->
-         flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q8, .., ..]) <lex
+         flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q8, .., ..]) .<
          flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q8 + 1, .., ..])
              | q8 : int(1..15)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q9] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/model.expected.json
index adf06b2103..53e48cac0e 100644
--- a/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/model.expected.json
@@ -765,7 +765,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -917,7 +917,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/stdout.expected
index c44ab7259e..97f900e3fc 100644
--- a/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/688d9c5f26c404975d660fcdd262858c/stdout.expected
@@ -49,7 +49,7 @@ such that
                   | q38 : int(-4, 4)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q18]
@@ -58,7 +58,7 @@ such that
                   [q1 + 1, q18]
                   | q18 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q21]
diff --git a/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/model.expected.json b/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/model.expected.json
index 7cf7b673a3..70e7f17a74 100644
--- a/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/model.expected.json
@@ -180,7 +180,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -317,7 +317,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -873,7 +873,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1252,7 +1252,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1386,7 +1386,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/stdout.expected b/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/stdout.expected
index 7118afa7e9..5d704d8bab 100644
--- a/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/6aca6588ab888f9c3965cb703a7ffa87/stdout.expected
@@ -17,14 +17,14 @@ such that
                q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values : matrix indexed by [int(1..4), bool] of
                                                                                    int(5),
                and([q1 + 1 <= q_4_ExplicitVarSizeWithMarker_Marker ->
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, ..]
                     \/
                     and([q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, q9] =
                          q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, q9]
                              | q9 : bool])
                     /\
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1 + 1, ..]
                         | q1 : int(1..3)]),
                and([q1 > q_4_ExplicitVarSizeWithMarker_Marker ->
@@ -53,7 +53,7 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3 + 1]
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3 + 1, ..]
              | q3 : int(1..7)]),
     and([q3 > var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -73,14 +73,14 @@ such that
                   | q4 : int(1..3)])
              | q3 : int(1..8)]),
     and([q5 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5, ..] <lex
+         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5, ..] .<
          var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5, q10] =
               var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q5 + 1, q10]
                   | q10 : bool])
          /\
-         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q5, ..] <lex
+         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q5, ..] .<
          var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q5 + 1, ..]
              | q5 : int(1..3)]),
     and([q5 > var2_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/model.expected.json b/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/model.expected.json
index 0538d40b86..0f1bb76d8a 100644
--- a/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/model.expected.json
@@ -717,7 +717,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -885,7 +885,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1035,7 +1035,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/stdout.expected b/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/stdout.expected
index 34ddd64ade..ca05df2bfe 100644
--- a/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/6d234926de4bf3efc85ef76d53a68827/stdout.expected
@@ -61,21 +61,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/model.expected.json b/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/model.expected.json
index 5d02abc2ea..a4eb890e6e 100644
--- a/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/model.expected.json
@@ -757,7 +757,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -925,7 +925,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1075,7 +1075,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/stdout.expected b/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/stdout.expected
index e53500b0ae..0e1cfbd0a8 100644
--- a/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/6e78775adcfd98bd61ddfa72523d20d7/stdout.expected
@@ -64,21 +64,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/model.expected.json b/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/model.expected.json
index e756e55968..c893ef83dd 100644
--- a/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/model.expected.json
@@ -311,7 +311,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/stdout.expected b/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/stdout.expected
index 0be6908d7a..e777e6024a 100644
--- a/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/6f115e6ceb931de245d1914a7238a5e1/stdout.expected
@@ -28,7 +28,7 @@ such that
          /\
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4 + 1, .., ..])
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/model.expected.json b/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/model.expected.json
index e9b5942bc9..7f60693036 100644
--- a/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/model.expected.json
@@ -1691,7 +1691,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1877,7 +1877,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2178,7 +2178,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2340,7 +2340,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/stdout.expected b/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/stdout.expected
index d77e1ea602..5270f6ea21 100644
--- a/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/70707c28efe6141f1c5f70cb86a86ffa/stdout.expected
@@ -109,7 +109,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -123,7 +123,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -144,7 +144,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -157,7 +157,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/model.expected.json b/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/model.expected.json
index 7b46e7b35e..dafd79a413 100644
--- a/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/model.expected.json
@@ -255,7 +255,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -401,7 +401,7 @@
                                                                                                                                             []},
                                                                                                                                        3]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1302,7 +1302,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/stdout.expected b/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/stdout.expected
index 237e0ae84b..58488179ad 100644
--- a/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/70729b148e4e70ab38cb319e8c952730/stdout.expected
@@ -27,14 +27,14 @@ such that
     given2,
     given1,
     and([var1_ExplicitVarSizeWithFlagsR7_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1, q12] =
               var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1 + 1, q12]
                   | q12 : int(1..3)])
          /\
-         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([var1_ExplicitVarSizeWithFlagsR7_Flags[q2] = false ->
@@ -85,7 +85,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q22] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q22 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q22, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q22, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q22 + 1, ..]
              | q22 : int(1..3)]),
     and([q23 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/model.expected.json
index 05d8c1c747..b3fbeed6bb 100644
--- a/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/model.expected.json
@@ -130,7 +130,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}}]}},
                                                                    {"Op":
-                                                                        {"MkOpLexLt":
+                                                                        {"MkOpDotLt":
                                                                              [{"Op":
                                                                                    {"MkOpFlatten":
                                                                                         [null,
@@ -336,7 +336,7 @@
                                                                                              [{"Name": "q5"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/stdout.expected
index 0217af90df..84209e9d01 100644
--- a/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/73472b413e1c687c0430a8719e4f016b/stdout.expected
@@ -13,8 +13,7 @@ such that
     var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[1] =
     var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[2]
     /\
-    flatten(var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[1, .., ..])
-    <lex
+    flatten(var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[1, .., ..]) .<
     flatten(var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[2, .., ..]),
     and([var6_ExplicitVarSizeWithFlags_Flags[q2] = false ->
          var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q2] = 0
@@ -28,7 +27,7 @@ such that
     and([var6_ExplicitVarSizeWithFlags_Flags[q5] ->
          and([q9 + 1 <= var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q5] ->
               var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[q5, q9, ..]
-              <lex
+              .<
               var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit
                   [q5, q9 + 1, ..]
                   | q9 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/model.expected.json b/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/model.expected.json
index 9f0d8cadb0..98145f0510 100644
--- a/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/model.expected.json
@@ -1648,7 +1648,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1846,7 +1846,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    8]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2171,7 +2171,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2345,7 +2345,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   4]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/stdout.expected b/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/stdout.expected
index e48f46604f..4728803b57 100644
--- a/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/73595304cbda134ee926997219f68122/stdout.expected
@@ -98,7 +98,7 @@ such that
          /\
          (flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -112,7 +112,7 @@ such that
           /\
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..255)]),
@@ -132,7 +132,7 @@ such that
          and([q8 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q7, q8, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q7, q8 + 1, ..]
               \/
@@ -145,7 +145,7 @@ such that
               /\
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q7, q8, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q7, q8 + 1, ..]
                   | q8 : int(1..7)])
diff --git a/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/model.expected.json b/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/model.expected.json
index 32a68ef087..f43f6cd3d7 100644
--- a/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/model.expected.json
@@ -144,7 +144,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -293,7 +293,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -751,7 +751,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -804,7 +804,7 @@
                                                                                                                                null,
                                                                                                                                null]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/stdout.expected b/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/stdout.expected
index b530a6b815..2c818f0483 100644
--- a/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/76e95ca7345ad8108828e20d9116d317/stdout.expected
@@ -11,14 +11,14 @@ find var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFl
         matrix indexed by [int(1..4), int(1..0)] of bool
 such that
     and([q1 + 1 <= var1_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, q15] =
               var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1 + 1, q15]
                   | q15 : int(1..2)])
          /\
-         var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
          \/
          and([var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, q18] ->
@@ -35,10 +35,10 @@ such that
                       | q24 : int(1..2)])
                   | q22 : int(1..2)])
          /\
-         (var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         (var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
           var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
           \/
-          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+          var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[q1, ..] .<
           var1_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[q1 + 1, ..])
              | q1 : int(1..3)]),
     and([q2 > var1_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/model.expected.json b/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/model.expected.json
index 17620e9782..f6dc1054ff 100644
--- a/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/model.expected.json
@@ -1705,7 +1705,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1891,7 +1891,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2194,7 +2194,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2356,7 +2356,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/stdout.expected b/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/stdout.expected
index 4cca3cbb8c..d1d9c39af9 100644
--- a/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/77bf93b23c2e5269471d3e07d2d0eff3/stdout.expected
@@ -109,7 +109,7 @@ such that
          /\
          (flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -123,7 +123,7 @@ such that
           /\
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -143,7 +143,7 @@ such that
          and([q2 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -156,7 +156,7 @@ such that
               /\
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/model.expected.json
index 50ea2a3a7a..6d27e460ee 100644
--- a/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/model.expected.json
@@ -1169,7 +1169,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1351,7 +1351,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1608,7 +1608,7 @@
                                                                                               [{"TagInt": []},
                                                                                                2]}}]}]]},
                                                                        [{"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
@@ -1721,7 +1721,7 @@
                                                                                                                                               []},
                                                                                                                                          2]}}}}]}}]}},
                                                                                               {"Op":
-                                                                                                   {"MkOpLexLt":
+                                                                                                   {"MkOpDotLt":
                                                                                                         [{"Op":
                                                                                                               {"MkOpSlicing":
                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/stdout.expected
index 575200be1f..a42efa66e0 100644
--- a/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7813ae28e21e6cf03109291d165d4647/stdout.expected
@@ -73,7 +73,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -86,7 +86,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..3)]),
@@ -105,7 +105,7 @@ such that
          (2 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 2, ..]
           \/
@@ -117,7 +117,7 @@ such that
           /\
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 2, ..])
              | q7 : int(1..4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/model.expected.json
index 0a8e9942f4..fa34a497c6 100644
--- a/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/model.expected.json
@@ -275,7 +275,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -450,7 +450,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -897,7 +897,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/stdout.expected
index 34db1b9e9e..c3478fdd9d 100644
--- a/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7842b5f4c7ad574e4dd5e285a6512004/stdout.expected
@@ -27,7 +27,7 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Marker ->
-         var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q6, ..] <lex
+         var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q6, ..] .<
          var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q6 + 1, ..]
          \/
          (var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_2_ExplicitVarSizeWithMarker_Marker
@@ -44,7 +44,7 @@ such that
           /\
           var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -92,7 +92,7 @@ such that
     and([q31 <= var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Marker /\
          q32 <= var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Marker
          ->
-         (var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q31, ..] <lex
+         (var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q31, ..] .<
           var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q32, ..]
           ->
           or([q34 <=
diff --git a/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/model.expected.json
index 839eb42c6a..c899adaded 100644
--- a/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/model.expected.json
@@ -768,7 +768,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -936,7 +936,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1086,7 +1086,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/stdout.expected
index 74512812d0..06f78c0d76 100644
--- a/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/788102a4292eb30458166a213f53d06b/stdout.expected
@@ -64,21 +64,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/model.expected.json
index be487c6480..1fc710f9a1 100644
--- a/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/model.expected.json
@@ -260,7 +260,7 @@
                                                                    null]},
                                                              {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/stdout.expected
index 4c7e23483b..18dec19900 100644
--- a/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7916e2376c2f7a027a1836f83d31e41f/stdout.expected
@@ -17,7 +17,7 @@ such that
              | q1_Function1D : matrix indexed by [bool] of int(3..5, 4), allDiff(q1_Function1D), false, true]),
     var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] >= 1,
     and([q6 + 1 <= var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6, ..] <lex
+         var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6, ..] .<
          var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6 + 1, ..]
              | q6 : int(1..255)]),
     and([q7 > var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] ->
diff --git a/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/model.expected.json
index 35b0894e16..d854497213 100644
--- a/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/model.expected.json
@@ -365,7 +365,7 @@
                                                                                                                                     []},
                                                                                                                                1]}}]]}}}}]}}]}},
                                                                         {"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpFlatten":
                                                                                              [null,
@@ -481,7 +481,7 @@
                                                                              {"Reference":
                                                                                   [{"Name": "q5"}, null]}]}}]}},
                                                        {"Op":
-                                                            {"MkOpLexLt":
+                                                            {"MkOpDotLt":
                                                                  [{"Op":
                                                                        {"MkOpSlicing":
                                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/stdout.expected
index d7f96daccb..498be02bb9 100644
--- a/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7b0c8abe457f0fb2a4ff0e27c5acc7ef/stdout.expected
@@ -23,11 +23,11 @@ such that
          var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         flatten(var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q4, .., ..]) <lex
+         flatten(var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q4, .., ..]) .<
          flatten(var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q4 + 1, .., ..])
              | q4 : int(1..4)]),
     and([and([q6 + 1 <= var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q5] ->
-              var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q5, q6, ..] <lex
+              var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q5, q6, ..] .<
               var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q5, q6 + 1, ..]
                   | q6 : int(1..5)])
              | q5 : int(1..5)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/model.expected.json
index c6457cd646..7b7970dd66 100644
--- a/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/model.expected.json
@@ -464,7 +464,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -614,7 +614,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    3]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1417,7 +1417,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/stdout.expected
index 22f54a1eef..f1c820f862 100644
--- a/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7b43b4a26dc012bc58edd762a212c306/stdout.expected
@@ -38,7 +38,7 @@ such that
          /\
          (var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q5, ..]
-          <lex
+          .<
           var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q5 + 1, ..]
           \/
@@ -51,7 +51,7 @@ such that
           /\
           flatten(var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..15)]),
@@ -123,7 +123,7 @@ such that
               /\
               var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q13, ..]
-              <lex
+              .<
               var4_ExplicitVarSizeWithMarkerR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q13 + 1, ..]
                   | q13 : int(1..2)])
diff --git a/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/model.expected.json
index d1b04967ad..bdcb02a1e6 100644
--- a/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/model.expected.json
@@ -277,7 +277,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -344,7 +344,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -493,7 +493,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1042,7 +1042,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/stdout.expected
index 1475f3cd1e..7c14771118 100644
--- a/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7b5e1f92bb5d4a7807d1d23d112cd92d/stdout.expected
@@ -27,12 +27,12 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Marker ->
-         var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q6, ..] <lex
+         var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q6, ..] .<
          var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q6 + 1, ..]
          \/
          (var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6 + 1, ..]
           \/
@@ -45,7 +45,7 @@ such that
           /\
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -101,7 +101,7 @@ such that
     and([q36 <= var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Marker /\
          q37 <= var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Marker
          ->
-         (var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q36, ..] <lex
+         (var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q36, ..] .<
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q37, ..]
           ->
           or([var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Flags
diff --git a/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/model.expected.json
index a30b54b4cb..7dbb233ea4 100644
--- a/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/model.expected.json
@@ -107,7 +107,7 @@
                                  [{"Constant": {"ConstantAbstract": {"AbsLitTuple": [{"ConstantBool": false}]}}},
                                   {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}},
                        {"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Comprehension":
                                        [{"Reference": [{"Name": "l_2"}, null]},
                                         [{"Generator":
diff --git a/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/stdout.expected
index 20b79e6531..15268c3875 100644
--- a/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7c756ce0724280ed59c97a84dd82e7c0/stdout.expected
@@ -7,4 +7,4 @@ find var3:
          partition (maxNumParts 0, maxPartSize 2) from int(1, 5), matrix indexed by [int(5, 5)] of bool)
 find var4: set (minSize -3) of partition (maxNumParts 0, minPartSize 4) from int(2, 2)
 find var5: set (minSize 5, maxSize 5) of tuple (int(2, 4))
-such that tuple (false)[1] > ([l_2 | l_1 : int(4, 2), l_2 : int(2, 5), true] <lex [l_3 | l_3 : int(4..5, 4)])
+such that tuple (false)[1] > ([l_2 | l_1 : int(4, 2), l_2 : int(2, 5), true] .< [l_3 | l_3 : int(4..5, 4)])
diff --git a/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/model.expected.json
index 5bd43c414b..edb8b17a05 100644
--- a/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/model.expected.json
@@ -1076,7 +1076,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1709,7 +1709,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1843,7 +1843,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/stdout.expected
index f03c45f9ee..96dddd522f 100644
--- a/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7c9328a9df7d3971ebc02d3a5d032831/stdout.expected
@@ -82,7 +82,7 @@ such that
          >= 1
              | q56 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
@@ -120,14 +120,14 @@ such that
              | q17 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([q24 + 1 <= var5_ExplicitWithRepetitionR10_Flag ->
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24, ..] <lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24, ..] .<
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24 + 1, ..]
          \/
          and([var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24, q34] =
               var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24 + 1, q34]
                   | q34 : bool])
          /\
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q24, ..] <=lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q24, ..] .<=
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q24 + 1, ..]
              | q24 : int(1..255)]),
     and([q25 > var5_ExplicitWithRepetitionR10_Flag ->
diff --git a/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/model.expected.json
index a55719fe16..aac0dce5ba 100644
--- a/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/model.expected.json
@@ -261,7 +261,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -407,7 +407,7 @@
                                                                                                                                             []},
                                                                                                                                        3]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1300,7 +1300,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/stdout.expected
index 07c80f3e68..b092d585fd 100644
--- a/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7cc8838035af5627767687a2a0dd2023/stdout.expected
@@ -27,14 +27,14 @@ such that
     given2,
     given1,
     and([var1_ExplicitVarSizeWithFlagsR7_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1, q12] =
               var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Flags[q1 + 1, q12]
                   | q12 : int(1..3)])
          /\
-         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlagsR7_Values_ExplicitWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([var1_ExplicitVarSizeWithFlagsR7_Flags[q2] = false ->
@@ -83,7 +83,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q23] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q23 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q23, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q23, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q23 + 1, ..]
              | q23 : int(1..3)]),
     and([q24 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/model.expected.json
index 5db717ffee..ca8bf65fec 100644
--- a/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/model.expected.json
@@ -1754,7 +1754,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1940,7 +1940,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2241,7 +2241,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2403,7 +2403,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/stdout.expected
index 05f3eb9b51..9546096121 100644
--- a/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7eeaf2347f1bf8b83db5d0b7c15483e6/stdout.expected
@@ -114,7 +114,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -128,7 +128,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -149,7 +149,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -162,7 +162,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/model.expected.json b/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/model.expected.json
index 24ad10c406..904e957d97 100644
--- a/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/model.expected.json
@@ -1879,7 +1879,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2081,7 +2081,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2416,7 +2416,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2594,7 +2594,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             1]}}}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/stdout.expected b/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/stdout.expected
index c854de8162..c9b09059fa 100644
--- a/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/7fe2fcf2a860ff56a8cce5c04d1de189/stdout.expected
@@ -100,7 +100,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -114,7 +114,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -134,7 +134,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -147,7 +147,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/model.expected.json b/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/model.expected.json
index 5effe992b2..a8988dba42 100644
--- a/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/model.expected.json
@@ -275,7 +275,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -450,7 +450,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -833,7 +833,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/stdout.expected b/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/stdout.expected
index 1b8809f168..5d22184ddf 100644
--- a/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/818ec086c054d27d412fd647960ada42/stdout.expected
@@ -27,7 +27,7 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Marker ->
-         var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q6, ..] <lex
+         var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q6, ..] .<
          var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q6 + 1, ..]
          \/
          (var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_2_ExplicitVarSizeWithMarker_Marker
@@ -44,7 +44,7 @@ such that
           /\
           var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -91,7 +91,7 @@ such that
     and([q31 <= var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Marker /\
          q32 <= var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Marker
          ->
-         (var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q31, ..] <lex
+         (var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q31, ..] .<
           var1_FunctionAsRelationR3R5_RelationAsSetR3R5_ExplicitVarSizeWithMarkerR3R5_Values_1_Explicit[q32, ..]
           ->
           or([q34 <=
diff --git a/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/model.expected.json b/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/model.expected.json
index b67746d024..9e216cb486 100644
--- a/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/model.expected.json
@@ -132,7 +132,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -281,7 +281,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -721,7 +721,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/stdout.expected b/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/stdout.expected
index dd178e25b3..7cc4bab1b3 100644
--- a/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/827f1d4ebd57ab718caa032cc8b297fc/stdout.expected
@@ -11,7 +11,7 @@ such that
     false,
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
@@ -24,7 +24,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
@@ -56,7 +56,7 @@ such that
                       | q31 : int(1..2)])
                   | q29 : int(1..2)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/model.expected.json
index 23c4d83c28..fe0385d6d4 100644
--- a/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/model.expected.json
@@ -684,7 +684,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]}}]}},
                                                   {"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
@@ -966,7 +966,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1100,7 +1100,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1601,7 +1601,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1753,7 +1753,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/stdout.expected
index ed2dec1bc6..0b430a5d86 100644
--- a/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8367e8de71de185d6acf3e859e23a37b/stdout.expected
@@ -56,8 +56,7 @@ such that
              | q61 : int(1..4)]),
     1 <= var1_ExplicitVarSizeWithMarker_Marker ->
     and([q9 + 1 <= var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, q9, ..]
-         <lex
+         var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, q9, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, q9 + 1, ..]
              | q9 : int(1..3)]),
     1 <= var1_ExplicitVarSizeWithMarker_Marker ->
@@ -77,14 +76,14 @@ such that
          <= 0
              | q11 : int(1..4)]),
     and([var3_ExplicitVarSizeWithFlags_Flags[q32 + 1] ->
-         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q32, ..] <lex
+         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q32, ..] .<
          var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q32 + 1, ..]
          \/
          and([var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q32, q67] =
               var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q32 + 1, q67]
                   | q67 : bool])
          /\
-         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q32, ..] <lex
+         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q32, ..] .<
          var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q32 + 1, ..]
              | q32 : int(1..2)]),
     and([var3_ExplicitVarSizeWithFlags_Flags[q33] = false ->
@@ -111,14 +110,14 @@ such that
          0 = sum([toInt(var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q36, q40]) | q40 : bool])
              | q36 : int(1..3)]),
     and([var4_ExplicitVarSizeWithFlags_Flags[q42 + 1] ->
-         var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q42, ..] <lex
+         var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q42, ..] .<
          var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q42 + 1, ..]
          \/
          and([var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q42, q69] =
               var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q42 + 1, q69]
                   | q69 : int(2, 4)])
          /\
-         var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q42, ..] <lex
+         var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q42, ..] .<
          var4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q42 + 1, ..]
              | q42 : int(1..15)]),
     and([var4_ExplicitVarSizeWithFlags_Flags[q43] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/model.expected.json
index fe6bdcca01..210cc2b0bc 100644
--- a/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/model.expected.json
@@ -902,7 +902,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1039,7 +1039,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/stdout.expected
index 2c2a5d6d33..1e0f4343cb 100644
--- a/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/83e79dafff20cf8bb9bbf4e0e4da6ed2/stdout.expected
@@ -60,7 +60,7 @@ such that
                   | q42 : int(1..2)])
              | q1 : int(1..31)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q13]
@@ -69,7 +69,7 @@ such that
                   [q1 + 1, q13]
                   | q13 : bool])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
diff --git a/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/model.expected.json b/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/model.expected.json
index 96ac4ac0f1..e4e37f2d8c 100644
--- a/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/model.expected.json
@@ -245,7 +245,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -423,7 +423,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    5]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -787,7 +787,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -941,7 +941,7 @@
                                                                                                                                                     []},
                                                                                                                                                1]}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/stdout.expected b/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/stdout.expected
index a477af2141..49ca37e21d 100644
--- a/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/851192d3d7c1ec86c1869bb52c0f6640/stdout.expected
@@ -16,7 +16,7 @@ such that
          /\
          (flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q1 + 1, .., ..])
           \/
@@ -29,7 +29,7 @@ such that
           /\
           flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..2)]),
@@ -51,7 +51,7 @@ such that
          and([q6 + 1 <= var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Marker[q5] ->
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q5, q6, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q5, q6 + 1, ..]
               \/
@@ -63,7 +63,7 @@ such that
               /\
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q5, q6, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q5, q6 + 1, ..]
                   | q6 : int(1..4)])
diff --git a/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/model.expected.json
index 3f505a735e..16aecbb8ee 100644
--- a/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/model.expected.json
@@ -170,7 +170,7 @@
                                                   {"Reference":
                                                        [{"Name": "var2_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -361,7 +361,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/stdout.expected
index 333f9c3355..695d4367d7 100644
--- a/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/85b8db7be2f6abe894214a12a3d2b71d/stdout.expected
@@ -14,7 +14,7 @@ find var6_ExplicitVarSizeWithFlags_Values: matrix indexed by [int(1..3), int(0,
 such that
     var4,
     and([q10 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         var2_ExplicitVarSizeWithMarker_Values[q10, ..] <lex var2_ExplicitVarSizeWithMarker_Values[q10 + 1, ..]
+         var2_ExplicitVarSizeWithMarker_Values[q10, ..] .< var2_ExplicitVarSizeWithMarker_Values[q10 + 1, ..]
              | q10 : int(1..3)]),
     and([q11 > var2_ExplicitVarSizeWithMarker_Marker ->
          and([var2_ExplicitVarSizeWithMarker_Values[q11, q29] = false | q29 : int(4, 5)])
@@ -25,7 +25,7 @@ such that
     var5_ExplicitVarSizeWithFlags_Flags[1] >= -4,
     1 = var5_ExplicitVarSizeWithFlags_Flags[1],
     and([var6_ExplicitVarSizeWithFlags_Flags[q23 + 1] ->
-         var6_ExplicitVarSizeWithFlags_Values[q23, ..] <lex var6_ExplicitVarSizeWithFlags_Values[q23 + 1, ..]
+         var6_ExplicitVarSizeWithFlags_Values[q23, ..] .< var6_ExplicitVarSizeWithFlags_Values[q23 + 1, ..]
              | q23 : int(1..2)]),
     and([var6_ExplicitVarSizeWithFlags_Flags[q24] = false ->
          and([var6_ExplicitVarSizeWithFlags_Values[q24, q30] = false | q30 : int(0, 1)])
diff --git a/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/model.expected.json
index 33e81ac444..69d1741fd9 100644
--- a/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/model.expected.json
@@ -601,7 +601,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/stdout.expected
index a9442c9cc2..23b5151cf3 100644
--- a/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/86302603127c6befda9307b173096b8d/stdout.expected
@@ -48,7 +48,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q10] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q10 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q10, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q10, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q10 + 1, ..]
              | q10 : int(1..3)]),
     and([q11 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/model.expected.json b/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/model.expected.json
index eb76f4307d..2d2b41eef9 100644
--- a/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/model.expected.json
@@ -906,7 +906,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1043,7 +1043,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/stdout.expected b/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/stdout.expected
index eb626634fd..44705dfc24 100644
--- a/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/877d629f542f55f0f97157cd8c1654fe/stdout.expected
@@ -60,7 +60,7 @@ such that
                   | q42 : int(1..2)])
              | q1 : int(1..31)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q13]
@@ -69,7 +69,7 @@ such that
                   [q1 + 1, q13]
                   | q13 : bool])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
diff --git a/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/model.expected.json b/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/model.expected.json
index 3ea1d4b1ae..5401737ef0 100644
--- a/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpImage":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/stdout.expected b/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/stdout.expected
index 11156c0bd8..c1cc73499f 100644
--- a/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/87d64817d9031ce1ce57748338fd3be3/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find unused: bool
-such that image(function((true, 2) --> [5; int(1)]), (false, 1)) <=lex [0; int(1)]
+such that image(function((true, 2) --> [5; int(1)]), (false, 1)) .<= [0; int(1)]
diff --git a/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/model.expected.json b/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/model.expected.json
index fc7bdd76e7..614ffbbec4 100644
--- a/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/model.expected.json
@@ -428,7 +428,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -681,7 +681,7 @@
                                                                                              [{"Name": "q6"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/stdout.expected b/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/stdout.expected
index ba882a9fab..aca0039f65 100644
--- a/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/88fb8c6b9616da911eaa4532629f05d7/stdout.expected
@@ -26,7 +26,7 @@ such that
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q4, .., ..]) <lex
+         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q4, .., ..]) .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q4 + 1, .., ..])
              | q4 : int(1..15)]),
     and([q5 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -37,7 +37,7 @@ such that
              | q5 : int(1..16)]),
     and([q6 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          and([q7 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
-              var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q6, q7, ..] <lex
+              var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q6, q7, ..] .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q6, q7 + 1, ..]
                   | q7 : int(1..3)])
              | q6 : int(1..16)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/model.expected.json b/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/model.expected.json
index 1874f1744c..cb6bcf0892 100644
--- a/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/model.expected.json
@@ -68,7 +68,7 @@
                                              {"AbsLitSet":
                                                   [{"ConstantAbstract": {"AbsLitSet": [{"ConstantBool": true}]}}]}}},
                                    {"Op":
-                                        {"MkOpLexLeq":
+                                        {"MkOpDotLeq":
                                              [{"Constant":
                                                    {"ConstantAbstract":
                                                         {"AbsLitMatrix":
@@ -205,7 +205,7 @@
                                                               {"ConstantInt": [{"TagInt": []}, 2]},
                                                               {"ConstantInt": [{"TagInt": []}, 2]}]}}}]]}}]}},
                        {"Op":
-                            {"MkOpLexLeq":
+                            {"MkOpDotLeq":
                                  [{"Op":
                                        {"MkOpFlatten":
                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/stdout.expected b/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/stdout.expected
index 504d218a8e..a9618b1591 100644
--- a/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/890bfc7260b9693bee3681fdd772c9d9/stdout.expected
@@ -9,13 +9,13 @@ such that
     together(({} : `set of set of relation of (bool * bool * bool)`),
              (partition() : `partition from set of relation of (bool * bool * bool)`)),
     and([l_2 | l_1 : bool, l_2 : bool, l_1, l_1]),
-    image(function({{true}} --> [false, false, true, false; int(2, 4..6)] <=lex [true, false, true; int(2..3, 8)],
+    image(function({{true}} --> [false, false, true, false; int(2, 4..6)] .<= [true, false, true; int(2..3, 8)],
                    ({} : `set of set of bool`) --> apart({false}, partition({true, false})),
                    {({} : `set of bool`), {true}} --> {false, false} subset {true, false}),
           {{true} intersect {true, false, true}, party(false >= true, partition({false, false}))}),
     and([l_3 | l_3 : bool, l_4 : bool, l_3]),
     (function(mset(2, 0, 3) --> mset(0, 4), mset(4) --> mset(4), mset(1, 3, 4) --> (mset() : `mset of int`)) supset
      function(mset(3, 3, 1) --> (mset() : `mset of int`), (mset() : `mset of int`) --> mset(1, 2, 2)))
-    < (flatten([true, false, true, false; int(3..6)]) <=lex [false < true, true <= true; int(4..5)]),
+    < (flatten([true, false, true, false; int(3..6)]) .<= [false < true, true <= true; int(4..5)]),
     [tuple (false), tuple (true), tuple (false), tuple (true); int(4, 10, 11, 9)]
         [([] : `matrix indexed by [int] of int`)[factorial(4)], 1]
diff --git a/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/model.expected.json
index 00e66c444b..c539c62f5b 100644
--- a/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/stdout.expected
index f8851e03dc..d618302d30 100644
--- a/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8b18b9af68196441a501019b9212cb97/stdout.expected
@@ -1,4 +1,4 @@
 language ESSENCE' 1.0
 
 find unused: bool
-such that [false, false; int(1..2)] <lex [[false; int(1)]; int(1)][0, ..]
+such that [false, false; int(1..2)] .< [[false; int(1)]; int(1)][0, ..]
diff --git a/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/model.expected.json
index 2db88538f0..aa25702655 100644
--- a/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/model.expected.json
@@ -1754,7 +1754,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1940,7 +1940,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2241,7 +2241,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2403,7 +2403,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/stdout.expected
index 8fbb28a7b5..d2ad083c7c 100644
--- a/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8c6249e4d3029b23653b7f2c74259b87/stdout.expected
@@ -114,7 +114,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -128,7 +128,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -149,7 +149,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -162,7 +162,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/model.expected.json
index bc4088613b..97b5f12791 100644
--- a/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/model.expected.json
@@ -1858,7 +1858,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2044,7 +2044,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2347,7 +2347,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2509,7 +2509,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/stdout.expected
index ebe116cdb4..3f9b8ea43e 100644
--- a/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8d24bbf635ac91ecf06f51548f733735/stdout.expected
@@ -122,7 +122,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -136,7 +136,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..15)]),
@@ -157,7 +157,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -170,7 +170,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/model.expected.json
index caee02d9e7..13d0a1d968 100644
--- a/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/model.expected.json
@@ -467,7 +467,7 @@
                                   {"Reference":
                                        [{"Name": "var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker"}, null]}]}},
                        {"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Op":
                                        {"MkOpSlicing":
                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/stdout.expected
index e8a66763e2..e86dc73e8e 100644
--- a/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8d47dfa1129d0d9a0970aa6e38e36998/stdout.expected
@@ -36,7 +36,7 @@ such that
          >= 1
              | q26 : int(1..2)]),
     2 <= var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-    var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, ..] <lex
+    var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[1, ..] .<
     var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[2, ..],
     and([q10 > var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
          and([var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q10, q19] = 2
diff --git a/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/model.expected.json
index 10deb060bb..01841adc73 100644
--- a/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/model.expected.json
@@ -193,7 +193,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -342,7 +342,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              6]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -2065,7 +2065,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/stdout.expected
index 56a9fef731..0f59a09111 100644
--- a/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8e57797389036cafd59682f3b212615f/stdout.expected
@@ -18,7 +18,7 @@ find var2_3: bool
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
@@ -31,7 +31,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
@@ -151,7 +151,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q15] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q15 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q15, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q15, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q15 + 1, ..]
              | q15 : int(1..3)]),
     and([q16 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/model.expected.json
index 5a4d47f51d..fb22bb4096 100644
--- a/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/model.expected.json
@@ -228,7 +228,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/stdout.expected
index d802bfd091..f00ce52598 100644
--- a/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8e7aea1c1a683206e6a897c6ad5d8bd3/stdout.expected
@@ -18,7 +18,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1 + 1, ..]
          \/
diff --git a/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/model.expected.json
index 42d7fcb7e6..9d26afdd97 100644
--- a/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/model.expected.json
@@ -193,7 +193,7 @@
                                                               [{"ConstantBool": false},
                                                                {"ConstantBool": false}]]}}}]]}}]}}]}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpFlatten":
                                  [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/stdout.expected
index 27cf8e73c3..4baef26f73 100644
--- a/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8e93ce71508f064beff9a26d88d989ce/stdout.expected
@@ -17,7 +17,7 @@ such that
                    function(false --> true, false --> false, true --> false, true --> false, true --> true)),
                   (partition({3}, {3, 4, 3, 5, 3}, {1, 4, 5, 1, 3}, {2, 2}, {1, 1}), tuple (true), ({} : `set of bool`),
                    function(true --> false, false --> true, false --> true, false --> false)))),
-    flatten(flatten([false, false, false, false, true; int(3, 6, 2, 10, 1)])) <lex
+    flatten(flatten([false, false, false, false, true; int(3, 6, 2, 10, 1)])) .<
     image(function(([] : `matrix indexed by [int] of bool`) --> ([] : `matrix indexed by [int] of bool`),
                    [false; int(1)] --> [false, false; int(3, 0)],
                    [true, false, true; int(6..8)] --> [true, false, false, false; int(2..3, 0, 11)],
diff --git a/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/model.expected.json
index 1ec4a6f1a7..f905840d1e 100644
--- a/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/model.expected.json
@@ -173,7 +173,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -319,7 +319,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -918,7 +918,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/stdout.expected
index 0d50f819e4..952724484f 100644
--- a/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/8f501dda2021fc3c7c4e001157f1e6e6/stdout.expected
@@ -15,14 +15,14 @@ find var6: int(1..4, 4..5)
 maximising var4
 such that
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarker_Marker ->
-         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1, q33] =
               var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, q33]
                   | q33 : int(1..4)])
          /\
-         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..80)]),
     and([q2 > var1_ExplicitVarSizeWithMarker_Marker ->
@@ -53,7 +53,7 @@ such that
          4 = sum([var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q3, q8] | q8 : int(1..4)])
              | q3 : int(1..81)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q10 + 1] ->
-         flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q10, .., ..]) <lex
+         flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q10, .., ..]) .<
          flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q10 + 1, .., ..])
              | q10 : int(1..4)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q11] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/model.expected.json b/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/model.expected.json
index a8f7728352..13eda9f509 100644
--- a/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/model.expected.json
@@ -160,7 +160,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -297,7 +297,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -704,7 +704,7 @@
                                                              "var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -847,7 +847,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -981,7 +981,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/stdout.expected b/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/stdout.expected
index 839fbffedc..98ce331156 100644
--- a/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/90320206b02563fde63fe692179aedbe/stdout.expected
@@ -14,14 +14,14 @@ such that
                q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values : matrix indexed by [int(1..4), bool] of
                                                                                    int(5),
                and([q1 + 1 <= q_4_ExplicitVarSizeWithMarker_Marker ->
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, ..]
                     \/
                     and([q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, q22] =
                          q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, q22]
                              | q22 : bool])
                     /\
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1 + 1, ..]
                         | q1 : int(1..3)]),
                and([q2 > q_4_ExplicitVarSizeWithMarker_Marker ->
@@ -42,21 +42,21 @@ such that
          sum([toInt(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q21, q24]) | q24 : int(0..2)]) >= 1
              | q21 : int(1..8)]),
     and([q10 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q10, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q10, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q10 + 1, ..]
              | q10 : int(1..7)]),
     and([q11 > var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q11, q29] = false | q29 : int(0..2)])
              | q11 : int(1..8)]),
     and([q14 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q14, ..] <lex
+         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q14, ..] .<
          var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q14 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q14, q25] =
               var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q14 + 1, q25]
                   | q25 : bool])
          /\
-         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q14, ..] <lex
+         var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q14, ..] .<
          var2_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q14 + 1, ..]
              | q14 : int(1..3)]),
     and([q15 > var2_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/model.expected.json b/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/model.expected.json
index b3e5780050..a10a165fbe 100644
--- a/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/model.expected.json
@@ -1753,7 +1753,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1939,7 +1939,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2240,7 +2240,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2402,7 +2402,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/stdout.expected b/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/stdout.expected
index 18e97d1ded..ea8f6b3c0b 100644
--- a/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/90955ca420084f220878f52c9a1671bc/stdout.expected
@@ -114,7 +114,7 @@ such that
          /\
          (flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -128,7 +128,7 @@ such that
           /\
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -149,7 +149,7 @@ such that
          and([q2 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -162,7 +162,7 @@ such that
               /\
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/model.expected.json
index a7094a2471..083b9ad972 100644
--- a/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/model.expected.json
@@ -504,7 +504,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/stdout.expected
index 244082a09a..d9bf7eb3dd 100644
--- a/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/92e662998492b98daa5a6a0332603ea2/stdout.expected
@@ -45,7 +45,7 @@ such that
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] =
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6 + 1]
          /\
-         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6 + 1, ..]
              | q6 : int(1..15)]),
     and([q7 > var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/model.expected.json b/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/model.expected.json
index 05bff5672c..b9f3c69c0e 100644
--- a/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/model.expected.json
@@ -370,7 +370,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -520,7 +520,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    3]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1384,7 +1384,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/stdout.expected b/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/stdout.expected
index bfa0c27df4..d171bbc065 100644
--- a/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/93284da4a4bcb0b65f9af4e148349956/stdout.expected
@@ -34,7 +34,7 @@ such that
          /\
          (var4_ExplicitVarSizeWithFlagsR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q3, ..]
-          <lex
+          .<
           var4_ExplicitVarSizeWithFlagsR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q3 + 1, ..]
           \/
@@ -47,7 +47,7 @@ such that
           /\
           flatten(var4_ExplicitVarSizeWithFlagsR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q3, .., ..])
-          <lex
+          .<
           flatten(var4_ExplicitVarSizeWithFlagsR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q3 + 1, .., ..]))
              | q3 : int(1..15)]),
@@ -121,7 +121,7 @@ such that
               /\
               var4_ExplicitVarSizeWithFlagsR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q13, ..]
-              <lex
+              .<
               var4_ExplicitVarSizeWithFlagsR17R5R5_Values_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q13 + 1, ..]
                   | q13 : int(1..2)])
diff --git a/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/model.expected.json b/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/model.expected.json
index 3054f1e063..a345db56d4 100644
--- a/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/model.expected.json
@@ -117,7 +117,7 @@
                              {"DomainBool": []}]}]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"AbstractLiteral":
                             {"AbsLitMatrix":
                                  [{"DomainInt":
@@ -177,7 +177,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -323,7 +323,7 @@
                                                                                                                                             []},
                                                                                                                                        5]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/stdout.expected b/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/stdout.expected
index 816d7112fc..1e9fda9782 100644
--- a/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/950926788ae00620bf3eefe8cfa83b48/stdout.expected
@@ -16,17 +16,17 @@ find var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags:
 find var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values:
         matrix indexed by [int(1..4), int(1..5)] of bool
 such that
-    [var3; int(0)] <lex [var3, var4, var4, false; int(5..8)],
+    [var3; int(0)] .< [var3, var4, var4, false; int(5..8)],
     var4,
     and([q12 + 1 <= var5_ExplicitVarSizeWithMarkerR4_Marker ->
-         var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags[q12, ..] <lex
+         var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags[q12, ..] .<
          var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags[q12 + 1, ..]
          \/
          and([var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags[q12, q20] =
               var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags[q12 + 1, q20]
                   | q20 : int(1..5)])
          /\
-         var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values[q12, ..] <lex
+         var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values[q12, ..] .<
          var5_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values[q12 + 1, ..]
              | q12 : int(1..3)]),
     and([q13 > var5_ExplicitVarSizeWithMarkerR4_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/model.expected.json
index 8f0fa1b196..cfe12d659a 100644
--- a/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/model.expected.json
@@ -92,7 +92,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -347,7 +347,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             0]}}}]]}]}}]]}}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/stdout.expected
index 67138d9c53..2cb7fc7036 100644
--- a/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/951d3c18901f9994c032518bb08cd59c/stdout.expected
@@ -8,7 +8,7 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2:
 such that
     false,
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q20] ->
@@ -19,7 +19,7 @@ such that
               var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q21]
                   | q21 : int(3..5, 0)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/model.expected.json
index 43024d3395..7edf959aca 100644
--- a/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/model.expected.json
@@ -1010,7 +1010,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1436,7 +1436,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1570,7 +1570,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/stdout.expected
index 5ea6ed4099..2e4e7d4190 100644
--- a/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/95673ede51a7abf39744fbcc1b3524b5/stdout.expected
@@ -78,7 +78,7 @@ such that
          >= 1
              | q34 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
@@ -96,14 +96,14 @@ such that
     and([var4_1_ExplicitWithFlags_Flags[q15] = 0 \/ var4_1_ExplicitWithFlags_Flags[q15] >= 0 | q15 : int(1..3)]),
     3 = sum([var4_1_ExplicitWithFlags_Flags[q16] | q16 : int(1..3)]),
     and([var5_ExplicitWithFlagsR10_Flags[q18 + 1] > 0 ->
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18 + 1, ..]
          \/
          and([var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18, q29] =
               var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18 + 1, q29]
                   | q29 : bool])
          /\
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q18, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q18, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q18 + 1, ..]
              | q18 : int(1..63)]),
     and([var5_ExplicitWithFlagsR10_Flags[q19] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/model.expected.json
index cdb14e8bcf..d5f9d4ed80 100644
--- a/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/model.expected.json
@@ -333,7 +333,7 @@
                                             [{"Constant": {"ConstantBool": false}},
                                              {"Constant": {"ConstantBool": false}}]}}]}},
                        {"Op":
-                            {"MkOpLexLeq":
+                            {"MkOpDotLeq":
                                  [{"Constant":
                                        {"ConstantAbstract":
                                             {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/stdout.expected
index 19bb7628f8..8fa99572a0 100644
--- a/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9766d2cb8dbc532f788d40e27b2a738f/stdout.expected
@@ -20,5 +20,4 @@ such that
     or([l_1 | l_1 : bool, l_1]),
     max(var2) in party(4 / 2, partition({1, 2, 1, 1, 4}, {2, 1, 5, 5}, {2, 3, 0, 3}, {3, 1})),
     true,
-    ((false -> true) <-> false <= false) ->
-    [true; int(2)] <=lex [false, true, false, true, false; int(11..12, 7, 13, 14)]
+    ((false -> true) <-> false <= false) -> [true; int(2)] .<= [false, true, false, true, false; int(11..12, 7, 13, 14)]
diff --git a/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/model.expected.json b/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/model.expected.json
index 10397619fc..53e8e2225a 100644
--- a/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/model.expected.json
@@ -228,7 +228,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/stdout.expected b/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/stdout.expected
index bfeded6799..735d7d8696 100644
--- a/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/979854a979c1d69c3dc6653f5b2db319/stdout.expected
@@ -18,7 +18,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values
              [q1 + 1, ..]
          \/
diff --git a/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/model.expected.json
index d342551067..1c588cd593 100644
--- a/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/model.expected.json
@@ -22,7 +22,7 @@
                                    {"Constant": {"ConstantBool": false}}]]}},
                        {"Op": {"MkOpToInt": {"Reference": [{"Name": "var1"}, null]}}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/stdout.expected
index 46d79dee22..fe0e21b0df 100644
--- a/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9a0d61ffdcb4d471c71fcb70f6ff1232/stdout.expected
@@ -3,4 +3,4 @@ language ESSENCE' 1.0
 find var1: bool
 such that
     [var1, var1, true, var1, false; int(10, 2..5)][toInt(var1)],
-    [false, false, true; int(1..3)] <=lex [var1, var1, false; int(9, 7, 5)]
+    [false, false, true; int(1..3)] .<= [var1, var1, false; int(9, 7, 5)]
diff --git a/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/model.expected.json
index 487e188c4b..af98fbd7fc 100644
--- a/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/model.expected.json
@@ -765,7 +765,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -933,7 +933,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1083,7 +1083,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/stdout.expected
index b0694cd2c2..926bc957c6 100644
--- a/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9a180dd7ae58ead0dd9e267df03321f7/stdout.expected
@@ -64,21 +64,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/model.expected.json
index e05cb698f4..828ac9af8d 100644
--- a/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/model.expected.json
@@ -61,7 +61,7 @@
                        {"Op":
                             {"MkOpLt":
                                  [{"Op":
-                                       {"MkOpLexLt":
+                                       {"MkOpDotLt":
                                             [{"Constant":
                                                   {"ConstantAbstract":
                                                        {"AbsLitMatrix":
@@ -253,7 +253,7 @@
                                                                {"ConstantBool": true}]]}}]]}}}]]}}}},
             {"Constant": {"ConstantBool": true}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpIndexing":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/stdout.expected
index bfea6941e1..9fab0cd435 100644
--- a/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9abdea7380788d3969dc2640d22d213c/stdout.expected
@@ -6,7 +6,7 @@ such that
     ((relation((true, false, true, false)), mset(true, false, false), (partition() : `partition from int`)) !=
      (relation((false, false, true, false)), mset(true), partition({5, 2, 1, 2})))
     !=
-    (([true, false; int(5, 4)] <lex [true, false, false, true; int(2..5)]) <
+    (([true, false; int(5, 4)] .< [true, false, false, true; int(2..5)]) <
      (({} : `set of bool`) subsetEq ({} : `set of bool`))),
     allDiff([function(partition({false, true, true, true, false}, {false, true}, {false}, {false, false, false, false})
                           --> relation((true, false, true), (false, true, false), (false, true, true))),
@@ -33,7 +33,7 @@ such that
     true,
     [[true, true; int(0..1)], [true, true, true; int(1..2, 8)], [true; int(1)]; int(2, 4..5)]
         [freq(mset(false), false <= true)]
-    <lex [l_1 | l_1 : bool, l_2 : bool, l_2],
+    .< [l_1 | l_1 : bool, l_2 : bool, l_2],
     together({{(partition() : `partition from bool`),
                partition({false, true}, {true, false, false, false}, {true, true, true}, {false}),
                partition({false, true, false})},
diff --git a/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/model.expected.json
index d583a5458f..ab3279aa38 100644
--- a/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/model.expected.json
@@ -1036,7 +1036,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1188,7 +1188,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/stdout.expected
index 07e93e8d49..49beaa5f08 100644
--- a/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9ac3f75c1e13c0710509398532042647/stdout.expected
@@ -63,7 +63,7 @@ such that
                   | q47 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q18]
@@ -72,7 +72,7 @@ such that
                   [q1 + 1, q18]
                   | q18 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q21]
diff --git a/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/model.expected.json
index 9367ad4df0..c94296fa11 100644
--- a/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/model.expected.json
@@ -478,7 +478,7 @@
                                                              "var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/stdout.expected
index f5005a1498..541c4d8482 100644
--- a/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9b469468a3b10432c0ce1da021333952/stdout.expected
@@ -39,7 +39,7 @@ such that
          >= 1
              | q24 : int(1..16)]),
     and([q6 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q6 + 1, ..]
              | q6 : int(1..15)]),
     and([q7 > var2_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/model.expected.json
index 2db34ff027..0fbbc8d3ad 100644
--- a/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/model.expected.json
@@ -338,7 +338,7 @@
                                                                    null]},
                                                              {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -510,7 +510,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -644,7 +644,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1280,7 +1280,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/stdout.expected
index 9610a40a28..710f797707 100644
--- a/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9c55294c0d3d31ba76c9c8253bef3ef8/stdout.expected
@@ -28,7 +28,7 @@ such that
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1],
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] >= 1,
     and([q8 + 1 <= var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] <lex
+         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] .<
          var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8 + 1, ..]
              | q8 : int(1..23)]),
     and([q9 > var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
@@ -36,14 +36,14 @@ such that
              | q9 : int(1..24)]),
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] <= 24,
     and([q13 + 1 <= var2_ExplicitVarSizeWithMarkerR10_Marker ->
-         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13, ..] <lex
+         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13, ..] .<
          var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13, q21] =
               var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Flags[q13 + 1, q21]
                   | q21 : bool])
          /\
-         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Values[q13, ..] <lex
+         var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Values[q13, ..] .<
          var2_ExplicitVarSizeWithMarkerR10_Values_Function1DPartial_Values[q13 + 1, ..]
              | q13 : int(1..119)]),
     and([q14 > var2_ExplicitVarSizeWithMarkerR10_Marker ->
@@ -85,7 +85,7 @@ such that
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q36] =
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q36 + 1]
          /\
-         var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36, ..] <lex
+         var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36, ..] .<
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36 + 1, ..]
              | q36 : int(1..4)]),
     and([q37 > var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/model.expected.json
index b06913dbb8..298485443c 100644
--- a/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/model.expected.json
@@ -360,7 +360,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1030,7 +1030,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/stdout.expected
index 7d206bc108..3cd7f308f5 100644
--- a/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9d9440d946dd0a2494f8ad0ef44d90e4/stdout.expected
@@ -33,7 +33,7 @@ such that
          var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Flag[q1] =
          var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Flag[q1 + 1]
          /\
-         var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Values[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR8_Values_ExplicitWithRepetition_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_ExplicitVarSizeWithMarkerR8_Marker ->
@@ -76,7 +76,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q18] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q18 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q18, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q18, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q18 + 1, ..]
              | q18 : int(1..3)]),
     and([q19 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/model.expected.json
index 7970eb6869..4f4ca42d87 100644
--- a/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/model.expected.json
@@ -124,7 +124,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -288,7 +288,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -466,7 +466,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    5]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -857,7 +857,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -1011,7 +1011,7 @@
                                                                                                                                                     []},
                                                                                                                                                1]}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/stdout.expected
index a928ecdd3d..ff38c3bcf0 100644
--- a/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/9f0da0c4289dcd010e92c8ab6d50b07a/stdout.expected
@@ -9,7 +9,7 @@ find var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_Explic
         matrix indexed by [int(1..3), int(1..5), int(1)] of bool
 such that
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, q17] =
@@ -18,7 +18,7 @@ such that
          /\
          (flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags
                       [q1 + 1, .., ..])
           \/
@@ -31,7 +31,7 @@ such that
           /\
           flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..2)]),
@@ -54,7 +54,7 @@ such that
          and([var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q5, q6 + 1] ->
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags
                   [q5, q6, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags
                   [q5, q6 + 1, ..]
               \/
@@ -66,7 +66,7 @@ such that
               /\
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values
                   [q5, q6, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values
                   [q5, q6 + 1, ..]
                   | q6 : int(1..4)])
diff --git a/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/model.expected.json
index 9e17659a2c..43751c323b 100644
--- a/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/model.expected.json
@@ -556,7 +556,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -708,7 +708,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/stdout.expected
index 504bd84b8c..b672b61e99 100644
--- a/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a03ddc28b5f272001ba23db986726a9f/stdout.expected
@@ -37,7 +37,7 @@ such that
                   | q28 : int(-4, 4)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q14]
@@ -46,7 +46,7 @@ such that
                   [q1 + 1, q14]
                   | q14 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q17]
diff --git a/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/model.expected.json
index eaa1d808e3..ecd523a947 100644
--- a/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/model.expected.json
@@ -451,7 +451,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -687,7 +687,7 @@
                                                                                              [{"Name": "q6"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/stdout.expected
index 5b3018d636..9469b1b3ec 100644
--- a/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a09b27e60c42a3e4ab0c27e3826dfc25/stdout.expected
@@ -33,7 +33,7 @@ such that
          /\
          flatten(var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                      [q4 + 1, .., ..])
              | q4 : int(1..65535)]),
@@ -49,7 +49,7 @@ such that
          and([q7 + 1 <= var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
               var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                   [q6, q7, ..]
-              <lex
+              .<
               var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                   [q6, q7 + 1, ..]
                   | q7 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/model.expected.json
index e4627ba980..0d94ebed4b 100644
--- a/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/model.expected.json
@@ -178,7 +178,7 @@
                                                              "var1_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
@@ -860,7 +860,7 @@
                                                                                                                                                                                            []},
                                                                                                                                                                                       1]}}]]}}}}]}}]}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpSlicing":
                                                                                                                                                     [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/stdout.expected
index ff9a407bd5..112e94a9f6 100644
--- a/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a10653f603b57480444e59a7f67a1eea/stdout.expected
@@ -16,7 +16,7 @@ find var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_3:
 such that
     false,
     and([q1 + 1 <= var1_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Marker ->
-         flatten(var1_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatrix[q1, .., ..]) <lex
+         flatten(var1_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatrix[q1, .., ..]) .<
          flatten(var1_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatrix[q1 + 1, .., ..])
              | q1 : int(1..2)]),
     and([q2 > var1_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Marker ->
@@ -54,7 +54,7 @@ such that
           var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q8] =
           var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q8 + 1]
           /\
-          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_3[q8, ..] <lex
+          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_3[q8, ..] .<
           var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_3[q8 + 1, ..])
              | q8 : int(1..2047)]),
     and([q9 > var2_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/model.expected.json
index 9795616ce5..f1fad67520 100644
--- a/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/model.expected.json
@@ -379,7 +379,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -549,7 +549,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/stdout.expected
index e8b020727f..f11700e67e 100644
--- a/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a278490eff4c7aaa3efb73ab7cb5a355/stdout.expected
@@ -22,14 +22,14 @@ such that
              | q10 : int(1..9)]),
     3 <= sum([var3_2_ExplicitVarSizeWithFlags_Flags[q12] | q12 : int(1..10)]),
     and([q14 + 1 <= var4_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q14, ..] <lex
+         var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q14, ..] .<
          var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q14 + 1, ..]
          \/
          and([var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q14, q19] =
               var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q14 + 1, q19]
                   | q19 : int(4, 4)])
          /\
-         (var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Function1D[q14, ..] <lex
+         (var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Function1D[q14, ..] .<
           var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Function1D[q14 + 1, ..]
           \/
           and([var4_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Function1D[q14 + 1, q22] =
diff --git a/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/model.expected.json
index 01d2f1d74a..be0034f5d6 100644
--- a/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/model.expected.json
@@ -325,7 +325,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -498,7 +498,7 @@
                                                                                                                                             []},
                                                                                                                                        3]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/stdout.expected
index 57414c9e22..761711f4af 100644
--- a/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a29843ebaa6b51bea21d033d0410646e/stdout.expected
@@ -27,7 +27,7 @@ such that
     and([q13 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q13, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q13 + 1, .., ..])
          \/
@@ -39,7 +39,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q13, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q13 + 1, .., ..])
              | q13 : int(1..2)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/model.expected.json
index 8757b33cac..7a97c363d0 100644
--- a/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/model.expected.json
@@ -122,7 +122,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -271,7 +271,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/stdout.expected
index 36b17295a8..76b30450da 100644
--- a/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a2d859e9768309b9821313f15f257203/stdout.expected
@@ -9,7 +9,7 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2: m
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
@@ -22,7 +22,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
diff --git a/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/model.expected.json
index 6ebb9722fe..2f0768ad17 100644
--- a/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/model.expected.json
@@ -89,7 +89,7 @@
                                                   {"Reference":
                                                        [{"Name": "var2_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/stdout.expected
index 441a0beab4..b6f00218de 100644
--- a/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a2d869e1257b1c53d062dbc8e2d442fd/stdout.expected
@@ -8,7 +8,7 @@ find var3: bool
 such that
     var3,
     and([q8 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q8, .., ..]) <lex
+         flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q8, .., ..]) .<
          flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q8 + 1, .., ..])
              | q8 : int(1..15)]),
     and([q9 > var2_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/model.expected.json
index 3014a28020..300839392b 100644
--- a/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/model.expected.json
@@ -910,7 +910,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1047,7 +1047,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/stdout.expected
index 5f2b88f884..52d88fba1f 100644
--- a/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a34c8275c1d9524a08d2ec1d329ed35a/stdout.expected
@@ -60,7 +60,7 @@ such that
                   | q45 : int(1..2)])
              | q1 : int(1..31)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
@@ -69,7 +69,7 @@ such that
                   [q1 + 1, q16]
                   | q16 : bool])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q19]
diff --git a/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/model.expected.json
index 1a6eaf04dc..ba46a88590 100644
--- a/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/model.expected.json
@@ -1097,7 +1097,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1730,7 +1730,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1864,7 +1864,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/stdout.expected
index d9e7e1791f..2e48642fa6 100644
--- a/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a363b2628f65efb0290c8d10d2a18ac4/stdout.expected
@@ -86,7 +86,7 @@ such that
          >= 1
              | q56 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
@@ -124,14 +124,14 @@ such that
              | q17 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([q24 + 1 <= var5_ExplicitWithRepetitionR10_Flag ->
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24, ..] <lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24, ..] .<
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24 + 1, ..]
          \/
          and([var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24, q34] =
               var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q24 + 1, q34]
                   | q34 : bool])
          /\
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q24, ..] <=lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q24, ..] .<=
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q24 + 1, ..]
              | q24 : int(1..255)]),
     and([q25 > var5_ExplicitWithRepetitionR10_Flag ->
diff --git a/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/model.expected.json
index 24cc1e8a16..a460c6c7c6 100644
--- a/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/model.expected.json
@@ -1879,7 +1879,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2078,7 +2078,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2405,7 +2405,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2580,7 +2580,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  4]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/stdout.expected
index 539dbc6eba..59e87fc369 100644
--- a/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a370966830e4e6e3d5c258cbed1908e2/stdout.expected
@@ -113,7 +113,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -127,7 +127,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -148,7 +148,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -161,7 +161,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/model.expected.json
index f016087eea..20e77ef968 100644
--- a/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/model.expected.json
@@ -1022,7 +1022,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1523,7 +1523,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1657,7 +1657,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/stdout.expected
index 33130bf7e7..c72c287f26 100644
--- a/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a39552e9ed1bd8481c8c6a692b9a507c/stdout.expected
@@ -82,7 +82,7 @@ such that
          >= 1
              | q37 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
@@ -109,14 +109,14 @@ such that
              | q14 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([var5_ExplicitWithFlagsR10_Flags[q21 + 1] > 0 ->
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q21, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q21, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q21 + 1, ..]
          \/
          and([var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q21, q32] =
               var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q21 + 1, q32]
                   | q32 : bool])
          /\
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q21, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q21, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q21 + 1, ..]
              | q21 : int(1..63)]),
     and([var5_ExplicitWithFlagsR10_Flags[q22] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/model.expected.json
index ce2662ebec..89229fae34 100644
--- a/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/model.expected.json
@@ -759,7 +759,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1330,7 +1330,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/stdout.expected
index ebe55665f5..29e31c88f1 100644
--- a/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a569624863aa273c01c6312a624723f1/stdout.expected
@@ -49,7 +49,7 @@ such that
          var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3] =
          var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3 + 1]
          /\
-         var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] <lex
+         var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] .<
          var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3 + 1, ..]
              | q3 : int(1..3)]),
     and([q3 > var3_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -84,7 +84,7 @@ such that
          var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3] =
          var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3 + 1]
          /\
-         var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] <lex
+         var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] .<
          var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3 + 1, ..]
              | q3 : int(1..3)]),
     and([q3 > var3_4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/model.expected.json
index 5585fa748d..d12f26ea00 100644
--- a/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/model.expected.json
@@ -2252,7 +2252,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2450,7 +2450,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    8]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2775,7 +2775,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2949,7 +2949,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   4]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/stdout.expected
index 5b122fbfd3..8b58571f36 100644
--- a/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a5da41200401440fbed34793aaf4a1f9/stdout.expected
@@ -125,7 +125,7 @@ such that
          /\
          (flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -139,7 +139,7 @@ such that
           /\
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..255)]),
@@ -159,7 +159,7 @@ such that
          and([q8 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q7, q8, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q7, q8 + 1, ..]
               \/
@@ -172,7 +172,7 @@ such that
               /\
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q7, q8, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q7, q8 + 1, ..]
                   | q8 : int(1..7)])
diff --git a/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/model.expected.json
index 3fb2384a00..c2edc699f0 100644
--- a/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/model.expected.json
@@ -390,7 +390,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1635,7 +1635,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -2550,7 +2550,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -2700,7 +2700,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -3132,7 +3132,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/stdout.expected
index 14cd4b61be..b9e3a34b02 100644
--- a/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a5f89c8745074bbbd432690c47cee7e7/stdout.expected
@@ -33,7 +33,7 @@ such that
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1] =
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1 + 1]
          /\
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Values[q1 + 1, ..]
          \/
          and([q38 <= var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithMarker_Marker[q1] ->
@@ -96,7 +96,7 @@ such that
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11] =
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q11 + 1]
          /\
-         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] <lex
+         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11, ..] .<
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q11 + 1, ..]
              | q11 : int(1..3)]),
     and([q12 > var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -156,7 +156,7 @@ such that
          /\
          (var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q21, ..]
-          <lex
+          .<
           var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q21 + 1, ..]
           \/
@@ -169,7 +169,7 @@ such that
           /\
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q21, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q21 + 1, .., ..]))
              | q21 : int(1..15)]),
@@ -200,7 +200,7 @@ such that
               /\
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q23, q24, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q23, q24 + 1, ..]
                   | q24 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/model.expected.json
index f071b97c79..af3d2f02dd 100644
--- a/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/model.expected.json
@@ -418,7 +418,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -544,7 +544,7 @@
                                                                                                                          []},
                                                                                                                     1]}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/stdout.expected
index 08c73d099c..6b241c7654 100644
--- a/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a5f97387c646309f28161687f8ce5e52/stdout.expected
@@ -31,7 +31,7 @@ such that
              | q1_Occurrence : matrix indexed by [int(2, 1..2)] of bool,
                sum([q1_Occurrence[q12] | q12 : int(2, 1..2)]) <= 5]),
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4 + 1, ..]
          \/
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, 1] =
@@ -39,7 +39,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q4 + 1, .., ..])
              | q4 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/model.expected.json
index 7bfe3d807b..fbb775af95 100644
--- a/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/model.expected.json
@@ -828,7 +828,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -980,7 +980,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/stdout.expected
index f3c3e43d7c..05a406ac58 100644
--- a/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a6e121cacb3fcfc3686d158963d59199/stdout.expected
@@ -52,7 +52,7 @@ such that
                   | q36 : int(-4, 4)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q14]
@@ -61,7 +61,7 @@ such that
                   [q1 + 1, q14]
                   | q14 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q17]
diff --git a/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/model.expected.json
index 9553c08ca3..27ba6a55a7 100644
--- a/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/model.expected.json
@@ -852,7 +852,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1050,7 +1050,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1375,7 +1375,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -1549,7 +1549,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   2]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
@@ -2448,7 +2448,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/stdout.expected
index 0a6e8f0c08..e425f22d0b 100644
--- a/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/a747a06b8ce4f18eaabdc79af95c005f/stdout.expected
@@ -65,7 +65,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q5 + 1, .., ..])
           \/
@@ -79,7 +79,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..15)]),
@@ -99,7 +99,7 @@ such that
          and([q8 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q7, q8 + 1, ..]
               \/
@@ -112,7 +112,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q7, q8 + 1, ..]
                   | q8 : int(1..3)])
@@ -178,7 +178,7 @@ such that
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q20] =
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q20 + 1]
          /\
-         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20, ..] <lex
+         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20, ..] .<
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20 + 1, ..]
              | q20 : int(1..3)]),
     and([q21 > var4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/model.expected.json
index e88e8e2a78..9d618fc74e 100644
--- a/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/model.expected.json
@@ -722,7 +722,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -994,7 +994,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}}]}},
                                                                    {"Op":
-                                                                        {"MkOpLexLt":
+                                                                        {"MkOpDotLt":
                                                                              [{"Op":
                                                                                    {"MkOpFlatten":
                                                                                         [null,
@@ -1201,7 +1201,7 @@
                                                                                              [{"Name": "q11"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/stdout.expected
index b998173ff1..8f0421eefb 100644
--- a/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ab828d5a7f3d31d42bf66810cab3da9b/stdout.expected
@@ -42,7 +42,7 @@ such that
               var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_3[q3 + 1];
                   int(1..3)])
          /\
-         var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q3, ..] <lex
+         var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q3, ..] .<
          var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q3 + 1, ..]
              | q3 : int(1..63)]),
     and([q4 > var5_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -60,8 +60,7 @@ such that
     var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[1] =
     var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[2]
     /\
-    flatten(var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[1, .., ..])
-    <lex
+    flatten(var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[1, .., ..]) .<
     flatten(var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[2, .., ..]),
     and([var6_ExplicitVarSizeWithFlags_Flags[q8] = false ->
          var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q8] = 0
@@ -76,7 +75,7 @@ such that
          and([q15 + 1 <= var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q11] ->
               var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit
                   [q11, q15, ..]
-              <lex
+              .<
               var6_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit
                   [q11, q15 + 1, ..]
                   | q15 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/model.expected.json
index fc8b8b19ef..0cdd74f749 100644
--- a/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/model.expected.json
@@ -352,7 +352,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -419,7 +419,7 @@
                                                                                                                                           null,
                                                                                                                                           null]}}]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/stdout.expected
index bed6f9fd2a..118438e9d1 100644
--- a/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ad58de7a6f4b8961d21962c5c1339af3/stdout.expected
@@ -30,13 +30,13 @@ such that
          /\
          (flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Flags
                       [q4 + 1, .., ..])
           \/
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR4_ExplicitVarSizeWithMarkerR5R4_Values_ExplicitVarSizeWithMarkerR4_Values_ExplicitVarSizeWithFlags_Values
                       [q4 + 1, .., ..]))
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/model.expected.json
index 5a67f3b20a..314dd8f395 100644
--- a/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/model.expected.json
@@ -125,7 +125,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -177,7 +177,7 @@
                                                                                                          null,
                                                                                                          null]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -229,7 +229,7 @@
                                                                                                          null,
                                                                                                          null]}}]}}]]}}}},
                                                              {"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/stdout.expected
index e03983f2ed..a0512acc7d 100644
--- a/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ad613a17f3cee2196b552d3d7248765d/stdout.expected
@@ -10,18 +10,18 @@ find var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Re
 such that
     and([q1 + 1 <= var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
          flatten(var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_RelationAsMatrix[q1, .., ..])
-         <lex
+         .<
          flatten(var2_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_RelationAsMatrix
                      [q1 + 1, .., ..])
              | q1 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/model.expected.json
index f64ee6a60c..788ef1c4ef 100644
--- a/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/model.expected.json
@@ -720,7 +720,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -961,7 +961,7 @@
                                                                                              [{"Name": "q7"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
@@ -1442,7 +1442,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/stdout.expected
index 1de1e9fb31..7de352f647 100644
--- a/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/addd14e8dfc91037ec8c416bcefe5a6f/stdout.expected
@@ -56,7 +56,7 @@ such that
          /\
          flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                      [q5, .., ..])
-         <lex
+         .<
          flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                      [q5 + 1, .., ..])
              | q5 : int(1..15)]),
@@ -72,7 +72,7 @@ such that
          and([q8 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Occurrence
                   [q7, q8 + 1, ..]
                   | q8 : int(1..3)])
@@ -102,7 +102,7 @@ such that
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q16] =
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q16 + 1]
          /\
-         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q16, ..] <lex
+         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q16, ..] .<
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q16 + 1, ..]
              | q16 : int(1..3)]),
     and([q17 > var4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/model.expected.json
index e81b8215c5..86aa99faba 100644
--- a/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/model.expected.json
@@ -2259,7 +2259,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2461,7 +2461,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2796,7 +2796,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2974,7 +2974,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             1]}}}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/stdout.expected
index ea4784a032..6abdce5627 100644
--- a/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ae18a4a435dc69d385d04a00db890160/stdout.expected
@@ -122,7 +122,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -136,7 +136,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -156,7 +156,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -169,7 +169,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/model.expected.json b/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/model.expected.json
index 41b96de62c..e62d1ce104 100644
--- a/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/model.expected.json
@@ -124,7 +124,7 @@
                                                   {"Reference":
                                                        [{"Name": "var1_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -932,7 +932,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -1105,7 +1105,7 @@
                                                                                                                                             []},
                                                                                                                                        5]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/stdout.expected b/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/stdout.expected
index 43fda74fed..225f3469c8 100644
--- a/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/af8b7ba49f3da7b43601534cea6c9a52/stdout.expected
@@ -10,7 +10,7 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSi
 such that
     false,
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarker_Marker ->
-         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_Function1D[q1 + 1, ..]
              | q1 : int(1..63)]),
     and([q2 > var1_ExplicitVarSizeWithMarker_Marker ->
@@ -56,7 +56,7 @@ such that
     and([q10 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q10, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q10 + 1, .., ..])
          \/
@@ -68,7 +68,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q10, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q10 + 1, .., ..])
              | q10 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/model.expected.json b/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/model.expected.json
index a01d2295c3..0a9b4b135b 100644
--- a/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/model.expected.json
@@ -16,7 +16,7 @@
                               {"Constant": {"ConstantInt": [{"TagInt": []}, 5]}}]}]]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpIndexing":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/stdout.expected b/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/stdout.expected
index 0a00bf21e3..5d620f0b0c 100644
--- a/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/aff37a614c45b7cbfad99c7e884ab813/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find var1: int(2, 3..5)
-such that [[true, false, false, true; int(11, 9, 3, 1)], [true, true; int(0, 5)]; int(1..2)][var1] <=lex [true; int(1)]
+such that [[true, false, false, true; int(11, 9, 3, 1)], [true, true; int(0, 5)]; int(1..2)][var1] .<= [true; int(1)]
diff --git a/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/model.expected.json
index 8a03c7b5dc..55ce806a90 100644
--- a/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/model.expected.json
@@ -1764,7 +1764,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1950,7 +1950,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2251,7 +2251,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2413,7 +2413,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/stdout.expected
index f787ec1ca7..267b34f3f0 100644
--- a/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b0a86f8190115820c0473cbe11e9d73b/stdout.expected
@@ -114,7 +114,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -128,7 +128,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..15)]),
@@ -148,7 +148,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -161,7 +161,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/model.expected.json
index 95353c4cd3..b0ed21ccb7 100644
--- a/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/model.expected.json
@@ -1262,7 +1262,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1460,7 +1460,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1785,7 +1785,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -1959,7 +1959,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   3]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/stdout.expected
index c9ee039a7b..72cb557c5c 100644
--- a/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b0c22716eda56b873b42d632dd725701/stdout.expected
@@ -78,7 +78,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -92,7 +92,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..65535)]),
@@ -113,7 +113,7 @@ such that
          and([q8 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q7, q8 + 1, ..]
               \/
@@ -126,7 +126,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q7, q8 + 1, ..]
                   | q8 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/model.expected.json
index 2907c03c78..88fbcea36d 100644
--- a/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/model.expected.json
@@ -247,7 +247,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1097,7 +1097,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -2030,7 +2030,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2228,7 +2228,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2554,7 +2554,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2728,7 +2728,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   2]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/stdout.expected
index 1f4e171790..d55e221f1b 100644
--- a/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b20a88a48ca68397fb84abb1ffdfbb20/stdout.expected
@@ -25,7 +25,7 @@ find var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMar
 find var6: int(-1..1)
 such that
     and([q1 + 1 <= var2_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q39] ->
@@ -69,7 +69,7 @@ such that
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q9] =
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q9 + 1]
          /\
-         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q9, ..] <lex
+         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q9, ..] .<
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q9 + 1, ..]
              | q9 : int(1..3)]),
     and([q10 > var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -128,7 +128,7 @@ such that
          /\
          (flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q19, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q19 + 1, .., ..])
           \/
@@ -142,7 +142,7 @@ such that
           /\
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q19, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q19 + 1, .., ..]))
              | q19 : int(1..15)]),
@@ -162,7 +162,7 @@ such that
          and([q22 + 1 <= var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q21] ->
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q21, q22, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q21, q22 + 1, ..]
               \/
@@ -175,7 +175,7 @@ such that
               /\
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q21, q22, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q21, q22 + 1, ..]
                   | q22 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/model.expected.json
index 2e6393a2f6..297dced252 100644
--- a/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/model.expected.json
@@ -108,7 +108,7 @@
                                                                                     {"ConstantBool": false},
                                                                                     {"ConstantBool": false}]}}]}}]]}}},
                                              {"Op":
-                                                  {"MkOpLexLeq":
+                                                  {"MkOpDotLeq":
                                                        [{"Comprehension":
                                                              [{"Constant": {"ConstantInt": [{"TagInt": []}, 4]}},
                                                               [{"Generator":
diff --git a/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/stdout.expected
index aecbea6432..73036462ae 100644
--- a/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b38ec6d36aff0c916226635561cbd1a6/stdout.expected
@@ -11,7 +11,7 @@ find var3:
 such that
     false,
     image(function(false --> tuple (mset(false, false)), false --> tuple (mset(true, false, false))),
-          [4 | l_1 : int(5, 3), l_2 : int(3, 4)] <=lex [3, 4, 1, 0; int(1, 6..8)])
+          [4 | l_1 : int(5, 3), l_2 : int(3, 4)] .<= [3, 4, 1, 0; int(1, 6..8)])
         [1]
     supsetEq mset(true),
     (function() : `function relation of (mset of bool *
diff --git a/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/model.expected.json
index 52df3312dc..9d67882db0 100644
--- a/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/model.expected.json
@@ -322,7 +322,7 @@
                                                                    null]},
                                                              {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -506,7 +506,7 @@
                                  [{"Reference": [{"Name": "var3_ExplicitVarSizeWithFlags_Flags"}, null]},
                                   {"Constant": {"ConstantInt": [{"TagInt": []}, 2]}}]}},
                        {"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Op":
                                        {"MkOpFlatten":
                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/stdout.expected
index 9fa1ad0d4d..d636d0b2ef 100644
--- a/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b3e5efec04851a6556b23a0d4a9f50d0/stdout.expected
@@ -23,7 +23,7 @@ such that
              | q1_Function1D : matrix indexed by [bool] of int(3..5, 4), allDiff(q1_Function1D), false, true]),
     var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] >= 1,
     and([q6 + 1 <= var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6, ..] <lex
+         var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6, ..] .<
          var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[1, q6 + 1, ..]
              | q6 : int(1..255)]),
     and([q7 > var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] ->
@@ -34,7 +34,7 @@ such that
              | q8 : int(1..256)]),
     and([q8 <= var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[1] -> false | q8 : int(1..256)]),
     var3_ExplicitVarSizeWithFlags_Flags[2] ->
-    flatten(var3_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[1, .., .., .., ..]) <lex
+    flatten(var3_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[1, .., .., .., ..]) .<
     flatten(var3_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[2, .., .., .., ..]),
     and([var3_ExplicitVarSizeWithFlags_Flags[q11] = false ->
          and([and([and([and([var3_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q11, q39, q40, q41, q42] = false
diff --git a/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/model.expected.json
index 0a6c723840..49d2cdb9fd 100644
--- a/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/model.expected.json
@@ -16,7 +16,7 @@
                               {"Constant": {"ConstantInt": [{"TagInt": []}, 5]}}]}]]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpSlicing":
                                  [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/stdout.expected
index 697cca78f3..91e0514cd1 100644
--- a/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b427cac47c65e49ff32c22d2b3e8c19b/stdout.expected
@@ -2,4 +2,4 @@ language ESSENCE' 1.0
 
 find var1: int(2, 3..5)
 such that
-    [[true, false, false, true; int(1, 3, 9, 11)], [true, true; int(0, 5)]; int(1..2)][var1, ..] <=lex [true; int(1)]
+    [[true, false, false, true; int(1, 3, 9, 11)], [true, true; int(0, 5)]; int(1..2)][var1, ..] .<= [true; int(1)]
diff --git a/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/model.expected.json
index cac13990b8..4147d70942 100644
--- a/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/model.expected.json
@@ -113,7 +113,7 @@
                              {"DomainBool": []}]}]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"AbstractLiteral":
                             {"AbsLitMatrix":
                                  [{"DomainInt":
@@ -278,7 +278,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/stdout.expected
index 2617f0057d..0d7b517c48 100644
--- a/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b6716decf75eddda33df3ec06f7cc400/stdout.expected
@@ -16,7 +16,7 @@ find var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker:
 find var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values:
         matrix indexed by [int(1..4), int(1..5)] of bool
 such that
-    [var3; int(0)] <lex [var3, var4, var4, false; int(5..8)],
+    [var3; int(0)] .< [var3, var4, var4, false; int(5..8)],
     var4,
     and([q10 + 1 <= var5_ExplicitVarSizeWithMarkerR5_Marker ->
          var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q10] <
@@ -25,7 +25,7 @@ such that
          var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q10] =
          var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q10 + 1]
          /\
-         var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q10, ..] <lex
+         var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q10, ..] .<
          var5_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q10 + 1, ..]
              | q10 : int(1..3)]),
     and([q11 > var5_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/model.expected.json
index 309bef0f51..7064101836 100644
--- a/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/model.expected.json
@@ -175,7 +175,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -321,7 +321,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -981,7 +981,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/stdout.expected
index 31bf895de3..b892763179 100644
--- a/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b68ea8a7e4351cdfc4b3b75bb6582893/stdout.expected
@@ -15,14 +15,14 @@ find var6: int(1..4, 4..5)
 maximising var4
 such that
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, q35] =
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, q35]
                   | q35 : int(1..4)])
          /\
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..80)]),
     and([var1_ExplicitVarSizeWithFlags_Flags[q2] = false ->
@@ -54,7 +54,7 @@ such that
          4 = sum([var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q5, q10] | q10 : int(1..4)])
              | q5 : int(1..81)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q12 + 1] ->
-         flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q12, .., ..]) <lex
+         flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q12, .., ..]) .<
          flatten(var2_ExplicitVarSizeWithFlags_Values_RelationAsMatrix[q12 + 1, .., ..])
              | q12 : int(1..4)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q13] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/model.expected.json
index 71f87ae5f2..885665ffc3 100644
--- a/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/model.expected.json
@@ -719,7 +719,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -887,7 +887,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1037,7 +1037,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/stdout.expected
index 72ee58e035..4209951005 100644
--- a/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b7ca13696cd34ed7006ef9dfac6d66ff/stdout.expected
@@ -61,21 +61,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/model.expected.json
index 3928072a60..875d7b1734 100644
--- a/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/model.expected.json
@@ -311,7 +311,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/stdout.expected
index c8e0477966..6c3ce9238c 100644
--- a/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b7eff6ada58015f7994346e5ca41950c/stdout.expected
@@ -28,7 +28,7 @@ such that
          /\
          flatten(var2_PartitionAsSetR2_ExplicitVarSizeWithMarkerR5R2_Values_ExplicitVarSizeWithMarkerR2_Values_Occurrence
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSetR2_ExplicitVarSizeWithMarkerR5R2_Values_ExplicitVarSizeWithMarkerR2_Values_Occurrence
                      [q4 + 1, .., ..])
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/model.expected.json b/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/model.expected.json
index 47ca622b57..eac944f6c5 100644
--- a/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/model.expected.json
@@ -2124,7 +2124,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2332,7 +2332,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2677,7 +2677,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2861,7 +2861,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             4]}}}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/stdout.expected b/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/stdout.expected
index 7fa204a5bf..ed1b7a3181 100644
--- a/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/b97231328d01c59346c93171844928df/stdout.expected
@@ -116,7 +116,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -130,7 +130,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -151,7 +151,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -164,7 +164,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/model.expected.json b/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/model.expected.json
index 2b6d9d1a4d..b9bc9a39e1 100644
--- a/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/model.expected.json
@@ -173,7 +173,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -319,7 +319,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -979,7 +979,7 @@
                                                   {"Reference":
                                                        [{"Name": "var2_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/stdout.expected b/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/stdout.expected
index 80b62b1259..01d31387b4 100644
--- a/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/bbe3f66a50742afbb33589d94d014b78/stdout.expected
@@ -16,14 +16,14 @@ find var6: int(1..4, 4..5)
 maximising var4
 such that
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, q33] =
               var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, q33]
                   | q33 : int(1..4)])
          /\
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..80)]),
     and([var1_ExplicitVarSizeWithFlags_Flags[q2] = false ->
@@ -55,7 +55,7 @@ such that
          4 = sum([var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q5, q10] | q10 : int(1..4)])
              | q5 : int(1..81)]),
     and([q12 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q12, .., ..]) <lex
+         flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q12, .., ..]) .<
          flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q12 + 1, .., ..])
              | q12 : int(1..4)]),
     and([q13 > var2_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/model.expected.json
index 4853fbbcd8..87aa5bd213 100644
--- a/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/model.expected.json
@@ -1974,7 +1974,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2173,7 +2173,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2501,7 +2501,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2676,7 +2676,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  2]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
@@ -3147,7 +3147,7 @@
                                   {"Reference":
                                        [{"Name": "var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                        {"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Op":
                                        {"MkOpSlicing":
                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/stdout.expected
index 6a6255e8e6..a8c9bfbd1f 100644
--- a/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/be5b5a644521be5b55c6a12c503cad3a/stdout.expected
@@ -121,7 +121,7 @@ such that
          /\
          (flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q8, .., ..])
-          <lex
+          .<
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q8 + 1, .., ..])
           \/
@@ -135,7 +135,7 @@ such that
           /\
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q8, .., ..])
-          <lex
+          .<
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q8 + 1, .., ..]))
              | q8 : int(1..65535)]),
@@ -156,7 +156,7 @@ such that
          and([q11 + 1 <= var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q10] ->
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q10, q11, ..]
-              <lex
+              .<
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q10, q11 + 1, ..]
               \/
@@ -169,7 +169,7 @@ such that
               /\
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q10, q11, ..]
-              <lex
+              .<
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q10, q11 + 1, ..]
                   | q11 : int(1..15)])
@@ -207,7 +207,7 @@ such that
          var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q31, 2] >= 1
              | q31 : int(1..2)]),
     2 <= var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-    var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, ..] <lex
+    var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, ..] .<
     var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[2, ..],
     and([q22 > var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q22, 2] = false
diff --git a/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/model.expected.json
index 8bc4e36404..6b92b8bb48 100644
--- a/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/model.expected.json
@@ -124,7 +124,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -993,7 +993,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1119,7 +1119,7 @@
                                                                                                                          []},
                                                                                                                     1]}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/stdout.expected
index 8bb338a69c..74f7f4d49c 100644
--- a/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/bfd00aba95070795c7a808361a3c495d/stdout.expected
@@ -10,7 +10,7 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSi
 such that
     false,
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlags_Values_Function1D[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_Function1D[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_Function1D[q1 + 1, ..]
              | q1 : int(1..63)]),
     and([var1_ExplicitVarSizeWithFlags_Flags[q2] = false ->
@@ -56,7 +56,7 @@ such that
                         | q22 : int(1..4)]),
                sum([q9_ExplicitVarSizeWithFlags_Flags[q23] | q23 : int(1..5)]) <= 5]),
     and([q12 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12 + 1, ..]
          \/
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12, 1] =
@@ -64,7 +64,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q12, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q12 + 1, .., ..])
              | q12 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/model.expected.json
index 58bb1633e5..ff1a0ce1a9 100644
--- a/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/model.expected.json
@@ -286,7 +286,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -435,7 +435,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              3]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1794,7 +1794,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -2709,7 +2709,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2907,7 +2907,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -3233,7 +3233,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -3407,7 +3407,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   2]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/stdout.expected
index d2b5eea0d1..b0e2a881ea 100644
--- a/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c012b856025e2c580aa6d09abc8a939b/stdout.expected
@@ -27,14 +27,14 @@ find var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMar
 find var6: int(-1..1)
 such that
     and([q1 + 1 <= var2_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, q41] =
               var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1 + 1, q41]
                   | q41 : int(1..3)])
          /\
-         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
          \/
          and([var2_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, q44] ->
@@ -103,7 +103,7 @@ such that
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13] =
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q13 + 1]
          /\
-         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] <lex
+         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13, ..] .<
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q13 + 1, ..]
              | q13 : int(1..3)]),
     and([q14 > var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -161,7 +161,7 @@ such that
          /\
          (flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q23, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q23 + 1, .., ..])
           \/
@@ -175,7 +175,7 @@ such that
           /\
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q23, .., ..])
-          <lex
+          .<
           flatten(var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q23 + 1, .., ..]))
              | q23 : int(1..15)]),
@@ -195,7 +195,7 @@ such that
          and([q26 + 1 <= var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q25] ->
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q25, q26, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q25, q26 + 1, ..]
               \/
@@ -208,7 +208,7 @@ such that
               /\
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q25, q26, ..]
-              <lex
+              .<
               var5_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q25, q26 + 1, ..]
                   | q26 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/model.expected.json
index c126c51bde..edd158cea4 100644
--- a/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/model.expected.json
@@ -1816,7 +1816,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2002,7 +2002,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2303,7 +2303,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2465,7 +2465,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/stdout.expected
index f514c4edbb..f3c4ed90c0 100644
--- a/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c0929bb90fee827dde819c6dacffe4c0/stdout.expected
@@ -119,7 +119,7 @@ such that
          /\
          (flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -133,7 +133,7 @@ such that
           /\
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -154,7 +154,7 @@ such that
          and([q2 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -167,7 +167,7 @@ such that
               /\
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/model.expected.json
index a7b138a784..08719bd338 100644
--- a/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/model.expected.json
@@ -171,7 +171,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -317,7 +317,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -916,7 +916,7 @@
                                                   {"Reference":
                                                        [{"Name": "var2_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/stdout.expected
index 9a76975b57..6d8f342c1a 100644
--- a/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c23f30dfa58f7135e9c61ff93975c98d/stdout.expected
@@ -16,14 +16,14 @@ find var6: int(1..4, 4..5)
 maximising var4
 such that
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarker_Marker ->
-         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1, q31] =
               var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, q31]
                   | q31 : int(1..4)])
          /\
-         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..80)]),
     and([q2 > var1_ExplicitVarSizeWithMarker_Marker ->
@@ -54,7 +54,7 @@ such that
          4 = sum([var1_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags[q3, q8] | q8 : int(1..4)])
              | q3 : int(1..81)]),
     and([q10 + 1 <= var2_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q10, .., ..]) <lex
+         flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q10, .., ..]) .<
          flatten(var2_ExplicitVarSizeWithMarker_Values_RelationAsMatrix[q10 + 1, .., ..])
              | q10 : int(1..4)]),
     and([q11 > var2_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/model.expected.json
index c1d953cda6..510238b8f8 100644
--- a/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/model.expected.json
@@ -514,7 +514,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/stdout.expected
index 63dba63459..5c785b6adb 100644
--- a/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c3841e1877c34e8e5bfd1c1837d307e1/stdout.expected
@@ -38,7 +38,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q17] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q17 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q17, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q17, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q17 + 1, ..]
              | q17 : int(1..2)]),
     and([q18 > var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/model.expected.json
index c5c4581ff8..3bd27752bf 100644
--- a/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/model.expected.json
@@ -774,7 +774,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -942,7 +942,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1092,7 +1092,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/stdout.expected
index ddcfe824bf..8292e042d8 100644
--- a/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c423e819384eec3bed63a038add27ca6/stdout.expected
@@ -65,21 +65,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/model.expected.json
index b93cd20285..cbace51b93 100644
--- a/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/model.expected.json
@@ -725,7 +725,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -893,7 +893,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1043,7 +1043,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/stdout.expected
index a9866e458c..83568a8a93 100644
--- a/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c5272f0460d36d154f10770be9088fa4/stdout.expected
@@ -61,21 +61,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/model.expected.json
index e73d40bf5f..b6ea832176 100644
--- a/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/model.expected.json
@@ -452,7 +452,7 @@
                                                              "var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/stdout.expected
index 727b2021bf..3f51becb42 100644
--- a/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c539dc840839e54f8d3d5ca53104102f/stdout.expected
@@ -25,7 +25,7 @@ such that
                         | q11 : int(1..5)]),
                q1_ExplicitVarSizeWithMarker_Marker <= 5]),
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4, .., ..]) <lex
+         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4, .., ..]) .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4 + 1, .., ..])
              | q4 : int(1..3)]),
     and([q5 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/model.expected.json
index 9675ba369d..99d6b08a08 100644
--- a/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/model.expected.json
@@ -277,7 +277,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -344,7 +344,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -493,7 +493,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -978,7 +978,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/stdout.expected
index 782d7dc730..9ac6fbcd50 100644
--- a/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c6f07fc1b59d5295892164e99ab6b192/stdout.expected
@@ -27,12 +27,12 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Marker ->
-         var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q6, ..] <lex
+         var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q6, ..] .<
          var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q6 + 1, ..]
          \/
          (var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Flags
               [q6 + 1, ..]
           \/
@@ -45,7 +45,7 @@ such that
           /\
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -100,7 +100,7 @@ such that
     and([q36 <= var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Marker /\
          q37 <= var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Marker
          ->
-         (var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q36, ..] <lex
+         (var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q36, ..] .<
           var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_1_Explicit[q37, ..]
           ->
           or([var1_FunctionAsRelationR3R4_RelationAsSetR3R4_ExplicitVarSizeWithMarkerR3R4_Values_2_ExplicitVarSizeWithFlags_Flags
diff --git a/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/model.expected.json
index 08674ecb0e..f772e16a4b 100644
--- a/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/model.expected.json
@@ -102,7 +102,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -239,7 +239,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/stdout.expected
index 913bf6f6e0..a28bd2a035 100644
--- a/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c7a05c6406dc0bf72a24b7344bf05115/stdout.expected
@@ -9,14 +9,14 @@ such that
                q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values : matrix indexed by [int(1..4), bool] of
                                                                                    int(5),
                and([q1 + 1 <= q_4_ExplicitVarSizeWithMarker_Marker ->
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, ..]
                     \/
                     and([q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1, q7] =
                          q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags[q1 + 1, q7]
                              | q7 : bool])
                     /\
-                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1, ..] .<
                     q_4_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values[q1 + 1, ..]
                         | q1 : int(1..3)]),
                and([q2 > q_4_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/model.expected.json
index 0291ff2fe3..f9d6ca3c6f 100644
--- a/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/model.expected.json
@@ -866,7 +866,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -1016,7 +1016,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1447,7 +1447,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
@@ -2218,7 +2218,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/stdout.expected
index d38c523af2..3e43b314b3 100644
--- a/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c7bab02871b463a4b24d6530e2009c74/stdout.expected
@@ -68,7 +68,7 @@ such that
          /\
          (var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q5, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q5 + 1, ..]
           \/
@@ -81,7 +81,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..15)]),
@@ -112,7 +112,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q7, q8 + 1, ..]
                   | q8 : int(1..3)])
@@ -169,7 +169,7 @@ such that
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q18] =
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q18 + 1]
          /\
-         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q18, ..] <lex
+         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q18, ..] .<
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q18 + 1, ..]
              | q18 : int(1..3)]),
     and([q19 > var4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/model.expected.json
index 05bd6f12c4..d8ed65b665 100644
--- a/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/model.expected.json
@@ -1037,7 +1037,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1189,7 +1189,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/stdout.expected
index bcc9374af4..5cf8d80cad 100644
--- a/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c863e1aefc22489efd92991f527ae5a2/stdout.expected
@@ -60,7 +60,7 @@ such that
                   | q45 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q14]
@@ -69,7 +69,7 @@ such that
                   [q1 + 1, q14]
                   | q14 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q17]
diff --git a/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/model.expected.json
index 19b087ff1b..1bbefea57c 100644
--- a/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/model.expected.json
@@ -2018,7 +2018,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2217,7 +2217,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2544,7 +2544,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2719,7 +2719,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  4]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/stdout.expected
index f2f626f9a7..e8e3341032 100644
--- a/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c89bdec4acf5b8c9aaaa53cb0cb59f7d/stdout.expected
@@ -121,7 +121,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -135,7 +135,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -156,7 +156,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -169,7 +169,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/model.expected.json
index 758e456c9c..348529824f 100644
--- a/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/model.expected.json
@@ -94,7 +94,7 @@
                                                   {"Reference":
                                                        [{"Name": "var1_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -808,7 +808,7 @@
                                                              "var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/stdout.expected
index ea7a246081..0cd9a10b04 100644
--- a/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c8cbbeb91436bc3cbb6db533e1de1c9f/stdout.expected
@@ -8,7 +8,7 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence:
 such that
     false,
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarker_Marker ->
-         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_Function1D[q1 + 1, ..]
              | q1 : int(1..63)]),
     and([q2 > var1_ExplicitVarSizeWithMarker_Marker ->
@@ -43,7 +43,7 @@ such that
                         | q18 : int(1..4)]),
                sum([q7_ExplicitVarSizeWithFlags_Flags[q19] | q19 : int(1..5)]) <= 5]),
     and([q10 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q10, .., ..]) <lex
+         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q10, .., ..]) .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q10 + 1, .., ..])
              | q10 : int(1..3)]),
     and([q11 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/model.expected.json
index 55fc966ebe..ab35a675ab 100644
--- a/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/model.expected.json
@@ -78,7 +78,7 @@
                       [{"Reference": [{"Name": "var4"}, null]}, {"Constant": {"ConstantInt": [{"TagInt": []}, 5]}}]}},
             {"Op": {"MkOpNeq": [{"Reference": [{"Name": "var1"}, null]}, {"Reference": [{"Name": "var1"}, null]}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/stdout.expected
index 005369057e..5703c715ef 100644
--- a/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c8cc670b809293626467998d149a92ca/stdout.expected
@@ -12,4 +12,4 @@ such that
     relation(tuple (false), tuple (false), tuple (false), tuple (false), tuple (true)),
     image(var4, 5),
     var1 != var1,
-    [0; int(0)] <=lex [3, 1, 1, 5, 3; int(10, 1, 0, 15, 12)]
+    [0; int(0)] .<= [3, 1, 1, 5, 3; int(10, 1, 0, 15, 12)]
diff --git a/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/model.expected.json
index ecbb085bff..7568208a73 100644
--- a/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/model.expected.json
@@ -1174,7 +1174,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1817,7 +1817,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1951,7 +1951,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/stdout.expected
index f3a96939ae..60d533013d 100644
--- a/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c96d788458c4c7e3247f608a018776aa/stdout.expected
@@ -91,7 +91,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
@@ -129,14 +129,14 @@ such that
              | q16 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([var5_ExplicitWithFlagsR10_Flags[q23 + 1] > 0 ->
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q23, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q23, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q23 + 1, ..]
          \/
          and([var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q23, q34] =
               var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q23 + 1, q34]
                   | q34 : bool])
          /\
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q23, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q23, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q23 + 1, ..]
              | q23 : int(1..63)]),
     and([var5_ExplicitWithFlagsR10_Flags[q24] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/model.expected.json b/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/model.expected.json
index 06f252e437..cd12454008 100644
--- a/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/model.expected.json
@@ -535,7 +535,7 @@
                                                              "var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/stdout.expected b/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/stdout.expected
index 9eb0e8b86a..921521d3b8 100644
--- a/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/c9e1cd7a71dc9c900ce717378a2e7326/stdout.expected
@@ -27,7 +27,7 @@ such that
                         | q12 : int(1..4)]),
                sum([q1_ExplicitVarSizeWithFlags_Flags[q13] | q13 : int(1..5)]) <= 5]),
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4, .., ..]) <lex
+         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4, .., ..]) .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q4 + 1, .., ..])
              | q4 : int(1..3)]),
     and([q5 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/model.expected.json b/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/model.expected.json
index c354b3d25f..576a7ba787 100644
--- a/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/model.expected.json
@@ -447,7 +447,7 @@
                                                                                                                          []},
                                                                                                                     2]}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/stdout.expected b/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/stdout.expected
index 0349005cb7..2fdbebdf52 100644
--- a/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/cad537c995fb03554a83b3fb49b715bc/stdout.expected
@@ -31,7 +31,7 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1, 1] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1, 2]
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q1, 1, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q1, 1, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q1, 2, ..]
              | q1 : int(1..5, 5)]),
     and([and([q6 > var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q1] ->
diff --git a/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/model.expected.json
index 5b62d1d141..475a4c9838 100644
--- a/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/model.expected.json
@@ -166,7 +166,7 @@
                             {"ConstantAbstract":
                                  {"AbsLitFunction": [[{"ConstantBool": true}, {"ConstantBool": false}]]}}},
                        {"Op":
-                            {"MkOpLexLeq":
+                            {"MkOpDotLeq":
                                  [{"Reference": [{"Name": "var1"}, null]},
                                   {"Constant":
                                        {"ConstantAbstract":
diff --git a/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/stdout.expected
index b8769711bb..fa63577a7b 100644
--- a/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/cc2192ed7f68debf33abcbf2de08eff2/stdout.expected
@@ -22,7 +22,7 @@ such that
                        {false}),
              partition({false, true, false, true}, {false});
                  int(4..6)]),
-    image(function(true --> false), var1 <=lex [true, true, true; int(2, 4, 0)]),
+    image(function(true --> false), var1 .<= [true, true, true; int(2, 4, 0)]),
     image(function({true} --> false, {true} --> false), {true <-> false}),
     together({relation((true, true))},
              partition({relation((true, false), (false, true), (false, false), (false, false), (true, true)),
diff --git a/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/model.expected.json
index 5a6d114f22..daed1f375d 100644
--- a/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/model.expected.json
@@ -255,7 +255,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -401,7 +401,7 @@
                                                                                                                                             []},
                                                                                                                                        3]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1239,7 +1239,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/stdout.expected
index f913a48e6b..834252d1ff 100644
--- a/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d1f9f5646ad02f51e81ccd962c936011/stdout.expected
@@ -27,14 +27,14 @@ such that
     given2,
     given1,
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarkerR7_Marker ->
-         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, q10] =
               var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1 + 1, q10]
                   | q10 : int(1..3)])
          /\
-         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_ExplicitVarSizeWithMarkerR7_Marker ->
@@ -84,7 +84,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q20] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q20 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20 + 1, ..]
              | q20 : int(1..3)]),
     and([q21 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/model.expected.json
index e1735cbbd8..5df6fab58f 100644
--- a/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/model.expected.json
@@ -712,7 +712,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -880,7 +880,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1030,7 +1030,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/stdout.expected
index 3f23b7a2bd..f8d3236f26 100644
--- a/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d1ffc6dc30ae73ba44e3f9c55d3e1636/stdout.expected
@@ -61,21 +61,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/model.expected.json
index 85f967837d..8f3d2c10af 100644
--- a/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/model.expected.json
@@ -1188,7 +1188,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1370,7 +1370,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1627,7 +1627,7 @@
                                                                                               [{"TagInt": []},
                                                                                                2]}}]}]]},
                                                                        [{"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
@@ -1740,7 +1740,7 @@
                                                                                                                                               []},
                                                                                                                                          2]}}}}]}}]}},
                                                                                               {"Op":
-                                                                                                   {"MkOpLexLt":
+                                                                                                   {"MkOpDotLt":
                                                                                                         [{"Op":
                                                                                                               {"MkOpSlicing":
                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/stdout.expected
index 2717126c74..013faee70e 100644
--- a/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d20ff5e630ee919f1fcc726ea14f1e21/stdout.expected
@@ -72,7 +72,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -85,7 +85,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..3)]),
@@ -104,7 +104,7 @@ such that
          (2 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 2, ..]
           \/
@@ -116,7 +116,7 @@ such that
           /\
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 2, ..])
              | q7 : int(1..4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/model.expected.json
index 13cee521bf..0c22b87331 100644
--- a/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/model.expected.json
@@ -718,7 +718,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -886,7 +886,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             2]}}]}]]},
                                                                                                                                                     [{"Op":
-                                                                                                                                                          {"MkOpLexLt":
+                                                                                                                                                          {"MkOpDotLt":
                                                                                                                                                                [{"Op":
                                                                                                                                                                      {"MkOpSlicing":
                                                                                                                                                                           [{"Op":
@@ -1036,7 +1036,7 @@
                                                                                                                                                                                                                                     []},
                                                                                                                                                                                                                                2]}}]}]]}]}}]]}}},
                                                                                                                                                                            {"Op":
-                                                                                                                                                                                {"MkOpLexLt":
+                                                                                                                                                                                {"MkOpDotLt":
                                                                                                                                                                                      [{"Op":
                                                                                                                                                                                            {"MkOpSlicing":
                                                                                                                                                                                                 [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/stdout.expected
index 714bb4ea4f..2e64751b7b 100644
--- a/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d2d4b6dd1eb76f25c117fe82249925fb/stdout.expected
@@ -61,21 +61,21 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] <lex
+         (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, ..] .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, ..]
           \/
           and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4, q10] =
                var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q4 + 1, q10]
                    | q10 : int(1..2)])
           /\
-          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] <lex
+          (var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, ..]
            \/
            and([var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4, q12] =
                 var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_2[q4 + 1, q12]
                     | q12 : int(1..2)])
            /\
-           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] <lex
+           var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4, ..] .<
            var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_3[q4 + 1, ..]))
              | q4 : int(1..255)]),
     and([q5 > var1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/model.expected.json
index f495f15673..e7f1cd3a8c 100644
--- a/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/model.expected.json
@@ -1180,7 +1180,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1748,7 +1748,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1882,7 +1882,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/stdout.expected
index d23a49091e..a0caf7e8f9 100644
--- a/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d3909eeb253333c473b61058dd67f690/stdout.expected
@@ -91,7 +91,7 @@ such that
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7] =
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q7 + 1]
          /\
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
@@ -120,14 +120,14 @@ such that
     and([var4_1_ExplicitWithFlags_Flags[q17] = 0 \/ var4_1_ExplicitWithFlags_Flags[q17] >= 0 | q17 : int(1..3)]),
     3 = sum([var4_1_ExplicitWithFlags_Flags[q18] | q18 : int(1..3)]),
     and([var5_ExplicitWithFlagsR10_Flags[q20 + 1] > 0 ->
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20 + 1, ..]
          \/
          and([var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20, q31] =
               var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q20 + 1, q31]
                   | q31 : bool])
          /\
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q20, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q20, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q20 + 1, ..]
              | q20 : int(1..63)]),
     and([var5_ExplicitWithFlagsR10_Flags[q21] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/model.expected.json
index f234c91e1f..8346626346 100644
--- a/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/model.expected.json
@@ -1396,7 +1396,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1578,7 +1578,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    2]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1835,7 +1835,7 @@
                                                                                               [{"TagInt": []},
                                                                                                2]}}]}]]},
                                                                        [{"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
@@ -1948,7 +1948,7 @@
                                                                                                                                               []},
                                                                                                                                          2]}}}}]}}]}},
                                                                                               {"Op":
-                                                                                                   {"MkOpLexLt":
+                                                                                                   {"MkOpDotLt":
                                                                                                         [{"Op":
                                                                                                               {"MkOpSlicing":
                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/stdout.expected
index ab7b98cbfd..d501f81198 100644
--- a/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d548102740c166c94c1585976df85834/stdout.expected
@@ -87,7 +87,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q5 + 1, .., ..])
           \/
@@ -100,7 +100,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..3)]),
@@ -119,7 +119,7 @@ such that
          (2 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
               [q7, 2, ..]
           \/
@@ -131,7 +131,7 @@ such that
           /\
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 1, ..]
-          <lex
+          .<
           var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
               [q7, 2, ..])
              | q7 : int(1..4)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/model.expected.json
index c005bcc66f..c9f68a71c7 100644
--- a/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/model.expected.json
@@ -1003,7 +1003,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1177,7 +1177,7 @@
                                                                                                                                             []},
                                                                                                                                        8]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/stdout.expected
index e6d32bf2e8..c087486243 100644
--- a/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d563cbf2c040240a470a21faf1f336cb/stdout.expected
@@ -62,7 +62,7 @@ such that
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker,
     var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker <= 1,
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-    and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, ..] <lex
+    and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9 + 1, ..]
          \/
          and([var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags[1, q9, q36] =
@@ -70,7 +70,7 @@ such that
                   [1, q9 + 1, q36]
                   | q36 : int(1..8)])
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values[1, q9 + 1, ..]
              | q9 : int(1..3)]),
     1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/model.expected.json
index 4db830b35a..e95de6d77c 100644
--- a/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/model.expected.json
@@ -82,7 +82,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/stdout.expected
index 82e876ac62..e4bce96cb4 100644
--- a/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d6b3494aaacb9f588de0875051f0040c/stdout.expected
@@ -6,7 +6,7 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Oc
 find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2: matrix indexed by [int(1..3)] of bool
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Occurrence[q1, q14] ->
diff --git a/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/model.expected.json
index c81ec98be4..b2010bb56d 100644
--- a/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/model.expected.json
@@ -377,7 +377,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/stdout.expected
index 31875ee263..4bb6136eaf 100644
--- a/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d75b01e01b11eb07e4bc4fbd71ce3b5e/stdout.expected
@@ -34,7 +34,7 @@ such that
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5] =
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q5 + 1]
          /\
-         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q5 + 1, ..]
              | q5 : int(1..3)]),
     and([q6 > var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/model.expected.json
index 00cd5dc1e8..2ed1c94ec0 100644
--- a/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/model.expected.json
@@ -574,7 +574,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -700,7 +700,7 @@
                                                                                                                          []},
                                                                                                                     1]}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/stdout.expected
index 216a6cd82e..8ce3a147bb 100644
--- a/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d7d816b10a6f459ed78f1bd604bca06f/stdout.expected
@@ -38,7 +38,7 @@ such that
                         | q13 : int(1..5)]),
                q1_ExplicitVarSizeWithMarker_Marker <= 5]),
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4 + 1, ..]
          \/
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q4, 1] =
@@ -46,7 +46,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q4 + 1, .., ..])
              | q4 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/model.expected.json
index fc366c40b8..a9ff4497c1 100644
--- a/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/model.expected.json
@@ -238,7 +238,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -291,7 +291,7 @@
                                                                                                                                null,
                                                                                                                                null]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/stdout.expected
index 7824660351..621f7e850a 100644
--- a/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d89a06ed8f4ec8185046a435ad85ca8c/stdout.expected
@@ -17,13 +17,13 @@ such that
          /\
          (var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1, ..]
-          <lex
+          .<
           var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1 + 1, ..]
           \/
           flatten(var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/model.expected.json
index 83d61ff8a7..0ed44f8d1c 100644
--- a/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/model.expected.json
@@ -1032,7 +1032,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1184,7 +1184,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/stdout.expected
index bd68c0de82..981a5c4e31 100644
--- a/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/d92076e69308eb50f5eb562d89a97d2e/stdout.expected
@@ -63,7 +63,7 @@ such that
                   | q45 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
@@ -72,7 +72,7 @@ such that
                   [q1 + 1, q16]
                   | q16 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q19]
diff --git a/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/model.expected.json
index 009f660a10..58e9c25d06 100644
--- a/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/model.expected.json
@@ -340,7 +340,7 @@
                                                                    null]},
                                                              {"Constant": {"ConstantInt": [{"TagInt": []}, 1]}}]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -512,7 +512,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -646,7 +646,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1346,7 +1346,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/stdout.expected
index 00f0081c6c..e1407401e4 100644
--- a/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/da2dd87b9830b0d92b6148601757e71f/stdout.expected
@@ -28,7 +28,7 @@ such that
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1],
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] >= 1,
     and([q8 + 1 <= var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
-         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] <lex
+         var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8, ..] .<
          var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Values[1, q8 + 1, ..]
              | q8 : int(1..23)]),
     and([q9 > var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] ->
@@ -36,14 +36,14 @@ such that
              | q9 : int(1..24)]),
     var1_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] <= 24,
     and([var2_ExplicitVarSizeWithFlagsR10_Flags[q13 + 1] ->
-         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13, ..] <lex
+         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13, ..] .<
          var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13, q23] =
               var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Flags[q13 + 1, q23]
                   | q23 : bool])
          /\
-         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Values[q13, ..] <lex
+         var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Values[q13, ..] .<
          var2_ExplicitVarSizeWithFlagsR10_Values_Function1DPartial_Values[q13 + 1, ..]
              | q13 : int(1..119)]),
     and([var2_ExplicitVarSizeWithFlagsR10_Flags[q14] = false ->
@@ -87,7 +87,7 @@ such that
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q36] =
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q36 + 1]
          /\
-         var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36, ..] <lex
+         var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36, ..] .<
          var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q36 + 1, ..]
              | q36 : int(1..4)]),
     and([q37 > var4_1_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/model.expected.json b/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/model.expected.json
index 52ed1e52b5..1b4daf6cc4 100644
--- a/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/model.expected.json
@@ -868,7 +868,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1066,7 +1066,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1391,7 +1391,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -1565,7 +1565,7 @@
                                                                                                                                                                        []},
                                                                                                                                                                   2]}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
@@ -2464,7 +2464,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/stdout.expected b/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/stdout.expected
index 1924962a91..27690b8dcb 100644
--- a/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/dad7b9b0bdd9e288f1dc3b19ec96c213/stdout.expected
@@ -66,7 +66,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                       [q5 + 1, .., ..])
           \/
@@ -80,7 +80,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q5, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                       [q5 + 1, .., ..]))
              | q5 : int(1..15)]),
@@ -100,7 +100,7 @@ such that
          and([q8 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q7] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Flags
                   [q7, q8 + 1, ..]
               \/
@@ -113,7 +113,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q7, q8, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithFlags_Values
                   [q7, q8 + 1, ..]
                   | q8 : int(1..3)])
@@ -179,7 +179,7 @@ such that
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q20] =
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q20 + 1]
          /\
-         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20, ..] <lex
+         var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20, ..] .<
          var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20 + 1, ..]
              | q20 : int(1..3)]),
     and([q21 > var4_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/model.expected.json b/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/model.expected.json
index 7039c7a25c..5aea320a15 100644
--- a/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/model.expected.json
@@ -995,7 +995,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1488,7 +1488,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1622,7 +1622,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/stdout.expected b/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/stdout.expected
index a6cc6b79d9..989247e44a 100644
--- a/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/dbc08914b7c5505e1136cc21ac9d5125/stdout.expected
@@ -78,7 +78,7 @@ such that
          >= 1
              | q51 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
@@ -105,14 +105,14 @@ such that
              | q14 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([q21 + 1 <= var5_ExplicitWithRepetitionR10_Flag ->
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21, ..] <lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21, ..] .<
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21 + 1, ..]
          \/
          and([var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21, q31] =
               var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q21 + 1, q31]
                   | q31 : bool])
          /\
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q21, ..] <=lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q21, ..] .<=
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q21 + 1, ..]
              | q21 : int(1..255)]),
     and([q22 > var5_ExplicitWithRepetitionR10_Flag ->
diff --git a/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/model.expected.json b/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/model.expected.json
index ab0dbcc494..65f9859bad 100644
--- a/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/model.expected.json
@@ -943,7 +943,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1080,7 +1080,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/stdout.expected b/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/stdout.expected
index 2bc4c8fb5b..a40953a2ad 100644
--- a/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/de9716a7ff65a1574f48f0b1858be3bd/stdout.expected
@@ -61,7 +61,7 @@ such that
                   | q47 : int(1..2)])
              | q1 : int(1..31)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
@@ -70,7 +70,7 @@ such that
                   [q1 + 1, q16]
                   | q16 : bool])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q19]
diff --git a/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/model.expected.json b/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/model.expected.json
index 87ee247c03..62a3df3eac 100644
--- a/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/model.expected.json
@@ -464,7 +464,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/stdout.expected b/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/stdout.expected
index 24b709c45b..91e28f5cc0 100644
--- a/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/de98c56929c67f420c29fa2f74d46c69/stdout.expected
@@ -39,7 +39,7 @@ such that
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] =
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6 + 1]
          /\
-         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6 + 1, ..]
              | q6 : int(1..2)]),
     and([q7 > var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/model.expected.json b/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/model.expected.json
index 68fe789331..db03d648e8 100644
--- a/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/model.expected.json
@@ -526,7 +526,7 @@
                                                                                                                                     []},
                                                                                                                                1]}}]]}}}}]}}]}},
                                                                         {"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpFlatten":
                                                                                              [null,
@@ -642,7 +642,7 @@
                                                                              {"Reference":
                                                                                   [{"Name": "q5"}, null]}]}}]}},
                                                        {"Op":
-                                                            {"MkOpLexLt":
+                                                            {"MkOpDotLt":
                                                                  [{"Op":
                                                                        {"MkOpSlicing":
                                                                             [{"Op":
@@ -1054,7 +1054,7 @@
                                                              "var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1353,7 +1353,7 @@
                                                                                                                                     []},
                                                                                                                                1]}}]]}}}}]}}]}},
                                                                         {"Op":
-                                                                             {"MkOpLexLt":
+                                                                             {"MkOpDotLt":
                                                                                   [{"Op":
                                                                                         {"MkOpSlicing":
                                                                                              [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/stdout.expected b/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/stdout.expected
index 56f45f956c..7f619a18f9 100644
--- a/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/dec056eee47fd05a251225b16b62ab64/stdout.expected
@@ -39,11 +39,11 @@ such that
          var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q4] =
          var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q4 + 1]
          /\
-         flatten(var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q4, .., ..]) <lex
+         flatten(var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q4, .., ..]) .<
          flatten(var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q4 + 1, .., ..])
              | q4 : int(1..4)]),
     and([and([q6 + 1 <= var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q5] ->
-              var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q5, q6, ..] <lex
+              var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q5, q6, ..] .<
               var1_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values_Function1D[q5, q6 + 1, ..]
                   | q6 : int(1..5)])
              | q5 : int(1..5)]),
@@ -67,7 +67,7 @@ such that
                   | q51 : int(1..5)])
              | q30 : bool]),
     and([q35 + 1 <= var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[q35, ..] <lex
+         var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[q35, ..] .<
          var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[q35 + 1, ..]
              | q35 : int(1..4)]),
     and([q36 > var4_2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -87,7 +87,7 @@ such that
          var4_3_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q43] =
          var4_3_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q43 + 1]
          /\
-         var4_3_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values[q43, ..] <lex
+         var4_3_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values[q43, ..] .<
          var4_3_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Values[q43 + 1, ..]
              | q43 : int(1..4)]),
     and([1 > var4_3_PartitionAsSet_Explicit_ExplicitVarSizeWithMarker_Marker[q44] ->
diff --git a/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/model.expected.json
index 33559136c8..643284a6ad 100644
--- a/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/model.expected.json
@@ -122,7 +122,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -271,7 +271,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/stdout.expected
index 247f15e7d8..1cf378dc0b 100644
--- a/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e02f77cea3324e91d885d1f3fe504cd4/stdout.expected
@@ -9,7 +9,7 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2: m
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
@@ -22,7 +22,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
diff --git a/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/model.expected.json
index f6dd5d4a81..7622a2603d 100644
--- a/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/model.expected.json
@@ -981,7 +981,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1133,7 +1133,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/stdout.expected
index 930c9a62a9..45c2c178e4 100644
--- a/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e0bb089c7844a06fba3ed1abd7cb6608/stdout.expected
@@ -61,7 +61,7 @@ such that
                   | q45 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q18]
@@ -70,7 +70,7 @@ such that
                   [q1 + 1, q18]
                   | q18 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q21]
diff --git a/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/model.expected.json
index 4abc563713..11494d4a62 100644
--- a/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/model.expected.json
@@ -461,7 +461,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]}}]}},
                                                   {"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/stdout.expected
index 5acc940091..c8e8a76965 100644
--- a/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e1aecd4c14589221e87e2ec00b232d51/stdout.expected
@@ -34,7 +34,7 @@ such that
     var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 1,
     1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
     and([q7 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[1] ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q7, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q7, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[1, q7 + 1, ..]
              | q7 : int(1..3)]),
     1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/model.expected.json
index 89a0c4299d..e5934a553e 100644
--- a/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/model.expected.json
@@ -253,7 +253,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -399,7 +399,7 @@
                                                                                                                                             []},
                                                                                                                                        3]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1237,7 +1237,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/stdout.expected
index 2601150149..335350abbe 100644
--- a/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e21cd7b0f710515a79d787945d809a81/stdout.expected
@@ -27,14 +27,14 @@ such that
     given2,
     given1,
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarkerR7_Marker ->
-         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, q10] =
               var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1 + 1, q10]
                   | q10 : int(1..3)])
          /\
-         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_ExplicitVarSizeWithMarkerR7_Marker ->
@@ -84,7 +84,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q20] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q20 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q20 + 1, ..]
              | q20 : int(1..3)]),
     and([q21 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/model.expected.json
index c722bb7aa6..7932acb80a 100644
--- a/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/model.expected.json
@@ -107,7 +107,7 @@
                                                         [{"Constant": {"ConstantInt": [{"TagInt": []}, 1]}},
                                                          {"Constant": {"ConstantInt": [{"TagInt": []}, 2]}}]}]]},
                                             [{"Op":
-                                                  {"MkOpLexLt":
+                                                  {"MkOpDotLt":
                                                        [{"Op":
                                                              {"MkOpSlicing":
                                                                   [{"Op":
@@ -225,7 +225,7 @@
                                                                                                                      []},
                                                                                                                 2]}}]}]]},
                                                                                         [{"Op":
-                                                                                              {"MkOpLexLt":
+                                                                                              {"MkOpDotLt":
                                                                                                    [{"Op":
                                                                                                          {"MkOpSlicing":
                                                                                                               [{"Op":
@@ -257,7 +257,7 @@
                                                                                                                null,
                                                                                                                null]}}]}},
                                                                                          {"Op":
-                                                                                              {"MkOpLexLt":
+                                                                                              {"MkOpDotLt":
                                                                                                    [{"Op":
                                                                                                          {"MkOpSlicing":
                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/stdout.expected
index 0fba244841..d355acd51a 100644
--- a/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e31e8258961a4a8fa32e4eb491491bdc/stdout.expected
@@ -10,18 +10,17 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Ex
 find var2_RelationAsMatrix: matrix indexed by [int(4, 5), bool, bool, bool, bool] of bool
 such that
     2 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-    var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[1, ..] <lex
+    var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[1, ..] .<
     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[2, ..]
     \/
     and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[1, q27] =
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[2, q27]
              | q27 : int(0..4, 4)])
     /\
-    (var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[1, ..] <lex
+    (var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[1, ..] .<
      var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Flags[2, ..]
      \/
-     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[1, ..]
-     <lex
+     var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[1, ..] .<
      var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_ExplicitVarSizeWithFlags_Values[2, ..]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q2, q38] = false
diff --git a/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/model.expected.json
index 34c6107eb9..56e28caaad 100644
--- a/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/model.expected.json
@@ -57,7 +57,7 @@
                                           {"Constant": {"ConstantInt": [{"TagInt": []}, 5]}}]}]]}]}]}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Comprehension":
                             [{"Reference": [{"Name": "l_1"}, null]},
                              [{"Generator": {"GenDomainNoRepr": [{"Single": {"Name": "l_1"}}, {"DomainBool": []}]}}]]},
diff --git a/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/stdout.expected
index dba7e22f7d..f96d16b7c5 100644
--- a/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e33c5a4b1eca296873386a312774d872/stdout.expected
@@ -4,5 +4,5 @@ find var1: mset (minSize factorial(3), maxOccur 5 - 2) of mset (size 0, minOccur
 find var2:
         partition (maxNumParts 2, minPartSize 4, maxPartSize 5, regular) from matrix indexed by [int(2, 5)] of int(5, 5)
 such that
-    [l_1 | l_1 : bool] <lex [l_2 | l_2 : bool],
+    [l_1 | l_1 : bool] .< [l_2 | l_2 : bool],
     false
diff --git a/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/model.expected.json
index 8dfc7a4c8d..ce2486cfda 100644
--- a/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/model.expected.json
@@ -492,7 +492,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -728,7 +728,7 @@
                                                                                              [{"Name": "q6"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
@@ -1081,7 +1081,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1215,7 +1215,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/stdout.expected
index 86444292b4..8b281dbb52 100644
--- a/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e5c113460990fde26723d11aa27cbea5/stdout.expected
@@ -37,7 +37,7 @@ such that
          /\
          flatten(var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                      [q4 + 1, .., ..])
              | q4 : int(1..65535)]),
@@ -53,7 +53,7 @@ such that
          and([q7 + 1 <= var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q6] ->
               var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                   [q6, q7, ..]
-              <lex
+              .<
               var1_1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1D
                   [q6, q7 + 1, ..]
                   | q7 : int(1..3)])
@@ -78,14 +78,14 @@ such that
                   | q9 : int(1..4)])
              | q6 : int(1..65536)]),
     and([var1_2_ExplicitVarSizeWithFlags_Flags[q11 + 1] > 0 ->
-         var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q11, ..] <lex
+         var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q11, ..] .<
          var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q11 + 1, ..]
          \/
          and([var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q11, q36] =
               var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q11 + 1, q36]
                   | q36 : bool])
          /\
-         var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q11, ..] <lex
+         var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q11, ..] .<
          var1_2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q11 + 1, ..]
              | q11 : int(1..4)]),
     and([var1_2_ExplicitVarSizeWithFlags_Flags[q12] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/model.expected.json
index 7f1afcd48c..b97859243d 100644
--- a/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/model.expected.json
@@ -785,7 +785,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -937,7 +937,7 @@
                                                                                                                                                                  []},
                                                                                                                                                             4]}}}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/stdout.expected
index 221b9fcf88..2a04076e7e 100644
--- a/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e5ef686faac39c34b542eec223509aa8/stdout.expected
@@ -51,7 +51,7 @@ such that
                   | q37 : int(1..2)])
              | q1 : int(1..7)]),
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q16]
@@ -60,7 +60,7 @@ such that
                   [q1 + 1, q16]
                   | q16 : int(-4, 4)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Values[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_Function1DPartial_Flags[q1, q19]
diff --git a/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/model.expected.json
index 9c4c27cfe5..9c9d644f8c 100644
--- a/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/model.expected.json
@@ -350,7 +350,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -403,7 +403,7 @@
                                                                                                                                null,
                                                                                                                                null]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/stdout.expected
index 27dc7a56f5..026652d2b1 100644
--- a/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e65878a75f8a723504c5189d62b6f391/stdout.expected
@@ -30,13 +30,13 @@ such that
          /\
          (var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q4, ..]
-          <lex
+          .<
           var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q4 + 1, ..]
           \/
           flatten(var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q4 + 1, .., ..]))
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/model.expected.json
index 05faf02890..88a3704020 100644
--- a/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/model.expected.json
@@ -259,7 +259,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -405,7 +405,7 @@
                                                                                                                                             []},
                                                                                                                                        3]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1235,7 +1235,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/stdout.expected
index d0f5558c85..cafcd3bc5e 100644
--- a/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e6d35b55e35082d3fa2dd4068f7ebfdf/stdout.expected
@@ -27,14 +27,14 @@ such that
     given2,
     given1,
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarkerR7_Marker ->
-         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1 + 1, ..]
          \/
          and([var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1, q10] =
               var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Flags[q1 + 1, q10]
                   | q10 : int(1..3)])
          /\
-         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithMarkerR7_Values_ExplicitWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_ExplicitVarSizeWithMarkerR7_Marker ->
@@ -82,7 +82,7 @@ such that
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q21] =
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q21 + 1]
          /\
-         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q21, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q21, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values_1[q21 + 1, ..]
              | q21 : int(1..3)]),
     and([q22 > var3_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/model.expected.json
index 2a7778a066..ed29ce8955 100644
--- a/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/model.expected.json
@@ -271,7 +271,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -652,7 +652,7 @@
                                                                                                                                                                                            []},
                                                                                                                                                                                       1]}}]]}}}}]}}]}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpSlicing":
                                                                                                                                                     [{"Op":
@@ -1234,7 +1234,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/stdout.expected
index d2b3fc1e96..c5eee5bb9f 100644
--- a/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e7a6d29d4285dcfdd7daddc00be2c882/stdout.expected
@@ -27,7 +27,7 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Marker ->
-         var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6, ..] <lex
+         var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6, ..] .<
          var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6 + 1, ..]
          \/
          and([var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6, q17]
@@ -56,7 +56,7 @@ such that
           /\
           var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -117,7 +117,7 @@ such that
     and([q29 <= var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Marker /\
          q30 <= var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Marker
          ->
-         (var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q29, ..] <lex
+         (var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q29, ..] .<
           var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q30, ..]
           ->
           or([q32 <=
diff --git a/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/model.expected.json
index f858f124ef..97fa4cb94d 100644
--- a/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/model.expected.json
@@ -2258,7 +2258,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2460,7 +2460,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2795,7 +2795,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2973,7 +2973,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             1]}}}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/stdout.expected
index 514c2d330f..b173af69c1 100644
--- a/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e7f89fcbcdbd0a79caefef0e87678c8d/stdout.expected
@@ -122,7 +122,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -136,7 +136,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -156,7 +156,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -169,7 +169,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/model.expected.json
index 92744967c6..c2318e6dd5 100644
--- a/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/model.expected.json
@@ -157,7 +157,7 @@
                                                   {"ConstantBool": false}, {"ConstantBool": true},
                                                   {"ConstantBool": false}]]}}}}}]}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpFlatten":
                                  [null,
@@ -198,7 +198,7 @@
             {"Op":
                  {"MkOpImply":
                       [{"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Constant":
                                        {"ConstantAbstract":
                                             {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/stdout.expected
index 9a1c69f6ba..f869b390a6 100644
--- a/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e8b367599a5f7fcb2e355134b78bc13f/stdout.expected
@@ -9,6 +9,6 @@ find var2:
 find var3: relation (minSize 0, maxSize 0) of (relation (minSize 2, maxSize 3) of (int(1..4, 0)))
 such that
     or([true, true, false, true; int(2..3, 8..9)]) <-> or([false, false, false, true, false; int(11..12, 3, 0, 8)]),
-    flatten([0, 2, 0, 2, 1; int(12..13, 7, 6, 8)]) <lex [2 % 2, 3 ** 0, -2; int(0..2)],
-    [false; int(0)] <lex [false; int(1)] ->
+    flatten([0, 2, 0, 2, 1; int(12..13, 7, 6, 8)]) .< [2 % 2, 3 ** 0, -2; int(0..2)],
+    [false; int(0)] .< [false; int(1)] ->
     together({false, true, false}, partition({false}, {true}, {false, true, false}, {false, false, true, false, true}))
diff --git a/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/model.expected.json
index 04792e5eb5..5132374507 100644
--- a/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/model.expected.json
@@ -283,7 +283,7 @@
                                                                                               1]}}]]}}}}]}},
                                                   {"Constant": {"ConstantInt": [{"TagInt": []}, 0]}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/stdout.expected
index a06b896120..b0eb6c0a7a 100644
--- a/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e94042e71ae4aca4b2dcbe6a1c03eeb5/stdout.expected
@@ -18,7 +18,7 @@ such that
                  | q12 : int(1..nrings)])
              | q11 : int(1..fin1)]),
     and([network_ExplicitWithFlagsR2_Flags[q1 + 1] > 0 ->
-         network_ExplicitWithFlagsR2_Values_Occurrence[q1, ..] <lex
+         network_ExplicitWithFlagsR2_Values_Occurrence[q1, ..] .<
          network_ExplicitWithFlagsR2_Values_Occurrence[q1 + 1, ..]
              | q1 : int(1..nrings - 1)]),
     and([network_ExplicitWithFlagsR2_Flags[q2] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/model.expected.json b/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/model.expected.json
index 1000b745a1..c8ba26e0df 100644
--- a/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/model.expected.json
@@ -165,7 +165,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -215,7 +215,7 @@
                                                                                                                                1]}}]]}}}}]}},
                                                                                    null, null]}}]}},
                                                              {"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -698,7 +698,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}}]}},
                                                                    {"Op":
-                                                                        {"MkOpLexLt":
+                                                                        {"MkOpDotLt":
                                                                              [{"Op":
                                                                                    {"MkOpFlatten":
                                                                                         [null,
@@ -926,7 +926,7 @@
                                                                                              [{"Name": "q20"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/stdout.expected b/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/stdout.expected
index 2cf3448a65..5b0211d599 100644
--- a/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/e94f81e31dce6a8efb7cdffe25cc7a9a/stdout.expected
@@ -13,10 +13,10 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMar
 such that
     false,
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] > 0 ->
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Flags[q1 + 1, ..]
          \/
-         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_ExplicitVarSizeWithFlags_Values[q1 + 1, ..]
              | q1 : int(1..2)]),
     and([var1_ExplicitVarSizeWithFlags_Flags[q3 + 1] > 0 -> var1_ExplicitVarSizeWithFlags_Flags[q3] > 0
@@ -48,7 +48,7 @@ such that
     var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[1] =
     var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[2]
     /\
-    flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[1, .., ..]) <lex
+    flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[1, .., ..]) .<
     flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[2, .., ..]),
     and([q19 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q19] = 0 /\
@@ -59,7 +59,7 @@ such that
     var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker <= 2,
     and([q20 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          and([q21 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q20] ->
-              var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20, q21, ..] <lex
+              var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20, q21, ..] .<
               var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q20, q21 + 1, ..]
                   | q21 : int(1..4)])
              | q20 : int(1..2)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/model.expected.json b/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/model.expected.json
index 484aedbb3f..cf0ac4fe39 100644
--- a/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/model.expected.json
@@ -1103,7 +1103,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1744,7 +1744,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1878,7 +1878,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/stdout.expected b/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/stdout.expected
index 85c2d52abe..afae3905be 100644
--- a/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/eaa45321fa09e5ac7b722523a615feba/stdout.expected
@@ -86,7 +86,7 @@ such that
          >= 1
              | q42 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR6_Marker ->
@@ -124,14 +124,14 @@ such that
              | q17 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([var5_ExplicitWithFlagsR10_Flags[q24 + 1] > 0 ->
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q24, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q24, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q24 + 1, ..]
          \/
          and([var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q24, q35] =
               var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q24 + 1, q35]
                   | q35 : bool])
          /\
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q24, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q24, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q24 + 1, ..]
              | q24 : int(1..63)]),
     and([var5_ExplicitWithFlagsR10_Flags[q25] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/model.expected.json b/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/model.expected.json
index acf1251b7a..f54a8a3be3 100644
--- a/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/model.expected.json
@@ -542,7 +542,7 @@
                                    {"AbstractLiteral":
                                         {"AbsLitRelation":
                                              [[{"Op":
-                                                    {"MkOpLexLeq":
+                                                    {"MkOpDotLeq":
                                                          [{"Constant":
                                                                {"ConstantAbstract":
                                                                     {"AbsLitMatrix":
diff --git a/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/stdout.expected b/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/stdout.expected
index 89ad42c451..c86893edf1 100644
--- a/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/eb0e88cd958943e2e87a5ade86710827/stdout.expected
@@ -66,7 +66,7 @@ such that
                                           mset(true)},
                                          {(mset() : `mset of bool`), mset(true, false), mset(false)}))),
              flatten([mset(true), mset(true), mset(false); int(2..3, 6)])
-                 --> relation(([false, true, false, false, true; int(3, 7..10)] <=lex [false; int(2)],
+                 --> relation(([false, true, false, false, true; int(3, 7..10)] .<= [false; int(2)],
                                partition({relation(tuple (false), tuple (false), tuple (true)),
                                           relation(tuple (true), tuple (false), tuple (false)),
                                           relation(tuple (false))},
diff --git a/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/model.expected.json b/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/model.expected.json
index bdda6165f7..bc5bc0c590 100644
--- a/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/model.expected.json
@@ -304,7 +304,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -454,7 +454,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    4]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -1331,7 +1331,7 @@
                                                                                                                                                                           []},
                                                                                                                                                                      1]}}]]}}}}]}}]}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/stdout.expected b/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/stdout.expected
index 708a50b442..ae08994656 100644
--- a/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/eb22d7172ced999f8568dccf4a1a3d94/stdout.expected
@@ -24,7 +24,7 @@ such that
          /\
          (var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1, ..]
-          <lex
+          .<
           var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker
               [q1 + 1, ..]
           \/
@@ -37,7 +37,7 @@ such that
           /\
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..4)]),
@@ -104,7 +104,7 @@ such that
               /\
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11, ..]
-              <lex
+              .<
               var1_ExplicitVarSizeWithFlags_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values
                   [q5, q11 + 1, ..]
                   | q11 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/model.expected.json b/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/model.expected.json
index 4ab57dda66..1fe9e45a85 100644
--- a/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/model.expected.json
@@ -1560,7 +1560,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1694,7 +1694,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLeq":
+                                                                                        {"MkOpDotLeq":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/stdout.expected b/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/stdout.expected
index 526d20a40f..7b1720ba40 100644
--- a/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/eb5e229a3045349ef118229f11ede50b/stdout.expected
@@ -105,14 +105,14 @@ such that
              | q16 : int(1..9)]),
     3 = var4_1_ExplicitWithRepetition_Flag,
     and([q23 + 1 <= var5_ExplicitWithRepetitionR10_Flag ->
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23, ..] <lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23, ..] .<
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23 + 1, ..]
          \/
          and([var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23, q33] =
               var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Flags[q23 + 1, q33]
                   | q33 : bool])
          /\
-         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q23, ..] <=lex
+         var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q23, ..] .<=
          var5_ExplicitWithRepetitionR10_Values_Function1DPartial_Values[q23 + 1, ..]
              | q23 : int(1..255)]),
     and([q24 > var5_ExplicitWithRepetitionR10_Flag ->
diff --git a/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/model.expected.json
index 6e24c82c47..5048544557 100644
--- a/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/model.expected.json
@@ -311,7 +311,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/stdout.expected
index 3bb7e8e104..8cd3428686 100644
--- a/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ec9aed752e5eeb363b644516fc85dd8f/stdout.expected
@@ -28,7 +28,7 @@ such that
          /\
          flatten(var2_PartitionAsSetR2_ExplicitVarSizeWithMarkerR5R2_Values_ExplicitVarSizeWithMarkerR2_Values_Occurrence
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSetR2_ExplicitVarSizeWithMarkerR5R2_Values_ExplicitVarSizeWithMarkerR2_Values_Occurrence
                      [q4 + 1, .., ..])
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/model.expected.json
index 69ade048c6..6c78334bfd 100644
--- a/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/model.expected.json
@@ -87,7 +87,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -234,7 +234,7 @@
                                                                                                                                            []},
                                                                                                                                       3]}}}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/stdout.expected
index b13ae7df7c..582ad4c87d 100644
--- a/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ed0e6ab88e79cb8c6c179357811e4b33/stdout.expected
@@ -7,14 +7,14 @@ find var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Fu
         matrix indexed by [int(1..256), bool] of bool
 such that
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q1 + 1, ..]
          \/
          and([var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q1, q11] =
               var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1[q1 + 1, q11]
                   | q11 : int(4, 3)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Function1D[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Function1D[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2_Function1D[q1 + 1, ..]
              | q1 : int(1..255)]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/model.expected.json
index b262d56aca..2fd3115022 100644
--- a/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/model.expected.json
@@ -224,7 +224,7 @@
                                                              "var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/stdout.expected
index 5649e48049..b93555a35d 100644
--- a/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ed529213e4789b79a6929c96d89b6eb2/stdout.expected
@@ -21,7 +21,7 @@ such that
          sum([var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q17, q18] | q18 : int(2..4, 1)]) >= 1
              | q17 : int(1..16)]),
     and([q7 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q7, ..] <lex
+         var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q7, ..] .<
          var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q7 + 1, ..]
              | q7 : int(1..15)]),
     and([q8 > var3_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/model.expected.json
index c9b800ba45..29f07ed70e 100644
--- a/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/model.expected.json
@@ -420,7 +420,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -593,7 +593,7 @@
                                                                                                                                             []},
                                                                                                                                        5]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/stdout.expected
index dfa095ed69..ef6f91da9b 100644
--- a/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ed6e2ac3457110fd811f7f6066338883/stdout.expected
@@ -31,7 +31,7 @@ such that
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q4 + 1, .., ..])
          \/
@@ -42,7 +42,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q4 + 1, .., ..])
              | q4 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/model.expected.json
index 52777c742d..813196d9e3 100644
--- a/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/model.expected.json
@@ -124,7 +124,7 @@
                                                                              {"ConstantInt":
                                                                                   [{"TagInt": []}, 1]}}]]}}}}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -910,7 +910,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1036,7 +1036,7 @@
                                                                                                                          []},
                                                                                                                     1]}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/stdout.expected
index 6ec3a9c2f7..df2aa28d24 100644
--- a/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/edeee104245da0f75d4b86e7146e073f/stdout.expected
@@ -10,7 +10,7 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSi
 such that
     false,
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         var1_ExplicitVarSizeWithFlags_Values_Function1D[q1, ..] <lex
+         var1_ExplicitVarSizeWithFlags_Values_Function1D[q1, ..] .<
          var1_ExplicitVarSizeWithFlags_Values_Function1D[q1 + 1, ..]
              | q1 : int(1..63)]),
     and([var1_ExplicitVarSizeWithFlags_Flags[q2] = false ->
@@ -54,7 +54,7 @@ such that
                         | q21 : int(1..5)]),
                q9_ExplicitVarSizeWithMarker_Marker <= 5]),
     and([q12 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12, ..] <lex
+         var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12, ..] .<
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12 + 1, ..]
          \/
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Marker[q12, 1] =
@@ -62,7 +62,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q12, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithMarker_Values
                      [q12 + 1, .., ..])
              | q12 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/model.expected.json
index 304cd47d6d..ce1270f6f7 100644
--- a/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/model.expected.json
@@ -576,7 +576,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -749,7 +749,7 @@
                                                                                                                                             []},
                                                                                                                                        5]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/stdout.expected
index 954a72d3df..435e79d406 100644
--- a/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ee0f4f29b6fcae0b8a1a80540fff7469/stdout.expected
@@ -38,7 +38,7 @@ such that
     and([q4 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Flags
                      [q4 + 1, .., ..])
          \/
@@ -49,7 +49,7 @@ such that
          /\
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_ExplicitVarSizeWithFlags_Values
                      [q4 + 1, .., ..])
              | q4 : int(1..3)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/model.expected.json b/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/model.expected.json
index ca2734ef32..b814cda016 100644
--- a/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/model.expected.json
@@ -132,7 +132,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -281,7 +281,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -721,7 +721,7 @@
                                                                                                                                                                   []},
                                                                                                                                                              2]}}]}]]}]}}]]}}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/stdout.expected b/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/stdout.expected
index 73127b6b24..7e08691a31 100644
--- a/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/eebf57c0e408c9d7b113317d714541bf/stdout.expected
@@ -11,7 +11,7 @@ such that
     false,
     and([q1 + 1 <= var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags[q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Flags
              [q1 + 1, ..]
          \/
@@ -24,7 +24,7 @@ such that
          /\
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1, ..]
-         <lex
+         .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_ExplicitVarSizeWithFlags_Values
              [q1 + 1, ..]
          \/
@@ -56,7 +56,7 @@ such that
                       | q33 : int(1..2)])
                   | q31 : int(1..2)])
          /\
-         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] <lex
+         var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1, ..] .<
          var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q1 + 1, ..]
              | q1 : int(1..4)]),
     and([q2 > var1_FunctionAsRelation_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/model.expected.json b/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/model.expected.json
index d185d120ea..cd6ee9b3a8 100644
--- a/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/model.expected.json
@@ -271,7 +271,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -652,7 +652,7 @@
                                                                                                                                                                                            []},
                                                                                                                                                                                       1]}}]]}}}}]}}]}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpSlicing":
                                                                                                                                                     [{"Op":
@@ -1342,7 +1342,7 @@
                                        {"Op":
                                             {"MkOpImply":
                                                  [{"Op":
-                                                       {"MkOpLexLt":
+                                                       {"MkOpDotLt":
                                                             [{"Op":
                                                                   {"MkOpSlicing":
                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/stdout.expected b/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/stdout.expected
index 3526d1286f..180d32c374 100644
--- a/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/eee79bab97319cb6a1cfb2a945bcc1a6/stdout.expected
@@ -27,7 +27,7 @@ find var3_RelationAsSetR15_ExplicitVarSizeWithMarkerR15_Values_1_RelationAsMatri
 such that
     false,
     and([q6 + 1 <= var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Marker ->
-         var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6, ..] <lex
+         var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6, ..] .<
          var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6 + 1, ..]
          \/
          and([var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q6, q17]
@@ -56,7 +56,7 @@ such that
           /\
           var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6, ..]
-          <lex
+          .<
           var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_2_ExplicitVarSizeWithMarker_Values
               [q6 + 1, ..])
              | q6 : int(1..3)]),
@@ -122,7 +122,7 @@ such that
     and([q25 <= var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Marker /\
          q26 <= var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Marker
          ->
-         (var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q25, ..] <lex
+         (var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q25, ..] .<
           var1_FunctionAsRelationR2R5_RelationAsSetR2R5_ExplicitVarSizeWithMarkerR2R5_Values_1_Occurrence[q26, ..]
           ->
           or([q28 <=
diff --git a/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/model.expected.json
index d7d4371979..ce46917679 100644
--- a/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/model.expected.json
@@ -76,7 +76,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -210,7 +210,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/stdout.expected
index 386e83cec2..0ba10f9849 100644
--- a/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ef336eba26eb0a9a90de40b18d840b84/stdout.expected
@@ -5,14 +5,14 @@ find var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags: matrix indexe
 find var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values: matrix indexed by [int(1..3), bool] of bool
 such that
     and([var3_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, ..] <lex
+         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, ..] .<
          var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1 + 1, ..]
          \/
          and([var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, q11] =
               var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1 + 1, q11]
                   | q11 : bool])
          /\
-         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1, ..] <lex
+         var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1, ..] .<
          var3_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1 + 1, ..]
              | q1 : int(1..2)]),
     and([var3_ExplicitVarSizeWithFlags_Flags[q2] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/model.expected.json
index c2d467ae11..a2e21ca53b 100644
--- a/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/model.expected.json
@@ -144,7 +144,7 @@
                                         {"TypeSet": {"TypeInt": {"TagInt": []}}},
                                         {"TypeMatrix": [{"TypeInt": {"TagInt": []}}, {"TypeBool": []}]}]}}]}]}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Constant":
                             {"ConstantAbstract":
                                  {"AbsLitMatrix":
@@ -319,7 +319,7 @@
                                                     {"ConstantInt": [{"TagInt": []}, 1]},
                                                     {"ConstantInt": [{"TagInt": []}, 3]}]]}}}]]}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Comprehension":
                             [{"Reference": [{"Name": "l_2"}, null]},
                              [{"Generator":
diff --git a/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/stdout.expected
index d187cc6af3..cf6803770f 100644
--- a/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ef47512eb208c3dc333c0f019cdd3b41/stdout.expected
@@ -13,7 +13,7 @@ such that
     true,
     ([false; int(0)], (false, 1), {5, 3}, [true, false; int(0..1)]) in
     (mset() : `mset of (matrix indexed by [int] of bool, (bool, int), set of int, matrix indexed by [int] of bool)`),
-    [true; int(2)] <lex
+    [true; int(2)] .<
     flatten([([] : `matrix indexed by [int] of bool`), [false, true, false; int(2..4)],
              [false, true, true, true, true; int(4..5, 9..11)], ([] : `matrix indexed by [int] of bool`),
              [true; int(0)];
@@ -24,5 +24,5 @@ such that
                          --> partition({1 % 3, 0 % 1, 3}, {1, 0}, {0, 3}, {2 - 3}, {factorial(1), 5 - 0}),
                      image(function(true --> true, false --> true, true --> true), true)
                          --> partition({3, 5, 0, 5}, {3}, {5, 0, 1, 3}, {2, 1, 3}))),
-    [l_2 | l_1 : int(5, 0), l_2 : int(5, 1..5), false, true] <=lex
+    [l_2 | l_1 : int(5, 0), l_2 : int(5, 1..5), false, true] .<=
     image((function() : `function mset of bool --> matrix indexed by [int] of int`), mset(false))
diff --git a/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/model.expected.json
index 7a869bf691..0c35c6d467 100644
--- a/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpImage":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/stdout.expected
index 15728085d8..1b141cdf4c 100644
--- a/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f0da1b32d64901550697edd2a56acbb1/stdout.expected
@@ -1,4 +1,4 @@
 language Essence 1.3
 
 find unused: bool
-such that image(function(mset(4) --> [2; int(1)]), mset(3)) <=lex [l_3 | l_3 : int(5, 4)]
+such that image(function(mset(4) --> [2; int(1)]), mset(3)) .<= [l_3 | l_3 : int(5, 4)]
diff --git a/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/model.expected.json
index 489aa8d5dd..1171cd7eb9 100644
--- a/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/model.expected.json
@@ -356,7 +356,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -409,7 +409,7 @@
                                                                                                                                null,
                                                                                                                                null]}}]}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/stdout.expected
index 72c83a9605..32d6042046 100644
--- a/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f0fc2fcf48b2784adbc82bebe8debe1d/stdout.expected
@@ -30,13 +30,13 @@ such that
          /\
          (var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q4, ..]
-          <lex
+          .<
           var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker
               [q4 + 1, ..]
           \/
           flatten(var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q4, .., ..])
-          <lex
+          .<
           flatten(var2_PartitionAsSetR5_ExplicitVarSizeWithMarkerR5R5_Values_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values
                       [q4 + 1, .., ..]))
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/model.expected.json
index 5aaa1ecb7b..89e63fb839 100644
--- a/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/model.expected.json
@@ -50,7 +50,7 @@
                                       [[{"ConstantBool": true}, {"ConstantBool": false}, {"ConstantBool": true},
                                         {"ConstantBool": true}, {"ConstantBool": false}]]}}}]}},
             {"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"AbstractLiteral":
                             {"AbsLitMatrix":
                                  [{"DomainInt":
diff --git a/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/stdout.expected
index 5d05439f24..2b41219255 100644
--- a/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f11a6d1a6b6ea819dc5ab8227c9c909d/stdout.expected
@@ -8,6 +8,6 @@ find var5: set of set (minSize 5, maxSize 5) of bool
 such that
     true,
     together({true}, partition({true, false, true, true, false})),
-    [var3; int(0)] <lex [var3, var4, var4, false; int(5..8)],
+    [var3; int(0)] .< [var3, var4, var4, false; int(5..8)],
     apart({true}, partition({false, false, false, true}, {true, true, true})),
     var4
diff --git a/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/model.expected.json
index d925a0d470..1e2b4e0daa 100644
--- a/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/model.expected.json
@@ -35,7 +35,7 @@
                                       [{"ConstantInt": [{"TagInt": []}, 5]}, {"ConstantInt": [{"TagInt": []}, 2]},
                                        {"ConstantInt": [{"TagInt": []}, 4]}]}}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Typed":
                             [{"Constant":
                                   {"ConstantAbstract":
diff --git a/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/stdout.expected
index bf8054b856..21a59fb145 100644
--- a/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f17b4b0018354dbb3657f42a48ff8c38/stdout.expected
@@ -4,7 +4,7 @@ find var1: int(1..4, 0)
 find var2: int(5, 4)
 such that
     {var1, var2} supset {5, 2, 4},
-    ([] : `matrix indexed by [int] of int`) <=lex [3, 1; int(1..2)],
+    ([] : `matrix indexed by [int] of int`) .<= [3, 1; int(1..2)],
     and([true, false, true, true, false; int(9..10, 2..4)]),
     (4, 1) = (3, 5),
     image(function(var1 --> false, var2 --> true, var2 --> false, var1 --> true, var2 --> true), var1),
diff --git a/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/model.expected.json
index bb0dc52a3f..a8e4acfecc 100644
--- a/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/model.expected.json
@@ -128,7 +128,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}}]}},
                                                                    {"Op":
-                                                                        {"MkOpLexLt":
+                                                                        {"MkOpDotLt":
                                                                              [{"Op":
                                                                                    {"MkOpFlatten":
                                                                                         [null,
@@ -320,7 +320,7 @@
                                                                                              [{"Name": "q3"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/stdout.expected
index e46782d9ae..ee17ed3ef0 100644
--- a/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f1fd537fecc6c852b01a571e701d7e59/stdout.expected
@@ -14,7 +14,7 @@ such that
     var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[2]
     /\
     flatten(var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[1, .., ..])
-    <lex
+    .<
     flatten(var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[2, .., ..]),
     and([q2 > var6_ExplicitVarSizeWithMarker_Marker ->
          var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q2] = 0
@@ -27,7 +27,7 @@ such that
     and([q3 <= var6_ExplicitVarSizeWithMarker_Marker ->
          and([q7 + 1 <= var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q3] ->
               var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[q3, q7, ..]
-              <lex
+              .<
               var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit
                   [q3, q7 + 1, ..]
                   | q7 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/model.expected.json
index 27b1e7cffc..f3be40b774 100644
--- a/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpImage":
                                  [{"Constant":
diff --git a/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/stdout.expected
index 61af23a11c..0027fa4dd4 100644
--- a/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f243bccb3b210797782c1c047cbf7643/stdout.expected
@@ -2,5 +2,5 @@ language Essence 1.3
 
 find unused: bool
 such that
-    image(function([1, 0; int(3, 0)] --> [false, true, false, false, false; int(3, 15, 0, 4, 2)]), [5; int(1)]) <=lex
+    image(function([1, 0; int(3, 0)] --> [false, true, false, false, false; int(3, 15, 0, 4, 2)]), [5; int(1)]) .<=
     [false | l_1 : bool]
diff --git a/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/model.expected.json
index 98730901f6..6dfb2f2b9d 100644
--- a/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/model.expected.json
@@ -1738,7 +1738,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1937,7 +1937,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2265,7 +2265,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2440,7 +2440,7 @@
                                                                                                                                                                       []},
                                                                                                                                                                  2]}}}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
@@ -2911,7 +2911,7 @@
                                   {"Reference":
                                        [{"Name": "var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                        {"Op":
-                            {"MkOpLexLt":
+                            {"MkOpDotLt":
                                  [{"Op":
                                        {"MkOpSlicing":
                                             [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/stdout.expected
index 653f345f0b..7c47b4270e 100644
--- a/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f2f725a26126338e19e3f08ef990f1da/stdout.expected
@@ -107,7 +107,7 @@ such that
          /\
          (flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q8, .., ..])
-          <lex
+          .<
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q8 + 1, .., ..])
           \/
@@ -121,7 +121,7 @@ such that
           /\
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q8, .., ..])
-          <lex
+          .<
           flatten(var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q8 + 1, .., ..]))
              | q8 : int(1..65535)]),
@@ -142,7 +142,7 @@ such that
          and([q11 + 1 <= var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q10] ->
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q10, q11, ..]
-              <lex
+              .<
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q10, q11 + 1, ..]
               \/
@@ -155,7 +155,7 @@ such that
               /\
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q10, q11, ..]
-              <lex
+              .<
               var4_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q10, q11 + 1, ..]
                   | q11 : int(1..15)])
@@ -193,7 +193,7 @@ such that
          var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q31, 2] >= 1
              | q31 : int(1..2)]),
     2 <= var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-    var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, ..] <lex
+    var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[1, ..] .<
     var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[2, ..],
     and([q22 > var6_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          var6_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Occurrence[q22, 2] = false
diff --git a/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/model.expected.json
index f954afaaa1..a702c49ee3 100644
--- a/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/model.expected.json
@@ -109,7 +109,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -282,7 +282,7 @@
                                                                                                                                             []},
                                                                                                                                        7]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -611,7 +611,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}]]},
                                                                             [{"Op":
-                                                                                  {"MkOpLexLt":
+                                                                                  {"MkOpDotLt":
                                                                                        [{"Op":
                                                                                              {"MkOpSlicing":
                                                                                                   [{"Op":
@@ -762,7 +762,7 @@
                                                                                                                                          []},
                                                                                                                                     1]}}]}}]}},
                                                                                                    {"Op":
-                                                                                                        {"MkOpLexLt":
+                                                                                                        {"MkOpDotLt":
                                                                                                              [{"Op":
                                                                                                                    {"MkOpFlatten":
                                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/stdout.expected
index 9a7f6637e9..aa3cecaee7 100644
--- a/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f3b4b055e266a994218c9c7c4772d7db/stdout.expected
@@ -7,8 +7,7 @@ find var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet
         matrix indexed by [int(1..5), int(1..7), int(1), int(1..3)] of bool
 such that
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, .., ..])
-         <lex
+         flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, .., ..]) .<
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1 + 1, .., ..])
          \/
          and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, q12, 1] =
@@ -17,7 +16,7 @@ such that
          /\
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                      [q1, .., .., ..])
-         <lex
+         .<
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                      [q1 + 1, .., .., ..])
              | q1 : int(1..4)]),
@@ -34,7 +33,7 @@ such that
     5 <= sum([var1_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..5)]),
     sum([var1_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..5)]) <= 5,
     and([var1_ExplicitVarSizeWithFlags_Flags[q5] ->
-         and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, ..] <lex
+         and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, ..] .<
               var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6 + 1, ..]
               \/
               var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, 1] =
@@ -42,7 +41,7 @@ such that
               /\
               flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                           [q5, q6, .., ..])
-              <lex
+              .<
               flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                           [q5, q6 + 1, .., ..])
                   | q6 : int(1..6)])
diff --git a/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/model.expected.json
index c35f9d8661..7a277ba144 100644
--- a/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/model.expected.json
@@ -720,7 +720,7 @@
                                                                                                                                                                      []},
                                                                                                                                                                 1]}}]]}}}}]}}]}}]]}}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -992,7 +992,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}}]}},
                                                                    {"Op":
-                                                                        {"MkOpLexLt":
+                                                                        {"MkOpDotLt":
                                                                              [{"Op":
                                                                                    {"MkOpFlatten":
                                                                                         [null,
@@ -1185,7 +1185,7 @@
                                                                                              [{"Name": "q9"},
                                                                                               null]}]}}]}},
                                                                   {"Op":
-                                                                       {"MkOpLexLt":
+                                                                       {"MkOpDotLt":
                                                                             [{"Op":
                                                                                   {"MkOpSlicing":
                                                                                        [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/stdout.expected
index 50a63c2485..c059219a3b 100644
--- a/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f41a286594c108909b183b37074c3e76/stdout.expected
@@ -42,7 +42,7 @@ such that
               var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_1_3[q3 + 1];
                   int(1..3)])
          /\
-         var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q3, ..] <lex
+         var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q3, ..] .<
          var5_RelationAsSet_ExplicitVarSizeWithMarker_Values_2[q3 + 1, ..]
              | q3 : int(1..63)]),
     and([q4 > var5_RelationAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -61,7 +61,7 @@ such that
     var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[2]
     /\
     flatten(var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[1, .., ..])
-    <lex
+    .<
     flatten(var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit[2, .., ..]),
     and([q8 > var6_ExplicitVarSizeWithMarker_Marker ->
          var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q8] = 0
@@ -75,7 +75,7 @@ such that
          and([q13 + 1 <= var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Marker[q9] ->
               var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit
                   [q9, q13, ..]
-              <lex
+              .<
               var6_ExplicitVarSizeWithMarker_Values_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit
                   [q9, q13 + 1, ..]
                   | q13 : int(1..3)])
diff --git a/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/model.expected.json
index f9fdf33b36..2650942d19 100644
--- a/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/model.expected.json
@@ -1753,7 +1753,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -1939,7 +1939,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2240,7 +2240,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2402,7 +2402,7 @@
                                                                                                                                           {"DomainBool":
                                                                                                                                                []}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/stdout.expected
index 99b0b241db..606884a19a 100644
--- a/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f42851729ee7b455bb9015d9c3e76513/stdout.expected
@@ -114,7 +114,7 @@ such that
          /\
          (flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -128,7 +128,7 @@ such that
           /\
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -149,7 +149,7 @@ such that
          and([q2 + 1 <= var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -162,7 +162,7 @@ such that
               /\
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/model.expected.json
index 1e51c24587..d5e634a6ed 100644
--- a/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/model.expected.json
@@ -38,7 +38,7 @@
       {"SuchThat":
            [{"Constant": {"ConstantBool": false}}, {"Constant": {"ConstantBool": true}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Comprehension":
                             [{"Op":
                                   {"MkOpMinus":
diff --git a/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/stdout.expected
index 1c2fc175fb..d1a757d74b 100644
--- a/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f5650f709d784157b7cac1ee24385d89/stdout.expected
@@ -5,6 +5,6 @@ find var2: partition (minNumParts 0, maxNumParts 3, minPartSize 2 - 4) from set
 such that
     false,
     true,
-    [l_1 - l_1 | l_1 : int(4, 0), true, false] <=lex
+    [l_1 - l_1 | l_1 : int(4, 0), true, false] .<=
     [l_3 | l_2 : int(2, 4), l_3 : int(3, 3), true >= false, true > false],
     false
diff --git a/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/model.expected.json
index 1d258bdbb8..2e217e27b2 100644
--- a/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/model.expected.json
@@ -311,7 +311,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/stdout.expected
index 5967080945..a12a3e34b3 100644
--- a/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f57b3d11bf42b1452c009a9c008864fd/stdout.expected
@@ -28,7 +28,7 @@ such that
          /\
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4, .., ..])
-         <lex
+         .<
          flatten(var2_PartitionAsSetR6_ExplicitVarSizeWithMarkerR5R6_Values_ExplicitVarSizeWithMarkerR6_Values_ExplicitVarSizeWithDummy
                      [q4 + 1, .., ..])
              | q4 : int(1..15)]),
diff --git a/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/model.expected.json
index e17ba744e2..25ccd28352 100644
--- a/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/model.expected.json
@@ -1028,7 +1028,7 @@
                                                              "var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -1454,7 +1454,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1588,7 +1588,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/stdout.expected
index 40bf951584..a1387c76f8 100644
--- a/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f5e0dd3dd1ecaf45dc4127467fcbd4dd/stdout.expected
@@ -82,7 +82,7 @@ such that
          >= 1
              | q34 : int(1..4)]),
     and([q7 + 1 <= var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
-         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] <lex
+         var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7, ..] .<
          var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Values_Occurrence[q7 + 1, ..]
              | q7 : int(1..3)]),
     and([q8 > var2_1_PartitionAsSet_ExplicitVarSizeWithMarkerR2_Marker ->
@@ -100,14 +100,14 @@ such that
     and([var4_1_ExplicitWithFlags_Flags[q15] = 0 \/ var4_1_ExplicitWithFlags_Flags[q15] >= 0 | q15 : int(1..3)]),
     3 = sum([var4_1_ExplicitWithFlags_Flags[q16] | q16 : int(1..3)]),
     and([var5_ExplicitWithFlagsR10_Flags[q18 + 1] > 0 ->
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18 + 1, ..]
          \/
          and([var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18, q29] =
               var5_ExplicitWithFlagsR10_Values_Function1DPartial_Flags[q18 + 1, q29]
                   | q29 : bool])
          /\
-         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q18, ..] <lex
+         var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q18, ..] .<
          var5_ExplicitWithFlagsR10_Values_Function1DPartial_Values[q18 + 1, ..]
              | q18 : int(1..63)]),
     and([var5_ExplicitWithFlagsR10_Flags[q19] = 0 ->
diff --git a/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/model.expected.json
index 2e59f83190..84558de08c 100644
--- a/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/model.expected.json
@@ -94,7 +94,7 @@
                                                   {"Reference":
                                                        [{"Name": "var1_ExplicitVarSizeWithMarker_Marker"}, null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpSlicing":
                                                             [{"Op":
@@ -725,7 +725,7 @@
                                                              "var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker"},
                                                         null]}]}},
                                        {"Op":
-                                            {"MkOpLexLt":
+                                            {"MkOpDotLt":
                                                  [{"Op":
                                                        {"MkOpFlatten":
                                                             [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/stdout.expected
index 70e3e3eee5..9da2d2454d 100644
--- a/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f6f3227d62d29091577943cbcc8b7b7f/stdout.expected
@@ -8,7 +8,7 @@ find var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence:
 such that
     false,
     and([q1 + 1 <= var1_ExplicitVarSizeWithMarker_Marker ->
-         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] <lex
+         var1_ExplicitVarSizeWithMarker_Values_Function1D[q1, ..] .<
          var1_ExplicitVarSizeWithMarker_Values_Function1D[q1 + 1, ..]
              | q1 : int(1..63)]),
     and([q2 > var1_ExplicitVarSizeWithMarker_Marker ->
@@ -41,7 +41,7 @@ such that
                         | q17 : int(1..5)]),
                q7_ExplicitVarSizeWithMarker_Marker <= 5]),
     and([q10 + 1 <= var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
-         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q10, .., ..]) <lex
+         flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q10, .., ..]) .<
          flatten(var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_Explicit_Occurrence[q10 + 1, .., ..])
              | q10 : int(1..3)]),
     and([q11 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
diff --git a/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/model.expected.json
index 37bef21343..e61019485e 100644
--- a/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/model.expected.json
@@ -2134,7 +2134,7 @@
                                                                                                                                      []},
                                                                                                                                 2]}}]}]]},
                                                                                                         [{"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpFlatten":
                                                                                                                               [null,
@@ -2336,7 +2336,7 @@
                                                                                                                                                                                         []},
                                                                                                                                                                                    16]}}]}]]}]}}]]}}},
                                                                                                                                {"Op":
-                                                                                                                                    {"MkOpLexLt":
+                                                                                                                                    {"MkOpDotLt":
                                                                                                                                          [{"Op":
                                                                                                                                                {"MkOpFlatten":
                                                                                                                                                     [null,
@@ -2671,7 +2671,7 @@
                                                                                                                     []},
                                                                                                                2]}}]}]]},
                                                                                        [{"Op":
-                                                                                             {"MkOpLexLt":
+                                                                                             {"MkOpDotLt":
                                                                                                   [{"Op":
                                                                                                         {"MkOpSlicing":
                                                                                                              [{"Op":
@@ -2849,7 +2849,7 @@
                                                                                                                                                                                  []},
                                                                                                                                                                             1]}}}}]}]]}]}}]]}}},
                                                                                                               {"Op":
-                                                                                                                   {"MkOpLexLt":
+                                                                                                                   {"MkOpDotLt":
                                                                                                                         [{"Op":
                                                                                                                               {"MkOpSlicing":
                                                                                                                                    [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/stdout.expected
index 7decabd21e..473e22141b 100644
--- a/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f7faf3149f0cc222402ea4da0e2865f1/stdout.expected
@@ -114,7 +114,7 @@ such that
          /\
          (flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                       [q1 + 1, .., ..])
           \/
@@ -128,7 +128,7 @@ such that
           /\
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1, .., ..])
-          <lex
+          .<
           flatten(var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                       [q1 + 1, .., ..]))
              | q1 : int(1..65535)]),
@@ -148,7 +148,7 @@ such that
          and([q2 + 1 <= var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] ->
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Flags
                   [q1, q2 + 1, ..]
               \/
@@ -161,7 +161,7 @@ such that
               /\
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2, ..]
-              <lex
+              .<
               var3_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_Function1DPartial_Values
                   [q1, q2 + 1, ..]
                   | q2 : int(1..15)])
diff --git a/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/model.expected.json
index f2ed0fc054..f62f500af5 100644
--- a/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/model.expected.json
@@ -284,7 +284,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}}]}},
                                                                    {"Op":
-                                                                        {"MkOpLexLt":
+                                                                        {"MkOpDotLt":
                                                                              [{"Op":
                                                                                    {"MkOpSlicing":
                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/stdout.expected
index ee9919b541..7939bdd9be 100644
--- a/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f82a4527f67eca4c2d17cab8c2c8925c/stdout.expected
@@ -25,7 +25,7 @@ such that
     var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[1] =
     var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[2]
     /\
-    var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_1[1, ..] <lex
+    var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_1[1, ..] .<
     var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values_1[2, ..],
     and([q1 > var2_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
          var2_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q1] = 0 /\
diff --git a/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/model.expected.json b/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/model.expected.json
index fd704a86d6..04c37f41a0 100644
--- a/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/model.expected.json
@@ -18,7 +18,7 @@
            [{"Constant": {"ConstantBool": false}}, {"Constant": {"ConstantBool": false}},
             {"Constant": {"ConstantBool": false}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Op":
                             {"MkOpImage":
                                  [{"AbstractLiteral":
diff --git a/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/stdout.expected b/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/stdout.expected
index 94e07b851d..f32a68864a 100644
--- a/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/f8551d2ded7dfbb7f4fc2fefcfe32146/stdout.expected
@@ -8,6 +8,6 @@ such that
     image(function((false, 1) --> [2, 0, 2, 4, 3; int(13..14, 12, 1, 9)], (true, 4) --> [0, 2, 4, 3; int(11, 6, 8, 2)],
                    (true, 5) --> ([] : `matrix indexed by [int] of int`)),
           (false <-> false, factorial(1)))
-    <=lex [4, 0, 4, 4; int(7, 2..3, 8)],
+    .<= [4, 0, 4, 4; int(7, 2..3, 8)],
     false
 maximising var1
diff --git a/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/model.expected.json b/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/model.expected.json
index 1883d4bd97..fd16e522a1 100644
--- a/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/model.expected.json
@@ -8,7 +8,7 @@
      [{"Declaration": {"FindOrGiven": ["Find", {"Name": "unused"}, {"DomainBool": []}]}},
       {"SuchThat":
            [{"Op":
-                 {"MkOpLexLt":
+                 {"MkOpDotLt":
                       [{"Op":
                             {"MkOpSlicing":
                                  [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/stdout.expected b/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/stdout.expected
index 0ddb296e3c..005570405e 100644
--- a/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/fbfe220f5450d8f205a3e3e9ec02f054/stdout.expected
@@ -1,4 +1,4 @@
 language ESSENCE' 1.0
 
 find unused: bool
-such that [[true; int(1)]; int(1)][2, ..] <lex [false, false, false, false; int(1..4)]
+such that [[true; int(1)]; int(1)][2, ..] .< [false, false, false, false; int(1..4)]
diff --git a/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/model.expected.json b/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/model.expected.json
index 331c089762..5d690fb5e3 100644
--- a/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/model.expected.json
@@ -184,7 +184,7 @@
                                                                                                                []},
                                                                                                           2]}}]}]]},
                                                                                   [{"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -321,7 +321,7 @@
                                                                                                                                      {"DomainBool":
                                                                                                                                           []}]}}]]}}},
                                                                                                          {"Op":
-                                                                                                              {"MkOpLexLt":
+                                                                                                              {"MkOpDotLt":
                                                                                                                    [{"Op":
                                                                                                                          {"MkOpSlicing":
                                                                                                                               [{"Op":
@@ -936,7 +936,7 @@
                                                                                                                                                []},
                                                                                                                                           1]}}]]}}}}]}}]}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
@@ -1315,7 +1315,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpSlicing":
                                                                                   [{"Op":
@@ -1449,7 +1449,7 @@
                                                                                                                {"DomainBool":
                                                                                                                     []}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpSlicing":
                                                                                                         [{"Op":
diff --git a/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/stdout.expected b/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/stdout.expected
index 8127cfaa50..74bb654a84 100644
--- a/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/fe7777e1ad2badafc794d13da8eddcf4/stdout.expected
@@ -17,14 +17,14 @@ such that
                q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values : matrix indexed by [int(1..4), bool] of
                                                                                   int(5),
                and([q_4_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, ..] .<
                     q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1 + 1, ..]
                     \/
                     and([q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1, q9] =
                          q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q1 + 1, q9]
                              | q9 : bool])
                     /\
-                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1, ..] <lex
+                    q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1, ..] .<
                     q_4_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q1 + 1, ..]
                         | q1 : int(1..3)]),
                and([q_4_ExplicitVarSizeWithFlags_Flags[q1] = false ->
@@ -55,7 +55,7 @@ such that
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3] =
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Marker[q3 + 1]
          /\
-         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] <lex
+         var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3, ..] .<
          var1_PartitionAsSet_ExplicitVarSizeWithMarker_Values_ExplicitVarSizeWithMarker_Values[q3 + 1, ..]
              | q3 : int(1..7)]),
     and([q3 > var1_PartitionAsSet_ExplicitVarSizeWithMarker_Marker ->
@@ -75,14 +75,14 @@ such that
                   | q4 : int(1..3)])
              | q3 : int(1..8)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q5 + 1] ->
-         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5, ..] <lex
+         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5, ..] .<
          var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5 + 1, ..]
          \/
          and([var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5, q10] =
               var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Flags[q5 + 1, q10]
                   | q10 : bool])
          /\
-         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q5, ..] <lex
+         var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q5, ..] .<
          var2_ExplicitVarSizeWithFlags_Values_Function1DPartial_Values[q5 + 1, ..]
              | q5 : int(1..3)]),
     and([var2_ExplicitVarSizeWithFlags_Flags[q5] = false ->
diff --git a/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/model.expected.json b/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/model.expected.json
index e275addb05..0d80fdf899 100644
--- a/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/model.expected.json
+++ b/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/model.expected.json
@@ -109,7 +109,7 @@
                                                                               {"ConstantInt":
                                                                                    [{"TagInt": []}, 2]}}]}]]},
                                                             [{"Op":
-                                                                  {"MkOpLexLt":
+                                                                  {"MkOpDotLt":
                                                                        [{"Op":
                                                                              {"MkOpFlatten":
                                                                                   [null,
@@ -282,7 +282,7 @@
                                                                                                                                             []},
                                                                                                                                        4]}}]}]]}]}}]]}}},
                                                                                    {"Op":
-                                                                                        {"MkOpLexLt":
+                                                                                        {"MkOpDotLt":
                                                                                              [{"Op":
                                                                                                    {"MkOpFlatten":
                                                                                                         [null,
@@ -611,7 +611,7 @@
                                                                                                    [{"TagInt": []},
                                                                                                     2]}}]}]]},
                                                                             [{"Op":
-                                                                                  {"MkOpLexLt":
+                                                                                  {"MkOpDotLt":
                                                                                        [{"Op":
                                                                                              {"MkOpSlicing":
                                                                                                   [{"Op":
@@ -762,7 +762,7 @@
                                                                                                                                          []},
                                                                                                                                     1]}}]}}]}},
                                                                                                    {"Op":
-                                                                                                        {"MkOpLexLt":
+                                                                                                        {"MkOpDotLt":
                                                                                                              [{"Op":
                                                                                                                    {"MkOpFlatten":
                                                                                                                         [null,
diff --git a/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/stdout.expected b/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/stdout.expected
index 838842c34b..9bef4d149d 100644
--- a/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/stdout.expected
+++ b/tests/parse_print/autogen-bilals-fixed/ff226931c79ca27e68e71f211b4aa84e/stdout.expected
@@ -7,8 +7,7 @@ find var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet
         matrix indexed by [int(1..5), int(1..4), int(1), int(1..3)] of bool
 such that
     and([var1_ExplicitVarSizeWithFlags_Flags[q1 + 1] ->
-         flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, .., ..])
-         <lex
+         flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, .., ..]) .<
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1 + 1, .., ..])
          \/
          and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q1, q12, 1] =
@@ -17,7 +16,7 @@ such that
          /\
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                      [q1, .., .., ..])
-         <lex
+         .<
          flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                      [q1 + 1, .., .., ..])
              | q1 : int(1..4)]),
@@ -34,7 +33,7 @@ such that
     5 <= sum([var1_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..5)]),
     sum([var1_ExplicitVarSizeWithFlags_Flags[q4] | q4 : int(1..5)]) <= 5,
     and([var1_ExplicitVarSizeWithFlags_Flags[q5] ->
-         and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, ..] <lex
+         and([var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, ..] .<
               var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6 + 1, ..]
               \/
               var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_1[q5, q6, 1] =
@@ -42,7 +41,7 @@ such that
               /\
               flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                           [q5, q6, .., ..])
-              <lex
+              .<
               flatten(var1_ExplicitVarSizeWithFlags_Values_RelationAsSet_Explicit_1_RelationAsSet_Explicit_2_Explicit
                           [q5, q6 + 1, .., ..])
                   | q6 : int(1..3)])
diff --git a/tests/parse_print/autogen/605~1436581770_45/model.expected.json b/tests/parse_print/autogen/605~1436581770_45/model.expected.json
index a8ebf915cc..6c2ceb216f 100644
--- a/tests/parse_print/autogen/605~1436581770_45/model.expected.json
+++ b/tests/parse_print/autogen/605~1436581770_45/model.expected.json
@@ -22,7 +22,7 @@
                                       [{"ConstantInt": [{"TagInt": []}, 1]},
                                        {"ConstantInt": [{"TagInt": []}, 2]}]}}}]}},
             {"Op":
-                 {"MkOpLexLeq":
+                 {"MkOpDotLeq":
                       [{"Typed":
                             [{"Constant":
                                   {"ConstantAbstract":
diff --git a/tests/parse_print/autogen/605~1436581770_45/stdout.expected b/tests/parse_print/autogen/605~1436581770_45/stdout.expected
index 0c3f994d19..f5153bf018 100644
--- a/tests/parse_print/autogen/605~1436581770_45/stdout.expected
+++ b/tests/parse_print/autogen/605~1436581770_45/stdout.expected
@@ -3,7 +3,7 @@ language Essence 1.3
 find var1: int(5, 0)
 such that
     factorial(var1) in {1, 2},
-    ([] : `matrix indexed by [int] of bool`) <=lex [true, true, true; int(4..6)],
+    ([] : `matrix indexed by [int] of bool`) .<= [true, true, true; int(4..6)],
     [var1; int(2)] = ([] : `matrix indexed by [int] of int`),
     var1 >= var1,
     true,