summaryrefslogtreecommitdiff
path: root/test/regress/regress0
diff options
context:
space:
mode:
authorMathias Preiner <mathias.preiner@gmail.com>2021-09-22 13:38:46 -0700
committerGitHub <noreply@github.com>2021-09-22 20:38:46 +0000
commite116c00719a7574064c09da4abb10b3297415c90 (patch)
treee71e489d7c591067eeab793a80d139e47718befe /test/regress/regress0
parentba259d66be877de3cc77e4f62083905ace942c82 (diff)
Remove CVC language support (#7219)
This commit removes the support for the CVC language and converts all *.cvc regression tests to SMT-LIBv2.
Diffstat (limited to 'test/regress/regress0')
-rw-r--r--test/regress/regress0/arith/arith.01.cvc5
-rw-r--r--test/regress/regress0/arith/arith.01.cvc.smt26
-rw-r--r--test/regress/regress0/arith/arith.02.cvc6
-rw-r--r--test/regress/regress0/arith/arith.02.cvc.smt27
-rw-r--r--test/regress/regress0/arith/arith.03.cvc5
-rw-r--r--test/regress/regress0/arith/arith.03.cvc.smt26
-rw-r--r--test/regress/regress0/arith/bug549.cvc3
-rw-r--r--test/regress/regress0/arith/bug549.cvc.smt26
-rw-r--r--test/regress/regress0/arith/integers/arith-int-014.cvc5
-rw-r--r--test/regress/regress0/arith/integers/arith-int-014.cvc.smt210
-rw-r--r--test/regress/regress0/arith/integers/arith-int-015.cvc5
-rw-r--r--test/regress/regress0/arith/integers/arith-int-015.cvc.smt210
-rw-r--r--test/regress/regress0/arith/integers/arith-int-021.cvc4
-rw-r--r--test/regress/regress0/arith/integers/arith-int-021.cvc.smt29
-rw-r--r--test/regress/regress0/arith/integers/arith-int-023.cvc4
-rw-r--r--test/regress/regress0/arith/integers/arith-int-023.cvc.smt29
-rw-r--r--test/regress/regress0/arith/integers/arith-int-025.cvc4
-rw-r--r--test/regress/regress0/arith/integers/arith-int-025.cvc.smt29
-rw-r--r--test/regress/regress0/arith/integers/arith-int-042.cvc9
-rw-r--r--test/regress/regress0/arith/integers/arith-int-042.cvc.smt214
-rw-r--r--test/regress/regress0/arith/integers/arith-int-042.min.cvc4
-rw-r--r--test/regress/regress0/arith/integers/arith-int-042.min.cvc.smt26
-rw-r--r--test/regress/regress0/arith/integers/arith-int-079.cvc11
-rw-r--r--test/regress/regress0/arith/integers/arith-int-079.cvc.smt216
-rw-r--r--test/regress/regress0/arith/integers/arith-interval.cvc7
-rw-r--r--test/regress/regress0/arith/integers/arith-interval.cvc.smt28
-rw-r--r--test/regress/regress0/arith/miplib.cvc28
-rw-r--r--test/regress/regress0/arith/miplib.cvc.smt223
-rw-r--r--test/regress/regress0/arith/miplib2.cvc32
-rw-r--r--test/regress/regress0/arith/miplib2.cvc.smt224
-rw-r--r--test/regress/regress0/arith/miplib4.cvc15
-rw-r--r--test/regress/regress0/arith/miplib4.cvc.smt213
-rw-r--r--test/regress/regress0/arrays/constarr.cvc7
-rw-r--r--test/regress/regress0/arrays/constarr.cvc.smt217
-rw-r--r--test/regress/regress0/arrays/constarr2.cvc7
-rw-r--r--test/regress/regress0/arrays/constarr2.cvc.smt211
-rw-r--r--test/regress/regress0/boolean-prec.cvc6
-rw-r--r--test/regress/regress0/boolean-prec.cvc.smt27
-rw-r--r--test/regress/regress0/boolean-terms.cvc15
-rw-r--r--test/regress/regress0/boolean-terms.cvc.smt29
-rw-r--r--test/regress/regress0/bug274.cvc64
-rw-r--r--test/regress/regress0/bug274.cvc.smt233
-rw-r--r--test/regress/regress0/bug310.cvc4
-rw-r--r--test/regress/regress0/bug310.cvc.smt26
-rw-r--r--test/regress/regress0/bug32.cvc6
-rw-r--r--test/regress/regress0/bug32.cvc.smt27
-rw-r--r--test/regress/regress0/bug322.cvc22
-rw-r--r--test/regress/regress0/bug322.cvc.smt213
-rw-r--r--test/regress/regress0/bug322b.cvc11
-rw-r--r--test/regress/regress0/bug322b.cvc.smt212
-rw-r--r--test/regress/regress0/bug486.cvc28
-rw-r--r--test/regress/regress0/bug486.cvc.smt224
-rw-r--r--test/regress/regress0/bug586.cvc26
-rw-r--r--test/regress/regress0/bug586.cvc.smt215
-rw-r--r--test/regress/regress0/bug595.cvc7
-rw-r--r--test/regress/regress0/bug595.cvc.smt28
-rw-r--r--test/regress/regress0/bug596.cvc7
-rw-r--r--test/regress/regress0/bug596.cvc.smt28
-rw-r--r--test/regress/regress0/bug596b.cvc7
-rw-r--r--test/regress/regress0/bug596b.cvc.smt27
-rw-r--r--test/regress/regress0/bug605.cvc30
-rw-r--r--test/regress/regress0/bug605.cvc.smt227
-rw-r--r--test/regress/regress0/bv/bvcomp.cvc5
-rw-r--r--test/regress/regress0/bv/bvcomp.cvc.smt25
-rw-r--r--test/regress/regress0/bv/bvsimple.cvc46
-rw-r--r--test/regress/regress0/bv/bvsimple.cvc.smt213
-rw-r--r--test/regress/regress0/bv/div_mod.cvc10
-rw-r--r--test/regress/regress0/bv/div_mod.cvc.smt25
-rw-r--r--test/regress/regress0/bv/sizecheck.cvc6
-rw-r--r--test/regress/regress0/bv/sizecheck.cvc.smt27
-rw-r--r--test/regress/regress0/cvc-rerror-print.cvc7
-rw-r--r--test/regress/regress0/cvc-rerror-print.cvc.smt28
-rw-r--r--test/regress/regress0/cvc3-bug15.cvc9
-rw-r--r--test/regress/regress0/cvc3-bug15.cvc.smt210
-rw-r--r--test/regress/regress0/cvc3.userdoc.01.cvc31
-rw-r--r--test/regress/regress0/cvc3.userdoc.01.cvc.smt222
-rw-r--r--test/regress/regress0/cvc3.userdoc.02.cvc7
-rw-r--r--test/regress/regress0/cvc3.userdoc.02.cvc.smt27
-rw-r--r--test/regress/regress0/cvc3.userdoc.03.cvc8
-rw-r--r--test/regress/regress0/cvc3.userdoc.03.cvc.smt26
-rw-r--r--test/regress/regress0/cvc3.userdoc.04.cvc9
-rw-r--r--test/regress/regress0/cvc3.userdoc.04.cvc.smt213
-rw-r--r--test/regress/regress0/cvc3.userdoc.05.cvc14
-rw-r--r--test/regress/regress0/cvc3.userdoc.05.cvc.smt28
-rw-r--r--test/regress/regress0/cvc3.userdoc.06.cvc13
-rw-r--r--test/regress/regress0/cvc3.userdoc.06.cvc.smt212
-rw-r--r--test/regress/regress0/datatypes/Test1-tup-mp.cvc10
-rw-r--r--test/regress/regress0/datatypes/Test1-tup-mp.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/boolean-equality.cvc7
-rw-r--r--test/regress/regress0/datatypes/boolean-equality.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-datatype.cvc11
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-datatype.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc12
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-record.cvc7
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-record.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-rewrite.cvc7
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-rewrite.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-tuple.cvc7
-rw-r--r--test/regress/regress0/datatypes/boolean-terms-tuple.cvc.smt26
-rw-r--r--test/regress/regress0/datatypes/bug286.cvc5
-rw-r--r--test/regress/regress0/datatypes/bug286.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/bug438.cvc5
-rw-r--r--test/regress/regress0/datatypes/bug438.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/bug438b.cvc6
-rw-r--r--test/regress/regress0/datatypes/bug438b.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/datatype-dump.cvc20
-rw-r--r--test/regress/regress0/datatypes/datatype-dump.cvc.smt214
-rw-r--r--test/regress/regress0/datatypes/datatype.cvc7
-rw-r--r--test/regress/regress0/datatypes/datatype.cvc.smt26
-rw-r--r--test/regress/regress0/datatypes/datatype0.cvc7
-rw-r--r--test/regress/regress0/datatypes/datatype0.cvc.smt26
-rw-r--r--test/regress/regress0/datatypes/datatype1.cvc11
-rw-r--r--test/regress/regress0/datatypes/datatype1.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/datatype13.cvc43
-rw-r--r--test/regress/regress0/datatypes/datatype13.cvc.smt29
-rw-r--r--test/regress/regress0/datatypes/datatype2.cvc16
-rw-r--r--test/regress/regress0/datatypes/datatype2.cvc.smt210
-rw-r--r--test/regress/regress0/datatypes/datatype3.cvc11
-rw-r--r--test/regress/regress0/datatypes/datatype3.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/datatype4.cvc9
-rw-r--r--test/regress/regress0/datatypes/datatype4.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/empty_tuprec.cvc21
-rw-r--r--test/regress/regress0/datatypes/empty_tuprec.cvc.smt222
-rw-r--r--test/regress/regress0/datatypes/issue2838.cvc15
-rw-r--r--test/regress/regress0/datatypes/issue2838.cvc.smt217
-rw-r--r--test/regress/regress0/datatypes/mutually-recursive.cvc14
-rw-r--r--test/regress/regress0/datatypes/mutually-recursive.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/pair-bool-bool.cvc10
-rw-r--r--test/regress/regress0/datatypes/pair-bool-bool.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/parametric-alt-list.cvc13
-rw-r--r--test/regress/regress0/datatypes/parametric-alt-list.cvc.smt29
-rw-r--r--test/regress/regress0/datatypes/rec1.cvc7
-rw-r--r--test/regress/regress0/datatypes/rec1.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/rec2.cvc11
-rw-r--r--test/regress/regress0/datatypes/rec2.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/rec4.cvc10
-rw-r--r--test/regress/regress0/datatypes/rec4.cvc.smt27
-rw-r--r--test/regress/regress0/datatypes/rewriter.cvc12
-rw-r--r--test/regress/regress0/datatypes/rewriter.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/some-boolean-tests.cvc11
-rw-r--r--test/regress/regress0/datatypes/some-boolean-tests.cvc.smt210
-rw-r--r--test/regress/regress0/datatypes/tree-get-value.cvc10
-rw-r--r--test/regress/regress0/datatypes/tree-get-value.cvc.smt210
-rw-r--r--test/regress/regress0/datatypes/tuple-model.cvc5
-rw-r--r--test/regress/regress0/datatypes/tuple-model.cvc.smt26
-rw-r--r--test/regress/regress0/datatypes/tuple-no-clash.cvc11
-rw-r--r--test/regress/regress0/datatypes/tuple-no-clash.cvc.smt29
-rw-r--r--test/regress/regress0/datatypes/tuple-record-bug.cvc20
-rw-r--r--test/regress/regress0/datatypes/tuple-record-bug.cvc.smt211
-rw-r--r--test/regress/regress0/datatypes/tuple.cvc10
-rw-r--r--test/regress/regress0/datatypes/tuple.cvc.smt210
-rw-r--r--test/regress/regress0/datatypes/typed_v10l30054.cvc43
-rw-r--r--test/regress/regress0/datatypes/typed_v10l30054.cvc.smt235
-rw-r--r--test/regress/regress0/datatypes/typed_v1l80005.cvc21
-rw-r--r--test/regress/regress0/datatypes/typed_v1l80005.cvc.smt28
-rw-r--r--test/regress/regress0/datatypes/typed_v2l30079.cvc19
-rw-r--r--test/regress/regress0/datatypes/typed_v2l30079.cvc.smt211
-rw-r--r--test/regress/regress0/datatypes/typed_v3l20092.cvc21
-rw-r--r--test/regress/regress0/datatypes/typed_v3l20092.cvc.smt214
-rw-r--r--test/regress/regress0/datatypes/typed_v5l30069.cvc28
-rw-r--r--test/regress/regress0/datatypes/typed_v5l30069.cvc.smt220
-rw-r--r--test/regress/regress0/datatypes/v10l40099.cvc44
-rw-r--r--test/regress/regress0/datatypes/v10l40099.cvc.smt235
-rw-r--r--test/regress/regress0/datatypes/v2l40025.cvc20
-rw-r--r--test/regress/regress0/datatypes/v2l40025.cvc.smt211
-rw-r--r--test/regress/regress0/datatypes/v3l60006.cvc26
-rw-r--r--test/regress/regress0/datatypes/v3l60006.cvc.smt215
-rw-r--r--test/regress/regress0/datatypes/v5l30058.cvc28
-rw-r--r--test/regress/regress0/datatypes/v5l30058.cvc.smt220
-rw-r--r--test/regress/regress0/datatypes/wrong-sel-simp.cvc7
-rw-r--r--test/regress/regress0/datatypes/wrong-sel-simp.cvc.smt26
-rw-r--r--test/regress/regress0/expect/scrub.06.cvc9
-rw-r--r--test/regress/regress0/expect/scrub.06.cvc.smt212
-rw-r--r--test/regress/regress0/fmf/bug-041417-set-options.cvc16
-rw-r--r--test/regress/regress0/fmf/bug-041417-set-options.cvc.smt211
-rw-r--r--test/regress/regress0/fmf/quant_real_univ.cvc15
-rw-r--r--test/regress/regress0/fmf/quant_real_univ.cvc.smt213
-rw-r--r--test/regress/regress0/ite.cvc3
-rw-r--r--test/regress/regress0/ite.cvc.smt213
-rw-r--r--test/regress/regress0/let.cvc7
-rw-r--r--test/regress/regress0/let.cvc.smt28
-rw-r--r--test/regress/regress0/logops.01.cvc3
-rw-r--r--test/regress/regress0/logops.01.cvc.smt27
-rw-r--r--test/regress/regress0/logops.02.cvc3
-rw-r--r--test/regress/regress0/logops.02.cvc.smt27
-rw-r--r--test/regress/regress0/logops.03.cvc3
-rw-r--r--test/regress/regress0/logops.03.cvc.smt27
-rw-r--r--test/regress/regress0/logops.04.cvc3
-rw-r--r--test/regress/regress0/logops.04.cvc.smt27
-rw-r--r--test/regress/regress0/logops.05.cvc4
-rw-r--r--test/regress/regress0/logops.05.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/and-not.cvc6
-rw-r--r--test/regress/regress0/precedence/and-not.cvc.smt26
-rw-r--r--test/regress/regress0/precedence/and-xor.cvc6
-rw-r--r--test/regress/regress0/precedence/and-xor.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/bool-cmp.cvc6
-rw-r--r--test/regress/regress0/precedence/bool-cmp.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/cmp-plus.cvc7
-rw-r--r--test/regress/regress0/precedence/cmp-plus.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/eq-fun.cvc8
-rw-r--r--test/regress/regress0/precedence/eq-fun.cvc.smt28
-rw-r--r--test/regress/regress0/precedence/iff-assoc.cvc6
-rw-r--r--test/regress/regress0/precedence/iff-assoc.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/iff-implies.cvc6
-rw-r--r--test/regress/regress0/precedence/iff-implies.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/implies-assoc.cvc6
-rw-r--r--test/regress/regress0/precedence/implies-assoc.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/implies-iff.cvc6
-rw-r--r--test/regress/regress0/precedence/implies-iff.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/implies-or.cvc6
-rw-r--r--test/regress/regress0/precedence/implies-or.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/not-and.cvc6
-rw-r--r--test/regress/regress0/precedence/not-and.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/not-eq.cvc6
-rw-r--r--test/regress/regress0/precedence/not-eq.cvc.smt26
-rw-r--r--test/regress/regress0/precedence/or-implies.cvc6
-rw-r--r--test/regress/regress0/precedence/or-implies.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/or-xor.cvc7
-rw-r--r--test/regress/regress0/precedence/or-xor.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/plus-mult.cvc7
-rw-r--r--test/regress/regress0/precedence/plus-mult.cvc.smt29
-rw-r--r--test/regress/regress0/precedence/xor-and.cvc6
-rw-r--r--test/regress/regress0/precedence/xor-and.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/xor-assoc.cvc6
-rw-r--r--test/regress/regress0/precedence/xor-assoc.cvc.smt27
-rw-r--r--test/regress/regress0/precedence/xor-or.cvc6
-rw-r--r--test/regress/regress0/precedence/xor-or.cvc.smt27
-rw-r--r--test/regress/regress0/preprocess/preprocess_00.cvc9
-rw-r--r--test/regress/regress0/preprocess/preprocess_00.cvc.smt215
-rw-r--r--test/regress/regress0/preprocess/preprocess_01.cvc11
-rw-r--r--test/regress/regress0/preprocess/preprocess_01.cvc.smt216
-rw-r--r--test/regress/regress0/preprocess/preprocess_02.cvc9
-rw-r--r--test/regress/regress0/preprocess/preprocess_02.cvc.smt215
-rw-r--r--test/regress/regress0/preprocess/preprocess_03.cvc10
-rw-r--r--test/regress/regress0/preprocess/preprocess_03.cvc.smt216
-rw-r--r--test/regress/regress0/preprocess/preprocess_04.cvc15
-rw-r--r--test/regress/regress0/preprocess/preprocess_04.cvc.smt216
-rw-r--r--test/regress/regress0/preprocess/preprocess_05.cvc15
-rw-r--r--test/regress/regress0/preprocess/preprocess_05.cvc.smt216
-rw-r--r--test/regress/regress0/preprocess/preprocess_06.cvc14
-rw-r--r--test/regress/regress0/preprocess/preprocess_06.cvc.smt216
-rw-r--r--test/regress/regress0/preprocess/preprocess_07.cvc10
-rw-r--r--test/regress/regress0/preprocess/preprocess_07.cvc.smt212
-rw-r--r--test/regress/regress0/preprocess/preprocess_08.cvc10
-rw-r--r--test/regress/regress0/preprocess/preprocess_08.cvc.smt212
-rw-r--r--test/regress/regress0/preprocess/preprocess_09.cvc14
-rw-r--r--test/regress/regress0/preprocess/preprocess_09.cvc.smt216
-rw-r--r--test/regress/regress0/preprocess/preprocess_10.cvc11
-rw-r--r--test/regress/regress0/preprocess/preprocess_10.cvc.smt28
-rw-r--r--test/regress/regress0/preprocess/preprocess_11.cvc10
-rw-r--r--test/regress/regress0/preprocess/preprocess_11.cvc.smt27
-rw-r--r--test/regress/regress0/preprocess/preprocess_12.cvc11
-rw-r--r--test/regress/regress0/preprocess/preprocess_12.cvc.smt28
-rw-r--r--test/regress/regress0/preprocess/preprocess_13.cvc9
-rw-r--r--test/regress/regress0/preprocess/preprocess_13.cvc.smt215
-rw-r--r--test/regress/regress0/preprocess/preprocess_14.cvc11
-rw-r--r--test/regress/regress0/preprocess/preprocess_14.cvc.smt216
-rw-r--r--test/regress/regress0/preprocess/preprocess_15.cvc11
-rw-r--r--test/regress/regress0/preprocess/preprocess_15.cvc.smt216
-rw-r--r--test/regress/regress0/print_lambda.cvc12
-rw-r--r--test/regress/regress0/print_lambda.cvc.smt211
-rw-r--r--test/regress/regress0/print_model.cvc12
-rw-r--r--test/regress/regress0/print_model.cvc.smt220
-rw-r--r--test/regress/regress0/printer/tuples_and_records.cvc18
-rw-r--r--test/regress/regress0/printer/tuples_and_records.cvc.smt215
-rw-r--r--test/regress/regress0/push-pop/bug233.cvc11
-rw-r--r--test/regress/regress0/push-pop/bug233.cvc.smt28
-rw-r--r--test/regress/regress0/push-pop/incremental-subst-bug.cvc21
-rw-r--r--test/regress/regress0/push-pop/incremental-subst-bug.cvc.smt223
-rw-r--r--test/regress/regress0/push-pop/test.00.cvc11
-rw-r--r--test/regress/regress0/push-pop/test.00.cvc.smt211
-rw-r--r--test/regress/regress0/push-pop/test.01.cvc19
-rw-r--r--test/regress/regress0/push-pop/test.01.cvc.smt219
-rw-r--r--test/regress/regress0/push-pop/units.cvc29
-rw-r--r--test/regress/regress0/push-pop/units.cvc.smt231
-rw-r--r--test/regress/regress0/quantifiers/cegqi-nl-simp.cvc3
-rw-r--r--test/regress/regress0/quantifiers/cegqi-nl-simp.cvc.smt25
-rw-r--r--test/regress/regress0/rels/addr_book_0.cvc49
-rw-r--r--test/regress/regress0/rels/addr_book_0.cvc.smt241
-rw-r--r--test/regress/regress0/rels/atom_univ2.cvc24
-rw-r--r--test/regress/regress0/rels/atom_univ2.cvc.smt217
-rw-r--r--test/regress/regress0/rels/card_transpose.cvc6
-rw-r--r--test/regress/regress0/rels/card_transpose.cvc.smt27
-rw-r--r--test/regress/regress0/rels/iden_0.cvc28
-rw-r--r--test/regress/regress0/rels/iden_0.cvc.smt225
-rw-r--r--test/regress/regress0/rels/iden_1.cvc19
-rw-r--r--test/regress/regress0/rels/iden_1.cvc.smt219
-rw-r--r--test/regress/regress0/rels/join-eq-u-sat.cvc22
-rw-r--r--test/regress/regress0/rels/join-eq-u-sat.cvc.smt218
-rw-r--r--test/regress/regress0/rels/join-eq-u.cvc22
-rw-r--r--test/regress/regress0/rels/join-eq-u.cvc.smt218
-rw-r--r--test/regress/regress0/rels/joinImg_0.cvc34
-rw-r--r--test/regress/regress0/rels/joinImg_0.cvc.smt226
-rw-r--r--test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc19
-rw-r--r--test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc.smt213
-rw-r--r--test/regress/regress0/rels/rel_1tup_0.cvc24
-rw-r--r--test/regress/regress0/rels/rel_1tup_0.cvc.smt219
-rw-r--r--test/regress/regress0/rels/rel_complex_0.cvc31
-rw-r--r--test/regress/regress0/rels/rel_complex_0.cvc.smt223
-rw-r--r--test/regress/regress0/rels/rel_complex_1.cvc34
-rw-r--r--test/regress/regress0/rels/rel_complex_1.cvc.smt227
-rw-r--r--test/regress/regress0/rels/rel_conflict_0.cvc10
-rw-r--r--test/regress/regress0/rels/rel_conflict_0.cvc.smt210
-rw-r--r--test/regress/regress0/rels/rel_join_0.cvc24
-rw-r--r--test/regress/regress0/rels/rel_join_0.cvc.smt221
-rw-r--r--test/regress/regress0/rels/rel_join_0_1.cvc27
-rw-r--r--test/regress/regress0/rels/rel_join_0_1.cvc.smt222
-rw-r--r--test/regress/regress0/rels/rel_join_1.cvc31
-rw-r--r--test/regress/regress0/rels/rel_join_1.cvc.smt225
-rw-r--r--test/regress/regress0/rels/rel_join_1_1.cvc31
-rw-r--r--test/regress/regress0/rels/rel_join_1_1.cvc.smt225
-rw-r--r--test/regress/regress0/rels/rel_join_2.cvc20
-rw-r--r--test/regress/regress0/rels/rel_join_2.cvc.smt217
-rw-r--r--test/regress/regress0/rels/rel_join_2_1.cvc20
-rw-r--r--test/regress/regress0/rels/rel_join_2_1.cvc.smt217
-rw-r--r--test/regress/regress0/rels/rel_join_3.cvc29
-rw-r--r--test/regress/regress0/rels/rel_join_3.cvc.smt226
-rw-r--r--test/regress/regress0/rels/rel_join_3_1.cvc29
-rw-r--r--test/regress/regress0/rels/rel_join_3_1.cvc.smt226
-rw-r--r--test/regress/regress0/rels/rel_join_4.cvc32
-rw-r--r--test/regress/regress0/rels/rel_join_4.cvc.smt228
-rw-r--r--test/regress/regress0/rels/rel_join_5.cvc19
-rw-r--r--test/regress/regress0/rels/rel_join_5.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_join_6.cvc13
-rw-r--r--test/regress/regress0/rels/rel_join_6.cvc.smt211
-rw-r--r--test/regress/regress0/rels/rel_join_7.cvc26
-rw-r--r--test/regress/regress0/rels/rel_join_7.cvc.smt223
-rw-r--r--test/regress/regress0/rels/rel_product_0.cvc20
-rw-r--r--test/regress/regress0/rels/rel_product_0.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_product_0_1.cvc20
-rw-r--r--test/regress/regress0/rels/rel_product_0_1.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_product_1.cvc20
-rw-r--r--test/regress/regress0/rels/rel_product_1.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_product_1_1.cvc21
-rw-r--r--test/regress/regress0/rels/rel_product_1_1.cvc.smt217
-rw-r--r--test/regress/regress0/rels/rel_symbolic_1.cvc21
-rw-r--r--test/regress/regress0/rels/rel_symbolic_1.cvc.smt219
-rw-r--r--test/regress/regress0/rels/rel_symbolic_1_1.cvc20
-rw-r--r--test/regress/regress0/rels/rel_symbolic_1_1.cvc.smt216
-rw-r--r--test/regress/regress0/rels/rel_symbolic_2_1.cvc21
-rw-r--r--test/regress/regress0/rels/rel_symbolic_2_1.cvc.smt217
-rw-r--r--test/regress/regress0/rels/rel_symbolic_3_1.cvc21
-rw-r--r--test/regress/regress0/rels/rel_symbolic_3_1.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_tc_11.cvc18
-rw-r--r--test/regress/regress0/rels/rel_tc_11.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_tc_2_1.cvc28
-rw-r--r--test/regress/regress0/rels/rel_tc_2_1.cvc.smt223
-rw-r--r--test/regress/regress0/rels/rel_tc_3.cvc22
-rw-r--r--test/regress/regress0/rels/rel_tc_3.cvc.smt220
-rw-r--r--test/regress/regress0/rels/rel_tc_3_1.cvc18
-rw-r--r--test/regress/regress0/rels/rel_tc_3_1.cvc.smt217
-rw-r--r--test/regress/regress0/rels/rel_tc_7.cvc10
-rw-r--r--test/regress/regress0/rels/rel_tc_7.cvc.smt210
-rw-r--r--test/regress/regress0/rels/rel_tc_8.cvc10
-rw-r--r--test/regress/regress0/rels/rel_tc_8.cvc.smt29
-rw-r--r--test/regress/regress0/rels/rel_tp_3_1.cvc14
-rw-r--r--test/regress/regress0/rels/rel_tp_3_1.cvc.smt213
-rw-r--r--test/regress/regress0/rels/rel_tp_join_0.cvc32
-rw-r--r--test/regress/regress0/rels/rel_tp_join_0.cvc.smt228
-rw-r--r--test/regress/regress0/rels/rel_tp_join_1.cvc32
-rw-r--r--test/regress/regress0/rels/rel_tp_join_1.cvc.smt226
-rw-r--r--test/regress/regress0/rels/rel_tp_join_2.cvc19
-rw-r--r--test/regress/regress0/rels/rel_tp_join_2.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_tp_join_3.cvc28
-rw-r--r--test/regress/regress0/rels/rel_tp_join_3.cvc.smt223
-rw-r--r--test/regress/regress0/rels/rel_tp_join_eq_0.cvc28
-rw-r--r--test/regress/regress0/rels/rel_tp_join_eq_0.cvc.smt221
-rw-r--r--test/regress/regress0/rels/rel_tp_join_int_0.cvc26
-rw-r--r--test/regress/regress0/rels/rel_tp_join_int_0.cvc.smt219
-rw-r--r--test/regress/regress0/rels/rel_tp_join_pro_0.cvc21
-rw-r--r--test/regress/regress0/rels/rel_tp_join_pro_0.cvc.smt219
-rw-r--r--test/regress/regress0/rels/rel_tp_join_var_0.cvc28
-rw-r--r--test/regress/regress0/rels/rel_tp_join_var_0.cvc.smt223
-rw-r--r--test/regress/regress0/rels/rel_transpose_0.cvc18
-rw-r--r--test/regress/regress0/rels/rel_transpose_0.cvc.smt215
-rw-r--r--test/regress/regress0/rels/rel_transpose_1.cvc12
-rw-r--r--test/regress/regress0/rels/rel_transpose_1.cvc.smt213
-rw-r--r--test/regress/regress0/rels/rel_transpose_1_1.cvc14
-rw-r--r--test/regress/regress0/rels/rel_transpose_1_1.cvc.smt215
-rw-r--r--test/regress/regress0/rels/rel_transpose_3.cvc15
-rw-r--r--test/regress/regress0/rels/rel_transpose_3.cvc.smt214
-rw-r--r--test/regress/regress0/rels/rel_transpose_4.cvc13
-rw-r--r--test/regress/regress0/rels/rel_transpose_4.cvc.smt211
-rw-r--r--test/regress/regress0/rels/rel_transpose_5.cvc22
-rw-r--r--test/regress/regress0/rels/rel_transpose_5.cvc.smt218
-rw-r--r--test/regress/regress0/rels/rel_transpose_6.cvc24
-rw-r--r--test/regress/regress0/rels/rel_transpose_6.cvc.smt219
-rw-r--r--test/regress/regress0/rels/rel_transpose_7.cvc10
-rw-r--r--test/regress/regress0/rels/rel_transpose_7.cvc.smt29
-rw-r--r--test/regress/regress0/rels/rels-sharing-simp.cvc14
-rw-r--r--test/regress/regress0/rels/rels-sharing-simp.cvc.smt212
-rw-r--r--test/regress/regress0/sets/card-3sets.cvc9
-rw-r--r--test/regress/regress0/sets/card-3sets.cvc.smt28
-rw-r--r--test/regress/regress0/sets/complement.cvc10
-rw-r--r--test/regress/regress0/sets/complement.cvc.smt29
-rw-r--r--test/regress/regress0/sets/complement2.cvc12
-rw-r--r--test/regress/regress0/sets/complement2.cvc.smt211
-rw-r--r--test/regress/regress0/sets/complement3.cvc15
-rw-r--r--test/regress/regress0/sets/complement3.cvc.smt216
-rw-r--r--test/regress/regress0/sets/cvc-sample.cvc55
-rw-r--r--test/regress/regress0/sets/cvc-sample.cvc.smt290
-rw-r--r--test/regress/regress0/simple.cvc7
-rw-r--r--test/regress/regress0/simple.cvc.smt212
-rw-r--r--test/regress/regress0/smallcnf.cvc9
-rw-r--r--test/regress/regress0/smallcnf.cvc.smt211
-rw-r--r--test/regress/regress0/strings/parser-syms.cvc9
-rw-r--r--test/regress/regress0/strings/parser-syms.cvc.smt28
-rw-r--r--test/regress/regress0/strings/regexp-native-simple.cvc13
-rw-r--r--test/regress/regress0/strings/regexp-native-simple.cvc.smt28
-rw-r--r--test/regress/regress0/strings/strings-charat.cvc10
-rw-r--r--test/regress/regress0/strings/strings-charat.cvc.smt29
-rw-r--r--test/regress/regress0/strings/strings-native-simple.cvc10
-rw-r--r--test/regress/regress0/strings/strings-native-simple.cvc.smt29
-rw-r--r--test/regress/regress0/test11.cvc7
-rw-r--r--test/regress/regress0/test11.cvc.smt28
-rw-r--r--test/regress/regress0/test9.cvc4
-rw-r--r--test/regress/regress0/test9.cvc.smt27
-rw-r--r--test/regress/regress0/uf/simple.01.cvc7
-rw-r--r--test/regress/regress0/uf/simple.01.cvc.smt29
-rw-r--r--test/regress/regress0/uf/simple.02.cvc7
-rw-r--r--test/regress/regress0/uf/simple.02.cvc.smt29
-rw-r--r--test/regress/regress0/uf/simple.03.cvc11
-rw-r--r--test/regress/regress0/uf/simple.03.cvc.smt212
-rw-r--r--test/regress/regress0/uf/simple.04.cvc11
-rw-r--r--test/regress/regress0/uf/simple.04.cvc.smt212
-rw-r--r--test/regress/regress0/uf20-03.cvc115
-rw-r--r--test/regress/regress0/uf20-03.cvc.smt2115
-rw-r--r--test/regress/regress0/uflra/bug293.cvc7
-rw-r--r--test/regress/regress0/uflra/bug293.cvc.smt29
-rw-r--r--test/regress/regress0/uflra/simple.01.cvc5
-rw-r--r--test/regress/regress0/uflra/simple.01.cvc.smt214
-rw-r--r--test/regress/regress0/uflra/simple.02.cvc9
-rw-r--r--test/regress/regress0/uflra/simple.02.cvc.smt210
-rw-r--r--test/regress/regress0/uflra/simple.03.cvc11
-rw-r--r--test/regress/regress0/uflra/simple.03.cvc.smt215
-rw-r--r--test/regress/regress0/uflra/simple.04.cvc14
-rw-r--r--test/regress/regress0/uflra/simple.04.cvc.smt214
-rw-r--r--test/regress/regress0/wiki.01.cvc4
-rw-r--r--test/regress/regress0/wiki.01.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.02.cvc4
-rw-r--r--test/regress/regress0/wiki.02.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.03.cvc4
-rw-r--r--test/regress/regress0/wiki.03.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.04.cvc4
-rw-r--r--test/regress/regress0/wiki.04.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.05.cvc4
-rw-r--r--test/regress/regress0/wiki.05.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.06.cvc4
-rw-r--r--test/regress/regress0/wiki.06.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.07.cvc4
-rw-r--r--test/regress/regress0/wiki.07.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.08.cvc4
-rw-r--r--test/regress/regress0/wiki.08.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.09.cvc4
-rw-r--r--test/regress/regress0/wiki.09.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.10.cvc4
-rw-r--r--test/regress/regress0/wiki.10.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.11.cvc4
-rw-r--r--test/regress/regress0/wiki.11.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.12.cvc4
-rw-r--r--test/regress/regress0/wiki.12.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.13.cvc4
-rw-r--r--test/regress/regress0/wiki.13.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.14.cvc4
-rw-r--r--test/regress/regress0/wiki.14.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.15.cvc4
-rw-r--r--test/regress/regress0/wiki.15.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.16.cvc4
-rw-r--r--test/regress/regress0/wiki.16.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.17.cvc4
-rw-r--r--test/regress/regress0/wiki.17.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.18.cvc4
-rw-r--r--test/regress/regress0/wiki.18.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.19.cvc4
-rw-r--r--test/regress/regress0/wiki.19.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.20.cvc4
-rw-r--r--test/regress/regress0/wiki.20.cvc.smt27
-rw-r--r--test/regress/regress0/wiki.21.cvc4
-rw-r--r--test/regress/regress0/wiki.21.cvc.smt27
480 files changed, 3189 insertions, 3406 deletions
diff --git a/test/regress/regress0/arith/arith.01.cvc b/test/regress/regress0/arith/arith.01.cvc
deleted file mode 100644
index 08d591590..000000000
--- a/test/regress/regress0/arith/arith.01.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: entailed
-x : REAL;
-y : REAL;
-
-QUERY (x * y ) = (y * x);
diff --git a/test/regress/regress0/arith/arith.01.cvc.smt2 b/test/regress/regress0/arith/arith.01.cvc.smt2
new file mode 100644
index 000000000..eac4fe1b8
--- /dev/null
+++ b/test/regress/regress0/arith/arith.01.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(check-sat-assuming ( (not (= (* x y) (* y x))) ))
diff --git a/test/regress/regress0/arith/arith.02.cvc b/test/regress/regress0/arith/arith.02.cvc
deleted file mode 100644
index e0a48c357..000000000
--- a/test/regress/regress0/arith/arith.02.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-x : REAL;
-y : REAL;
-z : REAL;
-
-QUERY x*(y*z) = (x*y)*z;
diff --git a/test/regress/regress0/arith/arith.02.cvc.smt2 b/test/regress/regress0/arith/arith.02.cvc.smt2
new file mode 100644
index 000000000..5c44e1bec
--- /dev/null
+++ b/test/regress/regress0/arith/arith.02.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(declare-fun z () Real)
+(check-sat-assuming ( (not (= (* x (* y z)) (* (* x y) z))) ))
diff --git a/test/regress/regress0/arith/arith.03.cvc b/test/regress/regress0/arith/arith.03.cvc
deleted file mode 100644
index ce54c8b7e..000000000
--- a/test/regress/regress0/arith/arith.03.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: entailed
-x : REAL;
-y : REAL;
-
-QUERY (x + y)*(x + y) = x*x + 2*x*y + y*y;
diff --git a/test/regress/regress0/arith/arith.03.cvc.smt2 b/test/regress/regress0/arith/arith.03.cvc.smt2
new file mode 100644
index 000000000..777526117
--- /dev/null
+++ b/test/regress/regress0/arith/arith.03.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(check-sat-assuming ( (not (let ((_let_1 (+ x y))) (= (* _let_1 _let_1) (+ (+ (* x x) (* (* 2 x) y)) (* y y))))) ))
diff --git a/test/regress/regress0/arith/bug549.cvc b/test/regress/regress0/arith/bug549.cvc
deleted file mode 100644
index bfb3e75d5..000000000
--- a/test/regress/regress0/arith/bug549.cvc
+++ /dev/null
@@ -1,3 +0,0 @@
-% EXPECT: entailed
-a, b : REAL;
-QUERY (a*b)^5 = b*a*a*a*a*b*b*b*b*a;
diff --git a/test/regress/regress0/arith/bug549.cvc.smt2 b/test/regress/regress0/arith/bug549.cvc.smt2
new file mode 100644
index 000000000..74bdc8878
--- /dev/null
+++ b/test/regress/regress0/arith/bug549.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Real)
+(declare-fun b () Real)
+(check-sat-assuming ( (not (= (^ (* a b) 5) (* (* (* (* (* (* (* (* (* b a) a) a) a) b) b) b) b) a))) ))
diff --git a/test/regress/regress0/arith/integers/arith-int-014.cvc b/test/regress/regress0/arith/integers/arith-int-014.cvc
deleted file mode 100644
index 84954a3ea..000000000
--- a/test/regress/regress0/arith/integers/arith-int-014.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: not_entailed
-x0, x1, x2, x3 : INT;
-ASSERT (10 * x0) + (25 * x1) + (10 * x2) + (-28 * x3) <= 20 ;
-ASSERT (24 * x0) + (-9 * x1) + (-12 * x2) + (15 * x3) <= 3;
-QUERY FALSE;
diff --git a/test/regress/regress0/arith/integers/arith-int-014.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-014.cvc.smt2
new file mode 100644
index 000000000..02aa0d5b1
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-014.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Int)
+(declare-fun x1 () Int)
+(declare-fun x2 () Int)
+(declare-fun x3 () Int)
+(assert (<= (+ (+ (+ (* 10 x0) (* 25 x1)) (* 10 x2)) (* (- 28) x3)) 20))
+(assert (<= (+ (+ (+ (* 24 x0) (* (- 9) x1)) (* (- 12) x2)) (* 15 x3)) 3))
+(check-sat)
diff --git a/test/regress/regress0/arith/integers/arith-int-015.cvc b/test/regress/regress0/arith/integers/arith-int-015.cvc
deleted file mode 100644
index 8f8b01fc9..000000000
--- a/test/regress/regress0/arith/integers/arith-int-015.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: not_entailed
-x0, x1, x2, x3 : INT;
-ASSERT (-22 * x0) + (-3 * x1) + (9 * x2) + (-13 * x3) > -31 ;
-ASSERT (31 * x0) + (-17 * x1) + (28 * x2) + (-16 * x3) > -28;
-QUERY FALSE;
diff --git a/test/regress/regress0/arith/integers/arith-int-015.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-015.cvc.smt2
new file mode 100644
index 000000000..5fecc9da0
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-015.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Int)
+(declare-fun x1 () Int)
+(declare-fun x2 () Int)
+(declare-fun x3 () Int)
+(assert (> (+ (+ (+ (* (- 22) x0) (* (- 3) x1)) (* 9 x2)) (* (- 13) x3)) (- 31)))
+(assert (> (+ (+ (+ (* 31 x0) (* (- 17) x1)) (* 28 x2)) (* (- 16) x3)) (- 28)))
+(check-sat)
diff --git a/test/regress/regress0/arith/integers/arith-int-021.cvc b/test/regress/regress0/arith/integers/arith-int-021.cvc
deleted file mode 100644
index 66f02401b..000000000
--- a/test/regress/regress0/arith/integers/arith-int-021.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-% EXPECT: not_entailed
-x0, x1, x2, x3 : INT;
-ASSERT (8 * x0) + (-27 * x1) + (29 * x2) + (-13 * x3) < 12;
-QUERY FALSE;
diff --git a/test/regress/regress0/arith/integers/arith-int-021.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-021.cvc.smt2
new file mode 100644
index 000000000..c7c20c65e
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-021.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Int)
+(declare-fun x1 () Int)
+(declare-fun x2 () Int)
+(declare-fun x3 () Int)
+(assert (< (+ (+ (+ (* 8 x0) (* (- 27) x1)) (* 29 x2)) (* (- 13) x3)) 12))
+(check-sat)
diff --git a/test/regress/regress0/arith/integers/arith-int-023.cvc b/test/regress/regress0/arith/integers/arith-int-023.cvc
deleted file mode 100644
index b3d79e8ff..000000000
--- a/test/regress/regress0/arith/integers/arith-int-023.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-% EXPECT: not_entailed
-x0, x1, x2, x3 : INT;
-ASSERT (29 * x0) + (-19 * x1) + (23 * x2) + (15 * x3) <= 9;
-QUERY FALSE;
diff --git a/test/regress/regress0/arith/integers/arith-int-023.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-023.cvc.smt2
new file mode 100644
index 000000000..5bf51fcc7
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-023.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Int)
+(declare-fun x1 () Int)
+(declare-fun x2 () Int)
+(declare-fun x3 () Int)
+(assert (<= (+ (+ (+ (* 29 x0) (* (- 19) x1)) (* 23 x2)) (* 15 x3)) 9))
+(check-sat)
diff --git a/test/regress/regress0/arith/integers/arith-int-025.cvc b/test/regress/regress0/arith/integers/arith-int-025.cvc
deleted file mode 100644
index e905da9a0..000000000
--- a/test/regress/regress0/arith/integers/arith-int-025.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-% EXPECT: not_entailed
-x0, x1, x2, x3 : INT;
-ASSERT (-19 * x0) + (-29 * x1) + (2 * x2) + (26 * x3) >= 3;
-QUERY FALSE;
diff --git a/test/regress/regress0/arith/integers/arith-int-025.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-025.cvc.smt2
new file mode 100644
index 000000000..625b5d82d
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-025.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Int)
+(declare-fun x1 () Int)
+(declare-fun x2 () Int)
+(declare-fun x3 () Int)
+(assert (>= (+ (+ (+ (* (- 19) x0) (* (- 29) x1)) (* 2 x2)) (* 26 x3)) 3))
+(check-sat)
diff --git a/test/regress/regress0/arith/integers/arith-int-042.cvc b/test/regress/regress0/arith/integers/arith-int-042.cvc
deleted file mode 100644
index b6db26e86..000000000
--- a/test/regress/regress0/arith/integers/arith-int-042.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: entailed
-x0, x1, x2, x3 : INT;
-ASSERT (-9 * x0) + (25 * x1) + (0 * x2) + (13 * x3) = 17 ;
-ASSERT (-6 * x0) + (32 * x1) + (2 * x2) + (-32 * x3) = -5 ;
-ASSERT (19 * x0) + (25 * x1) + (-32 * x2) + (-29 * x3) <= 14 ;
-ASSERT (6 * x0) + (22 * x1) + (-24 * x2) + (-6 * x3) < -21 ;
-ASSERT (-18 * x0) + (-21 * x1) + (-29 * x2) + (12 * x3) > 17 ;
-ASSERT (-25 * x0) + (-5 * x1) + (-22 * x2) + (-7 * x3) > -21;
-QUERY FALSE;
diff --git a/test/regress/regress0/arith/integers/arith-int-042.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-042.cvc.smt2
new file mode 100644
index 000000000..bbe6d209e
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-042.cvc.smt2
@@ -0,0 +1,14 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Int)
+(declare-fun x1 () Int)
+(declare-fun x2 () Int)
+(declare-fun x3 () Int)
+(assert (= (+ (+ (+ (* (- 9) x0) (* 25 x1)) (* 0 x2)) (* 13 x3)) 17))
+(assert (= (+ (+ (+ (* (- 6) x0) (* 32 x1)) (* 2 x2)) (* (- 32) x3)) (- 5)))
+(assert (<= (+ (+ (+ (* 19 x0) (* 25 x1)) (* (- 32) x2)) (* (- 29) x3)) 14))
+(assert (< (+ (+ (+ (* 6 x0) (* 22 x1)) (* (- 24) x2)) (* (- 6) x3)) (- 21)))
+(assert (> (+ (+ (+ (* (- 18) x0) (* (- 21) x1)) (* (- 29) x2)) (* 12 x3)) 17))
+(assert (> (+ (+ (+ (* (- 25) x0) (* (- 5) x1)) (* (- 22) x2)) (* (- 7) x3)) (- 21)))
+(check-sat)
diff --git a/test/regress/regress0/arith/integers/arith-int-042.min.cvc b/test/regress/regress0/arith/integers/arith-int-042.min.cvc
deleted file mode 100644
index 3fd20a0b6..000000000
--- a/test/regress/regress0/arith/integers/arith-int-042.min.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-% EXPECT: entailed
-x1: INT;
-x0: INT;
-QUERY NOT (((x0 * 6) + (x1 * 32)) = 1);
diff --git a/test/regress/regress0/arith/integers/arith-int-042.min.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-042.min.cvc.smt2
new file mode 100644
index 000000000..62acf2e70
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-042.min.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x1 () Int)
+(declare-fun x0 () Int)
+(check-sat-assuming ( (= (+ (* x0 6) (* x1 32)) 1) ))
diff --git a/test/regress/regress0/arith/integers/arith-int-079.cvc b/test/regress/regress0/arith/integers/arith-int-079.cvc
deleted file mode 100644
index 1739b3364..000000000
--- a/test/regress/regress0/arith/integers/arith-int-079.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: entailed
-x0, x1, x2, x3 : INT;
-ASSERT (6 * x0) + (2 * x1) + (22 * x2) + (-18 * x3) = -15 ;
-ASSERT (-8 * x0) + (-25 * x1) + (-25 * x2) + (7 * x3) > 10 ;
-ASSERT (8 * x0) + (25 * x1) + (-7 * x2) + (-29 * x3) < -25 ;
-ASSERT (27 * x0) + (17 * x1) + (-24 * x2) + (-5 * x3) <= 13 ;
-ASSERT (5 * x0) + (-3 * x1) + (0 * x2) + (4 * x3) < -26 ;
-ASSERT (25 * x0) + (7 * x1) + (27 * x2) + (-14 * x3) < 30 ;
-ASSERT (-22 * x0) + (-17 * x1) + (9 * x2) + (-20 * x3) < -19 ;
-ASSERT (31 * x0) + (-16 * x1) + (0 * x2) + (6 * x3) >= 18;
-QUERY FALSE;
diff --git a/test/regress/regress0/arith/integers/arith-int-079.cvc.smt2 b/test/regress/regress0/arith/integers/arith-int-079.cvc.smt2
new file mode 100644
index 000000000..16c8c7ea4
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-int-079.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Int)
+(declare-fun x1 () Int)
+(declare-fun x2 () Int)
+(declare-fun x3 () Int)
+(assert (= (+ (+ (+ (* 6 x0) (* 2 x1)) (* 22 x2)) (* (- 18) x3)) (- 15)))
+(assert (let ((_let_1 (- 25))) (> (+ (+ (+ (* (- 8) x0) (* _let_1 x1)) (* _let_1 x2)) (* 7 x3)) 10)))
+(assert (< (+ (+ (+ (* 8 x0) (* 25 x1)) (* (- 7) x2)) (* (- 29) x3)) (- 25)))
+(assert (<= (+ (+ (+ (* 27 x0) (* 17 x1)) (* (- 24) x2)) (* (- 5) x3)) 13))
+(assert (< (+ (+ (+ (* 5 x0) (* (- 3) x1)) (* 0 x2)) (* 4 x3)) (- 26)))
+(assert (< (+ (+ (+ (* 25 x0) (* 7 x1)) (* 27 x2)) (* (- 14) x3)) 30))
+(assert (< (+ (+ (+ (* (- 22) x0) (* (- 17) x1)) (* 9 x2)) (* (- 20) x3)) (- 19)))
+(assert (>= (+ (+ (+ (* 31 x0) (* (- 16) x1)) (* 0 x2)) (* 6 x3)) 18))
+(check-sat)
diff --git a/test/regress/regress0/arith/integers/arith-interval.cvc b/test/regress/regress0/arith/integers/arith-interval.cvc
deleted file mode 100644
index ed6cb747e..000000000
--- a/test/regress/regress0/arith/integers/arith-interval.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-x: INT;
-P: INT -> BOOLEAN;
-
-ASSERT 1 <= x AND x <= 2;
-ASSERT P(1) AND P(2);
-QUERY P(x);
diff --git a/test/regress/regress0/arith/integers/arith-interval.cvc.smt2 b/test/regress/regress0/arith/integers/arith-interval.cvc.smt2
new file mode 100644
index 000000000..1a0fcd737
--- /dev/null
+++ b/test/regress/regress0/arith/integers/arith-interval.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Int)
+(declare-fun P (Int) Bool)
+(assert (and (<= 1 x) (<= x 2)))
+(assert (and (P 1) (P 2)))
+(check-sat-assuming ( (not (P x)) ))
diff --git a/test/regress/regress0/arith/miplib.cvc b/test/regress/regress0/arith/miplib.cvc
deleted file mode 100644
index a7ae19b0a..000000000
--- a/test/regress/regress0/arith/miplib.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% COMMAND-LINE: --miplib-trick
-% EXPECT: sat
-
-tmp1, tmp2, tmp3 : INT;
-x, y, z : BOOLEAN;
-
-% x = {0, 1}, (NOT x) = 1 - x
-% i*Nx + j*Ny + k = 0
-% i*x + j*Ny + k = 4
-% i*Nx + j*y + k = 6
-% i*x + j*y + k = 10
-
-ASSERT NOT x AND (NOT y AND TRUE) => tmp1 = 0;
-ASSERT x AND (NOT y AND TRUE) => tmp1 = 4;
-ASSERT NOT x AND ( y AND TRUE) => tmp1 = 6;
-ASSERT x AND ( y AND TRUE) => tmp1 = 10;
-
-ASSERT NOT x AND (NOT z AND TRUE) => tmp2 = 0;
-ASSERT x AND (NOT z AND TRUE) => tmp2 = 2;
-ASSERT NOT x AND ( z AND TRUE) => tmp2 = 9;
-ASSERT x AND ( z AND TRUE) => tmp2 = 11;
-
-ASSERT NOT y AND (NOT z AND TRUE) => tmp3 = 0;
-ASSERT y AND (NOT z AND TRUE) => tmp3 = 5;
-ASSERT NOT y AND ( z AND TRUE) => tmp3 = 16;
-ASSERT y AND ( z AND TRUE) => tmp3 = 21;
-
-CHECKSAT;
diff --git a/test/regress/regress0/arith/miplib.cvc.smt2 b/test/regress/regress0/arith/miplib.cvc.smt2
new file mode 100644
index 000000000..3b31b4f1b
--- /dev/null
+++ b/test/regress/regress0/arith/miplib.cvc.smt2
@@ -0,0 +1,23 @@
+; COMMAND-LINE: --miplib-trick
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun tmp1 () Int)
+(declare-fun tmp2 () Int)
+(declare-fun tmp3 () Int)
+(declare-fun x () Bool)
+(declare-fun y () Bool)
+(declare-fun z () Bool)
+(assert (=> (and (not x) (and (not y) true)) (= tmp1 0)))
+(assert (=> (and x (and (not y) true)) (= tmp1 4)))
+(assert (=> (and (not x) (and y true)) (= tmp1 6)))
+(assert (=> (and x (and y true)) (= tmp1 10)))
+(assert (=> (and (not x) (and (not z) true)) (= tmp2 0)))
+(assert (=> (and x (and (not z) true)) (= tmp2 2)))
+(assert (=> (and (not x) (and z true)) (= tmp2 9)))
+(assert (=> (and x (and z true)) (= tmp2 11)))
+(assert (=> (and (not y) (and (not z) true)) (= tmp3 0)))
+(assert (=> (and y (and (not z) true)) (= tmp3 5)))
+(assert (=> (and (not y) (and z true)) (= tmp3 16)))
+(assert (=> (and y (and z true)) (= tmp3 21)))
+(check-sat)
diff --git a/test/regress/regress0/arith/miplib2.cvc b/test/regress/regress0/arith/miplib2.cvc
deleted file mode 100644
index ce2e9712e..000000000
--- a/test/regress/regress0/arith/miplib2.cvc
+++ /dev/null
@@ -1,32 +0,0 @@
-% COMMAND-LINE: --miplib-trick
-% EXPECT: sat
-
-tmp1, tmp2, tmp3 : INT;
-x, y, z : BOOLEAN;
-
-% x = {0, 1}, (NOT x) = 1 - x
-% i*Nx + j*Ny + k = 0
-% i*x + j*Ny + k = 4
-% i*Nx + j*y + k = 6
-% i*x + j*y + k = 10
-
-ASSERT NOT x AND (NOT y AND TRUE) => tmp1 = 0;
-ASSERT x AND (NOT y AND TRUE) => tmp1 = 4;
-ASSERT NOT x AND ( y AND TRUE) => tmp1 = 6;
-ASSERT x AND ( y AND TRUE) => tmp1 = 10;
-
-ASSERT NOT x AND (NOT z AND TRUE) => tmp2 = 0;
-ASSERT x AND (NOT z AND TRUE) => tmp2 = 2;
-ASSERT NOT x AND ( z AND TRUE) => tmp2 = 9;
-ASSERT x AND ( z AND TRUE) => tmp2 = 11;
-
-ASSERT NOT y AND (NOT z AND TRUE) => tmp3 = 0;
-ASSERT y AND (NOT z AND TRUE) => tmp3 = 5;
-ASSERT NOT y AND ( z AND TRUE) => tmp3 = 16;
-ASSERT y AND ( z AND TRUE) => tmp3 = 21;
-
-% miplib trick does not apply to blocks 1 and 2, x occurs outside
-% of the tmp definitions
-ASSERT x;
-
-CHECKSAT;
diff --git a/test/regress/regress0/arith/miplib2.cvc.smt2 b/test/regress/regress0/arith/miplib2.cvc.smt2
new file mode 100644
index 000000000..e95385bb1
--- /dev/null
+++ b/test/regress/regress0/arith/miplib2.cvc.smt2
@@ -0,0 +1,24 @@
+; COMMAND-LINE: --miplib-trick
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun tmp1 () Int)
+(declare-fun tmp2 () Int)
+(declare-fun tmp3 () Int)
+(declare-fun x () Bool)
+(declare-fun y () Bool)
+(declare-fun z () Bool)
+(assert (=> (and (not x) (and (not y) true)) (= tmp1 0)))
+(assert (=> (and x (and (not y) true)) (= tmp1 4)))
+(assert (=> (and (not x) (and y true)) (= tmp1 6)))
+(assert (=> (and x (and y true)) (= tmp1 10)))
+(assert (=> (and (not x) (and (not z) true)) (= tmp2 0)))
+(assert (=> (and x (and (not z) true)) (= tmp2 2)))
+(assert (=> (and (not x) (and z true)) (= tmp2 9)))
+(assert (=> (and x (and z true)) (= tmp2 11)))
+(assert (=> (and (not y) (and (not z) true)) (= tmp3 0)))
+(assert (=> (and y (and (not z) true)) (= tmp3 5)))
+(assert (=> (and (not y) (and z true)) (= tmp3 16)))
+(assert (=> (and y (and z true)) (= tmp3 21)))
+(assert x)
+(check-sat)
diff --git a/test/regress/regress0/arith/miplib4.cvc b/test/regress/regress0/arith/miplib4.cvc
deleted file mode 100644
index 722122b38..000000000
--- a/test/regress/regress0/arith/miplib4.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% COMMAND-LINE: --miplib-trick
-% EXPECT: sat
-
-tmp1 : INT;
-x, y : BOOLEAN;
-
-% nonlinear combination, not eligible for miplib trick replacement
-ASSERT NOT x AND (NOT y AND TRUE) => tmp1 = 0;
-ASSERT x AND (NOT y AND TRUE) => tmp1 = 4;
-ASSERT NOT x AND ( y AND TRUE) => tmp1 = 6;
-ASSERT x AND ( y AND TRUE) => tmp1 = 12;
-
-ASSERT tmp1 > 10;
-
-CHECKSAT;
diff --git a/test/regress/regress0/arith/miplib4.cvc.smt2 b/test/regress/regress0/arith/miplib4.cvc.smt2
new file mode 100644
index 000000000..d669133d1
--- /dev/null
+++ b/test/regress/regress0/arith/miplib4.cvc.smt2
@@ -0,0 +1,13 @@
+; COMMAND-LINE: --miplib-trick
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun tmp1 () Int)
+(declare-fun x () Bool)
+(declare-fun y () Bool)
+(assert (=> (and (not x) (and (not y) true)) (= tmp1 0)))
+(assert (=> (and x (and (not y) true)) (= tmp1 4)))
+(assert (=> (and (not x) (and y true)) (= tmp1 6)))
+(assert (=> (and x (and y true)) (= tmp1 12)))
+(assert (> tmp1 10))
+(check-sat)
diff --git a/test/regress/regress0/arrays/constarr.cvc b/test/regress/regress0/arrays/constarr.cvc
deleted file mode 100644
index 406a1ce2b..000000000
--- a/test/regress/regress0/arrays/constarr.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: unsat
-all1 : ARRAY INT OF INT;
-a, i : INT;
-ASSERT all1 = ARRAY(INT OF INT) : 1;
-ASSERT a = all1[i];
-ASSERT a /= 1;
-CHECKSAT TRUE;
diff --git a/test/regress/regress0/arrays/constarr.cvc.smt2 b/test/regress/regress0/arrays/constarr.cvc.smt2
new file mode 100644
index 000000000..cd92de0d6
--- /dev/null
+++ b/test/regress/regress0/arrays/constarr.cvc.smt2
@@ -0,0 +1,17 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental true)
+(declare-fun all1 () (Array Int Int))
+(declare-fun a () Int)
+(declare-fun i () Int)
+(assert (= all1 ((as const (Array Int Int)) 1)))
+(assert (= a (select all1 i)))
+(assert (not (= a 1)))
+(push 1)
+
+(assert true)
+
+(check-sat)
+
+(pop 1)
+
diff --git a/test/regress/regress0/arrays/constarr2.cvc b/test/regress/regress0/arrays/constarr2.cvc
deleted file mode 100644
index 90ff11430..000000000
--- a/test/regress/regress0/arrays/constarr2.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: unsat
-all1, all2 : ARRAY INT OF INT;
-a, i : INT;
-ASSERT all1 = ARRAY(INT OF INT) : 1;
-ASSERT all2 = ARRAY(INT OF INT) : 2;
-ASSERT all1 = all2;
-CHECKSAT;
diff --git a/test/regress/regress0/arrays/constarr2.cvc.smt2 b/test/regress/regress0/arrays/constarr2.cvc.smt2
new file mode 100644
index 000000000..52704cea7
--- /dev/null
+++ b/test/regress/regress0/arrays/constarr2.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun all1 () (Array Int Int))
+(declare-fun all2 () (Array Int Int))
+(declare-fun a () Int)
+(declare-fun i () Int)
+(assert (= all1 ((as const (Array Int Int)) 1)))
+(assert (= all2 ((as const (Array Int Int)) 2)))
+(assert (= all1 all2))
+(check-sat)
diff --git a/test/regress/regress0/boolean-prec.cvc b/test/regress/regress0/boolean-prec.cvc
deleted file mode 100644
index 07a2aa2f5..000000000
--- a/test/regress/regress0/boolean-prec.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of AND, <=>, NOT.
-
-A, B, C: BOOLEAN;
-
-QUERY (NOT A AND NOT B <=> C) <=> (((NOT A) AND (NOT B)) <=> C);
diff --git a/test/regress/regress0/boolean-prec.cvc.smt2 b/test/regress/regress0/boolean-prec.cvc.smt2
new file mode 100644
index 000000000..3758121ec
--- /dev/null
+++ b/test/regress/regress0/boolean-prec.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (= (and (not A) (not B)) C))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/boolean-terms.cvc b/test/regress/regress0/boolean-terms.cvc
deleted file mode 100644
index 00bcf3891..000000000
--- a/test/regress/regress0/boolean-terms.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% EXPECT: sat
-%OPTION "produce-models";
-
-f : BOOLEAN -> INT;
-x : INT;
-p : BOOLEAN -> BOOLEAN;
-
-ASSERT f(p(TRUE)) = x;
-ASSERT f(p(FALSE)) = x + 1;
-
-CHECKSAT;
-%GET_VALUE f(p(TRUE));
-%GET_VALUE f(p(TRUE)) = x;
-%GET_VALUE f(p(FALSE)) = x + 1;
-%COUNTERMODEL;
diff --git a/test/regress/regress0/boolean-terms.cvc.smt2 b/test/regress/regress0/boolean-terms.cvc.smt2
new file mode 100644
index 000000000..f63084f5c
--- /dev/null
+++ b/test/regress/regress0/boolean-terms.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun f (Bool) Int)
+(declare-fun x () Int)
+(declare-fun p (Bool) Bool)
+(assert (= (f (p true)) x))
+(assert (= (f (p false)) (+ x 1)))
+(check-sat)
diff --git a/test/regress/regress0/bug274.cvc b/test/regress/regress0/bug274.cvc
deleted file mode 100644
index c30f95550..000000000
--- a/test/regress/regress0/bug274.cvc
+++ /dev/null
@@ -1,64 +0,0 @@
-% EXPECT: unsat
-DATATYPE DT1 =
- DT1_a |
- DT1_b |
- DT1_c |
- DT1_d |
- DT1_e |
- DT1_f |
- DT1_g |
- DT1_h |
- DT1_i |
- DT1_j |
- DT1_k |
- DT1_l |
- DT1_m |
- DT1_n |
- DT1_o |
- DT1_p |
- DT1_q |
- DT1_r |
- DT1_s |
- DT1_t |
- DT1_u |
- DT1_v |
- DT1_w |
- DT1_x |
- DT1_y |
- DT1_z
-END;
-DATATYPE DT2 =
- DT2_a |
- DT2_b |
- DT2_c |
- DT2_d
-END;
-DATATYPE DT3 =
- DT3_a |
- DT3_b
-END;
-var1 : DT3;
-var2 : DT3;
-var3 : DT1;
-var4 : DT3;
-var5 : DT3;
-var6 : DT3;
-var7 : DT3;
-var8 : DT3;
-var9 : DT3;
-var10 : DT3;
-var11 : DT2;
-var12 : DT3;
-var13 : DT3;
-var14 : DT3;
-var16 : DT3;
-var17 : DT3;
-var18 : DT3;
-var20 : DT3;
-var21 : DT3;
-CHECKSAT
-(
- (((NOT(var13 = DT3_a)) AND (NOT(var10 = DT3_b))) AND (NOT((((((var7 = DT3_b) AND (var4 = DT3_b)) AND (var1 = DT3_a)) OR ((((var5 = DT3_a) AND (var17 = DT3_b)) OR ((var21 = DT3_b) AND ((var3 = DT1_f) OR (var3 = DT1_g)))) <=> (DT3_b = DT3_b))) OR (((var14 = DT3_a) AND (var2 = DT3_a)) AND (((((var8 = DT3_a) AND (var18 = DT3_b)) OR ((var6 = DT3_a) AND (var11 /= DT2_a))) OR (var20 = DT3_b)) OR (var9 = DT3_b)))) OR ((NOT(((((var7 = DT3_b) AND (var4 = DT3_b)) AND (var1 = DT3_a)) OR ((((var5 = DT3_a) AND (var17 = DT3_b)) OR ((var21 = DT3_b) AND ((var3 = DT1_f) OR (var3 = DT1_g)))) <=> (DT3_b = DT3_b))) OR (((var14 = DT3_a) AND (var2 = DT3_a)) AND (((((var8 = DT3_a) AND (var18 = DT3_b)) OR ((var6 = DT3_a) AND (var11 /= DT2_a))) OR (var20 = DT3_b)) OR (var9 = DT3_b))))) AND ((var14 = DT3_b) AND (TRUE))))))
- AND
- (NOT((var12 = DT3_a) OR ((var12 = DT3_b) AND ((var16 = DT3_b) OR (TRUE)))))
-);
diff --git a/test/regress/regress0/bug274.cvc.smt2 b/test/regress/regress0/bug274.cvc.smt2
new file mode 100644
index 000000000..035383601
--- /dev/null
+++ b/test/regress/regress0/bug274.cvc.smt2
@@ -0,0 +1,33 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental true)
+(declare-datatypes ((DT1 0)) (((DT1_a) (DT1_b) (DT1_c) (DT1_d) (DT1_e) (DT1_f) (DT1_g) (DT1_h) (DT1_i) (DT1_j) (DT1_k) (DT1_l) (DT1_m) (DT1_n) (DT1_o) (DT1_p) (DT1_q) (DT1_r) (DT1_s) (DT1_t) (DT1_u) (DT1_v) (DT1_w) (DT1_x) (DT1_y) (DT1_z))))
+(declare-datatypes ((DT2 0)) (((DT2_a) (DT2_b) (DT2_c) (DT2_d))))
+(declare-datatypes ((DT3 0)) (((DT3_a) (DT3_b))))
+(declare-fun var1 () DT3)
+(declare-fun var2 () DT3)
+(declare-fun var3 () DT1)
+(declare-fun var4 () DT3)
+(declare-fun var5 () DT3)
+(declare-fun var6 () DT3)
+(declare-fun var7 () DT3)
+(declare-fun var8 () DT3)
+(declare-fun var9 () DT3)
+(declare-fun var10 () DT3)
+(declare-fun var11 () DT2)
+(declare-fun var12 () DT3)
+(declare-fun var13 () DT3)
+(declare-fun var14 () DT3)
+(declare-fun var16 () DT3)
+(declare-fun var17 () DT3)
+(declare-fun var18 () DT3)
+(declare-fun var20 () DT3)
+(declare-fun var21 () DT3)
+(push 1)
+
+(assert (let ((_let_1 (or (or (and (and (= var7 DT3_b) (= var4 DT3_b)) (= var1 DT3_a)) (= (or (and (= var5 DT3_a) (= var17 DT3_b)) (and (= var21 DT3_b) (or (= var3 DT1_f) (= var3 DT1_g)))) (= DT3_b DT3_b))) (and (and (= var14 DT3_a) (= var2 DT3_a)) (or (or (or (and (= var8 DT3_a) (= var18 DT3_b)) (and (= var6 DT3_a) (not (= var11 DT2_a)))) (= var20 DT3_b)) (= var9 DT3_b)))))) (and (and (and (not (= var13 DT3_a)) (not (= var10 DT3_b))) (not (or _let_1 (and (not _let_1) (and (= var14 DT3_b) true))))) (not (or (= var12 DT3_a) (and (= var12 DT3_b) (or (= var16 DT3_b) true)))))))
+
+(check-sat)
+
+(pop 1)
+
diff --git a/test/regress/regress0/bug310.cvc b/test/regress/regress0/bug310.cvc
deleted file mode 100644
index 12cb80494..000000000
--- a/test/regress/regress0/bug310.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-% EXPECT: entailed
-b : BOOLEAN;
-DATATYPE D = c(s:INT) END;
-QUERY c(IF b THEN 1 ELSE 0 ENDIF) = IF b THEN c(1) ELSE c(0) ENDIF;
diff --git a/test/regress/regress0/bug310.cvc.smt2 b/test/regress/regress0/bug310.cvc.smt2
new file mode 100644
index 000000000..f2110a3f7
--- /dev/null
+++ b/test/regress/regress0/bug310.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun b () Bool)
+(declare-datatypes ((D 0)) (((c (s Int)))))
+(check-sat-assuming ( (not (= (c (ite b 1 0)) (ite b (c 1) (c 0)))) ))
diff --git a/test/regress/regress0/bug32.cvc b/test/regress/regress0/bug32.cvc
deleted file mode 100644
index 400f55885..000000000
--- a/test/regress/regress0/bug32.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-a:BOOLEAN;
-b:BOOLEAN;
-ASSERT(a);
-QUERY(a OR b);
-
diff --git a/test/regress/regress0/bug32.cvc.smt2 b/test/regress/regress0/bug32.cvc.smt2
new file mode 100644
index 000000000..d3aad1080
--- /dev/null
+++ b/test/regress/regress0/bug32.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(assert a)
+(check-sat-assuming ( (not (or a b)) ))
diff --git a/test/regress/regress0/bug322.cvc b/test/regress/regress0/bug322.cvc
deleted file mode 100644
index 27903708a..000000000
--- a/test/regress/regress0/bug322.cvc
+++ /dev/null
@@ -1,22 +0,0 @@
-% EXPECT: sat
-% Preamble --------------
-DATATYPE UNIT = Unit END;
-DATATYPE BOOL = Truth | Falsity END;
-
-% Decls --------------
-node$type: TYPE;
-value$type: TYPE;
-Nodes$elem$type: TYPE = node$type;
-Nodes$t$type: TYPE;
-node_pair_set$type: TYPE = ARRAY node$type OF ARRAY node$type OF BOOL;
-failure_pattern$type: TYPE = node_pair_set$type;
-is_faulty:(node$type, failure_pattern$type) -> BOOL = (LAMBDA (p: node$type,
- deliver: failure_pattern$type):
- (IF (EXISTS (q: node$type):
- (NOT ((((deliver)[
- (p)])[
- (q)]) =
- (Truth)))) THEN
- (Truth) ELSE (Falsity) ENDIF));
-
-CHECKSAT;
diff --git a/test/regress/regress0/bug322.cvc.smt2 b/test/regress/regress0/bug322.cvc.smt2
new file mode 100644
index 000000000..62c04579c
--- /dev/null
+++ b/test/regress/regress0/bug322.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((UNIT 0)) (((Unit))))
+(declare-datatypes ((BOOL 0)) (((Truth) (Falsity))))
+(declare-sort node$type 0)
+(declare-sort value$type 0)
+
+(declare-sort Nodes$t$type 0)
+
+
+(define-fun is_faulty ((p node$type) (deliver (Array node$type (Array node$type BOOL)))) BOOL (ite (exists ((q node$type)) (not (= (select (select deliver p) q) Truth))) Truth Falsity))
+(check-sat)
diff --git a/test/regress/regress0/bug322b.cvc b/test/regress/regress0/bug322b.cvc
deleted file mode 100644
index 0e06cbc13..000000000
--- a/test/regress/regress0/bug322b.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: entailed
-% EXPECT: entailed
-% EXPECT: entailed
-x : INT;
-y : INT = x + 1;
-z : INT = -10;
-identity : INT -> INT = LAMBDA(x:INT) : x;
-QUERY identity(x) = x;
-QUERY identity(y) > x;
-QUERY identity(z) = -10;
diff --git a/test/regress/regress0/bug322b.cvc.smt2 b/test/regress/regress0/bug322b.cvc.smt2
new file mode 100644
index 000000000..8f62ed398
--- /dev/null
+++ b/test/regress/regress0/bug322b.cvc.smt2
@@ -0,0 +1,12 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+(set-logic ALL)
+(declare-fun x () Int)
+(define-fun y () Int (+ x 1))
+(define-fun z () Int (- 10))
+(define-fun identity ((x Int)) Int x)
+(check-sat-assuming ( (not (= (identity x) x)) ))
+(check-sat-assuming ( (not (> (identity (+ x 1)) x)) ))
+(check-sat-assuming ( (not (let ((_let_1 (- 10))) (= (identity _let_1) _let_1))) ))
diff --git a/test/regress/regress0/bug486.cvc b/test/regress/regress0/bug486.cvc
deleted file mode 100644
index 665bcdafb..000000000
--- a/test/regress/regress0/bug486.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% COMMAND-LINE: --finite-model-find -i
-% EXPECT: not_entailed
-% EXPECT: entailed
-prin:TYPE;
-form:TYPE;
-
-signed:(prin,form)->BOOLEAN;
-says:(prin,form)->BOOLEAN;
-
-speaksfor:(prin,prin)->form;
-signedE:BOOLEAN = FORALL(x:prin,y:form) : signed(x,y) => says(x,y);
-saysE:BOOLEAN = FORALL(x,y:prin,z:form) : says(x,speaksfor(y,x)) AND says(y,z) => says(x,z);
-
-ASSERT(signedE);
-ASSERT(saysE);
-
-julie:prin;
-dave:prin;
-alice:prin;
-openfile:form;
-
-x2:BOOLEAN = signed(alice,openfile);
-ASSERT(x2);
-x3:BOOLEAN = signed(dave,speaksfor(alice,dave));
-ASSERT(x3);
-
-QUERY NOT says(dave,openfile); % this is invalid
-QUERY says(dave,openfile); % this is valid
diff --git a/test/regress/regress0/bug486.cvc.smt2 b/test/regress/regress0/bug486.cvc.smt2
new file mode 100644
index 000000000..a7b425449
--- /dev/null
+++ b/test/regress/regress0/bug486.cvc.smt2
@@ -0,0 +1,24 @@
+; COMMAND-LINE: --finite-model-find -i
+; EXPECT: sat
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental true)
+(declare-sort prin 0)
+(declare-sort form 0)
+(declare-fun signed (prin form) Bool)
+(declare-fun says (prin form) Bool)
+(declare-fun speaksfor (prin prin) form)
+(define-fun signedE () Bool (forall ((x prin) (y form)) (=> (signed x y) (says x y))))
+(define-fun saysE () Bool (forall ((x prin) (y prin) (z form)) (=> (and (says x (speaksfor y x)) (says y z)) (says x z))))
+(assert (forall ((x prin) (y form)) (=> (signed x y) (says x y))))
+(assert (forall ((x prin) (y prin) (z form)) (=> (and (says x (speaksfor y x)) (says y z)) (says x z))))
+(declare-fun julie () prin)
+(declare-fun dave () prin)
+(declare-fun alice () prin)
+(declare-fun openfile () form)
+(define-fun x2 () Bool (signed alice openfile))
+(assert (signed alice openfile))
+(define-fun x3 () Bool (signed dave (speaksfor alice dave)))
+(assert (signed dave (speaksfor alice dave)))
+(check-sat-assuming ( (not (not (says dave openfile))) ))
+(check-sat-assuming ( (not (says dave openfile)) ))
diff --git a/test/regress/regress0/bug586.cvc b/test/regress/regress0/bug586.cvc
deleted file mode 100644
index 7f6f247ee..000000000
--- a/test/regress/regress0/bug586.cvc
+++ /dev/null
@@ -1,26 +0,0 @@
-% EXPECT: sat
-%%%
-%%% DATA TYPES DEFINITIONS
-%%%
-
-%%% the roles
-DATATYPE
- role = r1 | r2 | r3
- %%% adding two more roles ( | r4 | r5 ) to the type, but never referring to them make things work
-END;
-
-%%% structured datatypes
-roleSet: TYPE = SET OF role;
-roleGammaSet: TYPE = [# pos: roleSet, neg: roleSet #];
-delta: TYPE = ARRAY role OF roleGammaSet;
-
-emptyRoleSet : roleSet;
-ASSERT emptyRoleSet = {} :: SET OF role;
-
-d: delta;
-ASSERT d[r3].pos = {r1};
-ASSERT d[r2].pos = {r2,r3};
-ASSERT d[r2].neg = {r1};
-
-CHECKSAT;
-%COUNTEREXAMPLE;
diff --git a/test/regress/regress0/bug586.cvc.smt2 b/test/regress/regress0/bug586.cvc.smt2
new file mode 100644
index 000000000..be5feea1c
--- /dev/null
+++ b/test/regress/regress0/bug586.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((role 0)) (((r1) (r2) (r3))))
+
+(declare-datatypes ((|__cvc5_record_pos_(Set role)_neg_(Set role)| 0)) (((|__cvc5_record_pos_(Set role)_neg_(Set role)_ctor| (pos (Set role)) (neg (Set role))))))
+
+
+(declare-fun emptyRoleSet () (Set role))
+(assert (= emptyRoleSet (as emptyset (Set role))))
+(declare-fun d () (Array role |__cvc5_record_pos_(Set role)_neg_(Set role)|))
+(assert (= (pos (select d r3)) (singleton r1)))
+(assert (= (pos (select d r2)) (union (singleton r2) (singleton r3))))
+(assert (= (neg (select d r2)) (singleton r1)))
+(check-sat)
diff --git a/test/regress/regress0/bug595.cvc b/test/regress/regress0/bug595.cvc
deleted file mode 100644
index c11cfb6e4..000000000
--- a/test/regress/regress0/bug595.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: sat
-
-f : INT -> [# i:INT, b:INT #];
-a : INT;
-ASSERT f(a) /= (# i := 0, b := 0 #);
-
-CHECKSAT;
diff --git a/test/regress/regress0/bug595.cvc.smt2 b/test/regress/regress0/bug595.cvc.smt2
new file mode 100644
index 000000000..6a3bfdd0c
--- /dev/null
+++ b/test/regress/regress0/bug595.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((__cvc5_record_i_Int_b_Int 0)) (((__cvc5_record_i_Int_b_Int_ctor (i Int) (b Int)))))
+(declare-fun f (Int) __cvc5_record_i_Int_b_Int)
+(declare-fun a () Int)
+(assert (not (= (f a) (__cvc5_record_i_Int_b_Int_ctor 0 0))))
+(check-sat)
diff --git a/test/regress/regress0/bug596.cvc b/test/regress/regress0/bug596.cvc
deleted file mode 100644
index 8e1f6f7e3..000000000
--- a/test/regress/regress0/bug596.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: sat
-
-f : INT -> [# i:INT, b:BOOLEAN #];
-a : INT;
-ASSERT f(a) /= (# i := 0, b := FALSE #);
-
-CHECKSAT;
diff --git a/test/regress/regress0/bug596.cvc.smt2 b/test/regress/regress0/bug596.cvc.smt2
new file mode 100644
index 000000000..4c5115b2e
--- /dev/null
+++ b/test/regress/regress0/bug596.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((__cvc5_record_i_Int_b_Bool 0)) (((__cvc5_record_i_Int_b_Bool_ctor (i Int) (b Bool)))))
+(declare-fun f (Int) __cvc5_record_i_Int_b_Bool)
+(declare-fun a () Int)
+(assert (not (= (f a) (__cvc5_record_i_Int_b_Bool_ctor 0 false))))
+(check-sat)
diff --git a/test/regress/regress0/bug596b.cvc b/test/regress/regress0/bug596b.cvc
deleted file mode 100644
index 4765e03b2..000000000
--- a/test/regress/regress0/bug596b.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: sat
-
-f : INT -> [ INT, BOOLEAN ];
-a : INT;
-ASSERT f(a) /= ( 0, FALSE );
-
-CHECKSAT;
diff --git a/test/regress/regress0/bug596b.cvc.smt2 b/test/regress/regress0/bug596b.cvc.smt2
new file mode 100644
index 000000000..120966bf0
--- /dev/null
+++ b/test/regress/regress0/bug596b.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun f (Int) (Tuple Int Bool))
+(declare-fun a () Int)
+(assert (not (= (f a) (mkTuple 0 false))))
+(check-sat)
diff --git a/test/regress/regress0/bug605.cvc b/test/regress/regress0/bug605.cvc
deleted file mode 100644
index 564464931..000000000
--- a/test/regress/regress0/bug605.cvc
+++ /dev/null
@@ -1,30 +0,0 @@
-% EXPECT: sat
-OPTION "produce-models";
-
-% GeoLocation
-GeoLocation: TYPE = [# longitude: INT, latitude: INT #];
-
-% Stationary object
-StationaryObject: TYPE = [# geoLoc: SET OF GeoLocation #];
-Facet: TYPE = [# base: StationaryObject #];
-
-Segment: TYPE = [# s_f: Facet #];
-A : TYPE = ARRAY INT OF Segment;
-a : A;
-
-p1: GeoLocation = (# longitude := 0, latitude := 0 #);
-
-s1: StationaryObject = (# geoLoc := {p1} #);
-
-
-f0: Facet = (# base := s1 #);
-
-
-init: (A, INT, Facet) -> BOOLEAN
- = LAMBDA (v: A, i: INT, f: Facet):
- v[0].s_f = f;
-
-
-ASSERT (init(a, 2, f0));
-
-CHECKSAT TRUE;
diff --git a/test/regress/regress0/bug605.cvc.smt2 b/test/regress/regress0/bug605.cvc.smt2
new file mode 100644
index 000000000..eb8b92454
--- /dev/null
+++ b/test/regress/regress0/bug605.cvc.smt2
@@ -0,0 +1,27 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental true)
+(set-option :produce-models true)
+(declare-datatypes ((__cvc5_record_longitude_Int_latitude_Int 0)) (((__cvc5_record_longitude_Int_latitude_Int_ctor (longitude Int) (latitude Int)))))
+
+(declare-datatypes ((|__cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)| 0)) (((|__cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_ctor| (geoLoc (Set __cvc5_record_longitude_Int_latitude_Int))))))
+
+(declare-datatypes ((|__cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_| 0)) (((|__cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)__ctor| (base |__cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)|)))))
+
+(declare-datatypes ((|__cvc5_record_s_f____cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)__| 0)) (((|__cvc5_record_s_f____cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)___ctor| (s_f |__cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_|)))))
+
+
+(declare-fun a () (Array Int |__cvc5_record_s_f____cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)__|))
+(define-fun p1 () __cvc5_record_longitude_Int_latitude_Int (__cvc5_record_longitude_Int_latitude_Int_ctor 0 0))
+(define-fun s1 () |__cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)| (|__cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_ctor| (singleton (__cvc5_record_longitude_Int_latitude_Int_ctor 0 0))))
+(define-fun f0 () |__cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_| (|__cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)__ctor| (|__cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_ctor| (singleton (__cvc5_record_longitude_Int_latitude_Int_ctor 0 0)))))
+(define-fun init ((v (Array Int |__cvc5_record_s_f____cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)__|)) (i Int) (f |__cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_|)) Bool (= (s_f (select v 0)) f))
+(assert (init a 2 (|__cvc5_record_base____cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)__ctor| (|__cvc5_record_geoLoc_(Set __cvc5_record_longitude_Int_latitude_Int)_ctor| (singleton (__cvc5_record_longitude_Int_latitude_Int_ctor 0 0))))))
+(push 1)
+
+(assert true)
+
+(check-sat)
+
+(pop 1)
+
diff --git a/test/regress/regress0/bv/bvcomp.cvc b/test/regress/regress0/bv/bvcomp.cvc
deleted file mode 100644
index 17064a2f2..000000000
--- a/test/regress/regress0/bv/bvcomp.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: entailed
-
-x : BITVECTOR(10);
-
-QUERY x /= ~x;
diff --git a/test/regress/regress0/bv/bvcomp.cvc.smt2 b/test/regress/regress0/bv/bvcomp.cvc.smt2
new file mode 100644
index 000000000..040ce36e2
--- /dev/null
+++ b/test/regress/regress0/bv/bvcomp.cvc.smt2
@@ -0,0 +1,5 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (_ BitVec 10))
+(check-sat-assuming ( (= x (bvnot x)) ))
diff --git a/test/regress/regress0/bv/bvsimple.cvc b/test/regress/regress0/bv/bvsimple.cvc
deleted file mode 100644
index 6bc649a03..000000000
--- a/test/regress/regress0/bv/bvsimple.cvc
+++ /dev/null
@@ -1,46 +0,0 @@
-% EXPECT: entailed
-
-% Some tests from the CVC3 user manual.
-% http://www.cs.nyu.edu/acsys/cvc3/doc/user_doc.html
-
-x : BITVECTOR(5);
-y : BITVECTOR(4);
-yy : BITVECTOR(3);
-
-bv : BITVECTOR(10);
-a : BOOLEAN;
-
-xx : BITVECTOR(8);
-zz : BITVECTOR(12);
-
-x4, y4 : BITVECTOR(4);
-
-QUERY
-( 0bin0000111101010000 = 0hex0f50 ) AND
-( 0bin01@0bin0 = 0bin010 ) AND
-( 0bin1000 >> 3 = 0bin0001 ) AND
-( 0bin0011 << 3 = 0bin0011000 ) AND
-( 0bin1000 >> 3 = 0bin0001 ) AND
-
-( BVZEROEXTEND(0bin100, 2) = 0bin00100 ) AND
-( SX(0bin100, 5) = 0bin11100 ) AND
-
-( BVZEROEXTEND(0bin100, 0) = 0bin100 ) AND
-( SX(0bin100, 3) = 0bin100 ) AND
-
-( (BVPLUS(9, x@0bin0000, (0bin000@(~y)@0bin11)))[8:4] = BVPLUS(5, x, ~(y[3:2])) ) AND
-
-( x4 = 0hex5 AND y4 = 0bin0101 ) =>
-( ( BVMULT(8,x4,y4)=BVMULT(8,y4,x4) ) AND
- ( NOT(BVLT(x4,y4)) ) AND
- ( BVLE(BVSUB(8,x4,y4), BVPLUS(8, x4, BVUMINUS(x4))) ) AND
- ( x4 = BVSUB(4, BVUMINUS(x4), BVPLUS(4, x4,0hex1)) ) ) AND
-
-( 0bin01100000[5:3]=(0bin1111001@bv[0:0])[4:2] ) AND
-( 0bin1@(IF a THEN 0bin0 ELSE 0bin1 ENDIF) = (IF a THEN 0bin110 ELSE 0bin011 ENDIF)[1:0] ) AND
-
-( xx = 0hexff AND zz = 0hexff0 =>
- ( zz = xx << 4 ) AND
- ( (zz >> 4)[7:0] = xx ) ) AND
-
-TRUE;
diff --git a/test/regress/regress0/bv/bvsimple.cvc.smt2 b/test/regress/regress0/bv/bvsimple.cvc.smt2
new file mode 100644
index 000000000..e12c5857e
--- /dev/null
+++ b/test/regress/regress0/bv/bvsimple.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (_ BitVec 5))
+(declare-fun y () (_ BitVec 4))
+(declare-fun yy () (_ BitVec 3))
+(declare-fun bv () (_ BitVec 10))
+(declare-fun a () Bool)
+(declare-fun xx () (_ BitVec 8))
+(declare-fun zz () (_ BitVec 12))
+(declare-fun x4 () (_ BitVec 4))
+(declare-fun y4 () (_ BitVec 4))
+(check-sat-assuming ( (not (let ((_let_1 (bvneg x4))) (let ((_let_2 ((_ zero_extend 4) x4))) (let ((_let_3 ((_ zero_extend 4) y4))) (let ((_let_4 (= (concat #b000 ((_ extract 3 3) #b1000)) #b0001))) (=> (and (and (and (and (and (and (and (and (and (and (= #b0000111101010000 #b0000111101010000) (= (concat #b01 #b0) #b010)) _let_4) (= (concat #b0011 #b000) #b0011000)) _let_4) (= ((_ zero_extend 2) #b100) #b00100)) (= ((_ sign_extend 2) #b100) #b11100)) (= ((_ zero_extend 0) #b100) #b100)) (= ((_ sign_extend 0) #b100) #b100)) (= ((_ extract 8 4) (bvadd (concat x #b0000) (concat (concat #b000 (bvnot y)) #b11))) (bvadd x ((_ zero_extend 3) (bvnot ((_ extract 3 2) y)))))) (and (= x4 #b0101) (= y4 #b0101))) (and (and (and (and (and (and (and (= (bvmul _let_2 _let_3) (bvmul _let_3 _let_2)) (not (bvult x4 y4))) (bvule (bvsub _let_2 _let_3) (bvadd _let_2 ((_ zero_extend 4) _let_1)))) (= x4 (bvsub _let_1 (bvadd x4 #b0001)))) (= ((_ extract 5 3) #b01100000) ((_ extract 4 2) (concat #b1111001 ((_ extract 0 0) bv))))) (= (concat #b1 (ite a #b0 #b1)) ((_ extract 1 0) (ite a #b110 #b011)))) (=> (and (= xx #b11111111) (= zz #b111111110000)) (and (= zz (concat xx #b0000)) (= ((_ extract 7 0) (concat #b0000 ((_ extract 11 4) zz))) xx)))) true))))))) ))
diff --git a/test/regress/regress0/bv/div_mod.cvc b/test/regress/regress0/bv/div_mod.cvc
deleted file mode 100644
index 3f31bdd70..000000000
--- a/test/regress/regress0/bv/div_mod.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: entailed
-
-x : BITVECTOR(4);
-
-QUERY
-( BVUDIV(x, 0bin0000) = 0bin1111 ) AND
-( BVUREM(x, 0bin0000) = x ) AND
-( BVSDIV(x, 0bin0000) = 0bin1111 OR BVSDIV(x, 0bin0000) = 0bin0001 ) AND
-( BVSREM(x, 0bin0000) = x ) AND
-( BVSMOD(x, 0bin0000) = x );
diff --git a/test/regress/regress0/bv/div_mod.cvc.smt2 b/test/regress/regress0/bv/div_mod.cvc.smt2
new file mode 100644
index 000000000..be61e155a
--- /dev/null
+++ b/test/regress/regress0/bv/div_mod.cvc.smt2
@@ -0,0 +1,5 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (_ BitVec 4))
+(check-sat-assuming ( (not (let ((_let_1 (bvsdiv x #b0000))) (and (and (and (and (= (bvudiv x #b0000) #b1111) (= (bvurem x #b0000) x)) (or (= _let_1 #b1111) (= _let_1 #b0001))) (= (bvsrem x #b0000) x)) (= (bvsmod x #b0000) x)))) ))
diff --git a/test/regress/regress0/bv/sizecheck.cvc b/test/regress/regress0/bv/sizecheck.cvc
deleted file mode 100644
index 3f8449068..000000000
--- a/test/regress/regress0/bv/sizecheck.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-x : BITVECTOR(10);
-y : BITVECTOR(12);
-
-ASSERT (0bin0001000000000000 = BVPLUS(16, x, y));
-CHECKSAT;
-% EXPECT: sat
diff --git a/test/regress/regress0/bv/sizecheck.cvc.smt2 b/test/regress/regress0/bv/sizecheck.cvc.smt2
new file mode 100644
index 000000000..08573aa46
--- /dev/null
+++ b/test/regress/regress0/bv/sizecheck.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (_ BitVec 10))
+(declare-fun y () (_ BitVec 12))
+(assert (= #b0001000000000000 (bvadd ((_ zero_extend 6) x) ((_ zero_extend 4) y))))
+(check-sat)
diff --git a/test/regress/regress0/cvc-rerror-print.cvc b/test/regress/regress0/cvc-rerror-print.cvc
deleted file mode 100644
index 728db28d8..000000000
--- a/test/regress/regress0/cvc-rerror-print.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-% EXPECT: Cannot get model unless after a SAT or unknown response.
-OPTION "logic" "ALL";
-OPTION "produce-models" true;
-x : INT;
-QUERY x = x;
-COUNTEREXAMPLE;
diff --git a/test/regress/regress0/cvc-rerror-print.cvc.smt2 b/test/regress/regress0/cvc-rerror-print.cvc.smt2
new file mode 100644
index 000000000..03ba7c91c
--- /dev/null
+++ b/test/regress/regress0/cvc-rerror-print.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+; EXPECT: (error "Cannot get model unless after a SAT or unknown response.")
+(set-option :incremental false)
+(set-logic ALL)
+(set-option :produce-models true)
+(declare-fun x () Int)
+(check-sat-assuming ( (not (= x x)) ))
+(get-model)
diff --git a/test/regress/regress0/cvc3-bug15.cvc b/test/regress/regress0/cvc3-bug15.cvc
deleted file mode 100644
index 779a2eab4..000000000
--- a/test/regress/regress0/cvc3-bug15.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-%% This test borrowed from CVC3 regressions, bug15.cvc
-% EXPECT: entailed
-x : REAL;
-y : REAL;
-f : REAL -> REAL;
-ASSERT ((x > y) => f(x) > f (y));
-ASSERT (x = 3);
-ASSERT (y = 2);
-QUERY(f(x) > f (y));
diff --git a/test/regress/regress0/cvc3-bug15.cvc.smt2 b/test/regress/regress0/cvc3-bug15.cvc.smt2
new file mode 100644
index 000000000..e7566d495
--- /dev/null
+++ b/test/regress/regress0/cvc3-bug15.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(declare-fun f (Real) Real)
+(assert (=> (> x y) (> (f x) (f y))))
+(assert (= x 3))
+(assert (= y 2))
+(check-sat-assuming ( (not (> (f x) (f y))) ))
diff --git a/test/regress/regress0/cvc3.userdoc.01.cvc b/test/regress/regress0/cvc3.userdoc.01.cvc
deleted file mode 100644
index e3e9aaf0a..000000000
--- a/test/regress/regress0/cvc3.userdoc.01.cvc
+++ /dev/null
@@ -1,31 +0,0 @@
-% COMMAND-LINE: --incremental
-
-% EXPECT: entailed
-QUERY 0bin0000111101010000 = 0hex0f50;
-
-% EXPECT: entailed
-QUERY 0bin01@0bin0 = 0bin010;
-
-% EXPECT: entailed
-QUERY 0bin0011[3:1] = 0bin001;
-
-% EXPECT: entailed
-QUERY 0bin0011 << 3 = 0bin0011000;
-
-% EXPECT: entailed
-QUERY 0bin1000 >> 3 = 0bin0001;
-
-% EXPECT: entailed
-QUERY SX(0bin100, 5) = 0bin11100;
-
-% EXPECT: entailed
-QUERY BVZEROEXTEND(0bin1,3) = 0bin0001;
-
-% EXPECT: entailed
-QUERY BVREPEAT(0bin10,3) = 0bin101010;
-
-% EXPECT: entailed
-QUERY BVROTL(0bin101,1) = 0bin011;
-
-% EXPECT: entailed
-QUERY BVROTR(0bin101,1) = 0bin110;
diff --git a/test/regress/regress0/cvc3.userdoc.01.cvc.smt2 b/test/regress/regress0/cvc3.userdoc.01.cvc.smt2
new file mode 100644
index 000000000..bf6436e18
--- /dev/null
+++ b/test/regress/regress0/cvc3.userdoc.01.cvc.smt2
@@ -0,0 +1,22 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+(set-logic ALL)
+(check-sat-assuming ( (not (= #b0000111101010000 #b0000111101010000)) ))
+(check-sat-assuming ( (not (= (concat #b01 #b0) #b010)) ))
+(check-sat-assuming ( (not (= ((_ extract 3 1) #b0011) #b001)) ))
+(check-sat-assuming ( (not (= (concat #b0011 #b000) #b0011000)) ))
+(check-sat-assuming ( (not (= (concat #b000 ((_ extract 3 3) #b1000)) #b0001)) ))
+(check-sat-assuming ( (not (= ((_ sign_extend 2) #b100) #b11100)) ))
+(check-sat-assuming ( (not (= ((_ zero_extend 3) #b1) #b0001)) ))
+(check-sat-assuming ( (not (= ((_ repeat 3) #b10) #b101010)) ))
+(check-sat-assuming ( (not (= ((_ rotate_left 1) #b101) #b011)) ))
+(check-sat-assuming ( (not (= ((_ rotate_right 1) #b101) #b110)) ))
diff --git a/test/regress/regress0/cvc3.userdoc.02.cvc b/test/regress/regress0/cvc3.userdoc.02.cvc
deleted file mode 100644
index e143ea275..000000000
--- a/test/regress/regress0/cvc3.userdoc.02.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-x : BITVECTOR(5);
-y : BITVECTOR(4);
-yy : BITVECTOR(3);
-
-% EXPECT: entailed
-QUERY
- BVPLUS(9, x@0bin0000, (0bin000@(~y)@0bin11))[8:4] = BVPLUS(5, x, ~(y[3:2])) ;
diff --git a/test/regress/regress0/cvc3.userdoc.02.cvc.smt2 b/test/regress/regress0/cvc3.userdoc.02.cvc.smt2
new file mode 100644
index 000000000..f10db67b4
--- /dev/null
+++ b/test/regress/regress0/cvc3.userdoc.02.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (_ BitVec 5))
+(declare-fun y () (_ BitVec 4))
+(declare-fun yy () (_ BitVec 3))
+(check-sat-assuming ( (not (= ((_ extract 8 4) (bvadd (concat x #b0000) (concat (concat #b000 (bvnot y)) #b11))) (bvadd x ((_ zero_extend 3) (bvnot ((_ extract 3 2) y)))))) ))
diff --git a/test/regress/regress0/cvc3.userdoc.03.cvc b/test/regress/regress0/cvc3.userdoc.03.cvc
deleted file mode 100644
index 3b3829ebc..000000000
--- a/test/regress/regress0/cvc3.userdoc.03.cvc
+++ /dev/null
@@ -1,8 +0,0 @@
-bv : BITVECTOR(10);
-a : BOOLEAN;
-
-% EXPECT: entailed
-QUERY
- 0bin01100000[5:3]=(0bin1111001@bv[0:0])[4:2]
- AND
- 0bin1@(IF a THEN 0bin0 ELSE 0bin1 ENDIF) = (IF a THEN 0bin110 ELSE 0bin011 ENDIF)[1:0] ;
diff --git a/test/regress/regress0/cvc3.userdoc.03.cvc.smt2 b/test/regress/regress0/cvc3.userdoc.03.cvc.smt2
new file mode 100644
index 000000000..c9c7e8733
--- /dev/null
+++ b/test/regress/regress0/cvc3.userdoc.03.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun bv () (_ BitVec 10))
+(declare-fun a () Bool)
+(check-sat-assuming ( (not (and (= ((_ extract 5 3) #b01100000) ((_ extract 4 2) (concat #b1111001 ((_ extract 0 0) bv)))) (= (concat #b1 (ite a #b0 #b1)) ((_ extract 1 0) (ite a #b110 #b011))))) ))
diff --git a/test/regress/regress0/cvc3.userdoc.04.cvc b/test/regress/regress0/cvc3.userdoc.04.cvc
deleted file mode 100644
index da8b1e82c..000000000
--- a/test/regress/regress0/cvc3.userdoc.04.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-x, y, z, t, q : BITVECTOR(1024);
-
-ASSERT x = ~x;
-ASSERT x&y&t&z&q = x;
-ASSERT x|y = t;
-ASSERT BVXOR(x,~x) = t;
-
-% EXPECT: entailed
-QUERY FALSE;
diff --git a/test/regress/regress0/cvc3.userdoc.04.cvc.smt2 b/test/regress/regress0/cvc3.userdoc.04.cvc.smt2
new file mode 100644
index 000000000..81edf02e0
--- /dev/null
+++ b/test/regress/regress0/cvc3.userdoc.04.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (_ BitVec 1024))
+(declare-fun y () (_ BitVec 1024))
+(declare-fun z () (_ BitVec 1024))
+(declare-fun t () (_ BitVec 1024))
+(declare-fun q () (_ BitVec 1024))
+(assert (= x (bvnot x)))
+(assert (= (bvand (bvand (bvand (bvand x y) t) z) q) x))
+(assert (= (bvor x y) t))
+(assert (= (bvxor x (bvnot x)) t))
+(check-sat)
diff --git a/test/regress/regress0/cvc3.userdoc.05.cvc b/test/regress/regress0/cvc3.userdoc.05.cvc
deleted file mode 100644
index 85e0c2105..000000000
--- a/test/regress/regress0/cvc3.userdoc.05.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-x, y : BITVECTOR(4);
-
-ASSERT x = 0hex5;
-ASSERT y = 0bin0101;
-
-% EXPECT: entailed
-QUERY
- BVMULT(8,x,y)=BVMULT(8,y,x)
- AND
- NOT(BVLT(x,y))
- AND
- BVLE(BVSUB(8,x,y), BVPLUS(8, x, BVUMINUS(x)))
- AND
- x = BVSUB(4, BVUMINUS(x), BVPLUS(4, x,0hex1)) ;
diff --git a/test/regress/regress0/cvc3.userdoc.05.cvc.smt2 b/test/regress/regress0/cvc3.userdoc.05.cvc.smt2
new file mode 100644
index 000000000..d72acbc57
--- /dev/null
+++ b/test/regress/regress0/cvc3.userdoc.05.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (_ BitVec 4))
+(declare-fun y () (_ BitVec 4))
+(assert (= x #b0101))
+(assert (= y #b0101))
+(check-sat-assuming ( (not (let ((_let_1 (bvneg x))) (let ((_let_2 ((_ zero_extend 4) x))) (let ((_let_3 ((_ zero_extend 4) y))) (and (and (and (= (bvmul _let_2 _let_3) (bvmul _let_3 _let_2)) (not (bvult x y))) (bvule (bvsub _let_2 _let_3) (bvadd _let_2 ((_ zero_extend 4) _let_1)))) (= x (bvsub _let_1 (bvadd x #b0001)))))))) ))
diff --git a/test/regress/regress0/cvc3.userdoc.06.cvc b/test/regress/regress0/cvc3.userdoc.06.cvc
deleted file mode 100644
index 3968365ad..000000000
--- a/test/regress/regress0/cvc3.userdoc.06.cvc
+++ /dev/null
@@ -1,13 +0,0 @@
-% COMMAND-LINE: --incremental
-
-x, y : BITVECTOR(8);
-z, t : BITVECTOR(12);
-
-ASSERT x = 0hexff;
-ASSERT z = 0hexff0;
-
-% EXPECT: entailed
-QUERY z = x << 4;
-
-% EXPECT: entailed
-QUERY (z >> 4)[7:0] = x;
diff --git a/test/regress/regress0/cvc3.userdoc.06.cvc.smt2 b/test/regress/regress0/cvc3.userdoc.06.cvc.smt2
new file mode 100644
index 000000000..19261429d
--- /dev/null
+++ b/test/regress/regress0/cvc3.userdoc.06.cvc.smt2
@@ -0,0 +1,12 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: unsat
+(set-logic ALL)
+(declare-fun x () (_ BitVec 8))
+(declare-fun y () (_ BitVec 8))
+(declare-fun z () (_ BitVec 12))
+(declare-fun t () (_ BitVec 12))
+(assert (= x #b11111111))
+(assert (= z #b111111110000))
+(check-sat-assuming ( (not (= z (concat x #b0000))) ))
+(check-sat-assuming ( (not (= ((_ extract 7 0) (concat #b0000 ((_ extract 11 4) z))) x)) ))
diff --git a/test/regress/regress0/datatypes/Test1-tup-mp.cvc b/test/regress/regress0/datatypes/Test1-tup-mp.cvc
deleted file mode 100644
index 6f49496f3..000000000
--- a/test/regress/regress0/datatypes/Test1-tup-mp.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-TEST : TYPE = INT -> [INT, INT];
-
-test: TEST;
-
-ASSERT test(5) = (2, 3);
-ASSERT test(7) = (3, 4);
-
-CHECKSAT;
-
diff --git a/test/regress/regress0/datatypes/Test1-tup-mp.cvc.smt2 b/test/regress/regress0/datatypes/Test1-tup-mp.cvc.smt2
new file mode 100644
index 000000000..87847d635
--- /dev/null
+++ b/test/regress/regress0/datatypes/Test1-tup-mp.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+
+(declare-fun test (Int) (Tuple Int Int))
+(assert (= (test 5) (mkTuple 2 3)))
+(assert (= (test 7) (mkTuple 3 4)))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/boolean-equality.cvc b/test/regress/regress0/datatypes/boolean-equality.cvc
deleted file mode 100644
index e4eec648a..000000000
--- a/test/regress/regress0/datatypes/boolean-equality.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: sat
-
-x : [# b:BOOLEAN #];
-
-ASSERT x = x;
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/boolean-equality.cvc.smt2 b/test/regress/regress0/datatypes/boolean-equality.cvc.smt2
new file mode 100644
index 000000000..5c042a784
--- /dev/null
+++ b/test/regress/regress0/datatypes/boolean-equality.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((__cvc5_record_b_Bool 0)) (((__cvc5_record_b_Bool_ctor (b Bool)))))
+(declare-fun x () __cvc5_record_b_Bool)
+(assert (= x x))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/boolean-terms-datatype.cvc b/test/regress/regress0/datatypes/boolean-terms-datatype.cvc
deleted file mode 100644
index f20d11b82..000000000
--- a/test/regress/regress0/datatypes/boolean-terms-datatype.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-
-DATATYPE List =
- cons(car:BOOLEAN, cdr:List) | nil
-END;
-
-x : List;
-
-ASSERT x /= nil;
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/boolean-terms-datatype.cvc.smt2 b/test/regress/regress0/datatypes/boolean-terms-datatype.cvc.smt2
new file mode 100644
index 000000000..f6be4e83c
--- /dev/null
+++ b/test/regress/regress0/datatypes/boolean-terms-datatype.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((List 0)) (((cons (car Bool) (cdr List)) (nil))))
+(declare-fun x () List)
+(assert (not (= x nil)))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc b/test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc
deleted file mode 100644
index 62c0dd578..000000000
--- a/test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc
+++ /dev/null
@@ -1,12 +0,0 @@
-% EXPECT: sat
-
-DATATYPE RightistTree[T] =
- node(left:BOOLEAN, right:RightistTree[T]) |
- leaf(data:T)
-END;
-
-x : RightistTree[INT];
-
-ASSERT x /= leaf(0);
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc.smt2 b/test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc.smt2
new file mode 100644
index 000000000..4bb34de1f
--- /dev/null
+++ b/test/regress/regress0/datatypes/boolean-terms-parametric-datatype-1.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((RightistTree 1)) ((par (T)((node (left Bool) (right (RightistTree T))) (leaf (data T))))))
+(declare-fun x () (RightistTree Int))
+(assert (not (= x (leaf 0))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/boolean-terms-record.cvc b/test/regress/regress0/datatypes/boolean-terms-record.cvc
deleted file mode 100644
index 4dc0dd78d..000000000
--- a/test/regress/regress0/datatypes/boolean-terms-record.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: sat
-
-x : [# i:INT, b:BOOLEAN #];
-
-ASSERT x /= (# i := 0, b := FALSE #);
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/boolean-terms-record.cvc.smt2 b/test/regress/regress0/datatypes/boolean-terms-record.cvc.smt2
new file mode 100644
index 000000000..2073101d0
--- /dev/null
+++ b/test/regress/regress0/datatypes/boolean-terms-record.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((__cvc5_record_i_Int_b_Bool 0)) (((__cvc5_record_i_Int_b_Bool_ctor (i Int) (b Bool)))))
+(declare-fun x () __cvc5_record_i_Int_b_Bool)
+(assert (not (= x (__cvc5_record_i_Int_b_Bool_ctor 0 false))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/boolean-terms-rewrite.cvc b/test/regress/regress0/datatypes/boolean-terms-rewrite.cvc
deleted file mode 100644
index 9f828b248..000000000
--- a/test/regress/regress0/datatypes/boolean-terms-rewrite.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: sat
-
-x : [# b:BITVECTOR(1) #];
-
-ASSERT FALSE = ((x = (# b := 0bin0 #)) = (x = (# b := 0bin1 #)));
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/boolean-terms-rewrite.cvc.smt2 b/test/regress/regress0/datatypes/boolean-terms-rewrite.cvc.smt2
new file mode 100644
index 000000000..f9c8a3270
--- /dev/null
+++ b/test/regress/regress0/datatypes/boolean-terms-rewrite.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((|__cvc5_record_b_(_ BitVec 1)| 0)) (((|__cvc5_record_b_(_ BitVec 1)_ctor| (b (_ BitVec 1))))))
+(declare-fun x () |__cvc5_record_b_(_ BitVec 1)|)
+(assert (= false (= (= x (|__cvc5_record_b_(_ BitVec 1)_ctor| #b0)) (= x (|__cvc5_record_b_(_ BitVec 1)_ctor| #b1)))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/boolean-terms-tuple.cvc b/test/regress/regress0/datatypes/boolean-terms-tuple.cvc
deleted file mode 100644
index 5704e7d1a..000000000
--- a/test/regress/regress0/datatypes/boolean-terms-tuple.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: sat
-
-x : [ INT, BOOLEAN ];
-
-ASSERT x /= ( 0, FALSE );
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/boolean-terms-tuple.cvc.smt2 b/test/regress/regress0/datatypes/boolean-terms-tuple.cvc.smt2
new file mode 100644
index 000000000..7f391b719
--- /dev/null
+++ b/test/regress/regress0/datatypes/boolean-terms-tuple.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (Tuple Int Bool))
+(assert (not (= x (mkTuple 0 false))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/bug286.cvc b/test/regress/regress0/datatypes/bug286.cvc
deleted file mode 100644
index 33a320acd..000000000
--- a/test/regress/regress0/datatypes/bug286.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: not_entailed
-DATATYPE foo = f(i:INT) END;
-x : foo;
-y : INT;
-QUERY x = f(y);
diff --git a/test/regress/regress0/datatypes/bug286.cvc.smt2 b/test/regress/regress0/datatypes/bug286.cvc.smt2
new file mode 100644
index 000000000..139e70cab
--- /dev/null
+++ b/test/regress/regress0/datatypes/bug286.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((foo 0)) (((f (i Int)))))
+(declare-fun x () foo)
+(declare-fun y () Int)
+(check-sat-assuming ( (not (= x (f y))) ))
diff --git a/test/regress/regress0/datatypes/bug438.cvc b/test/regress/regress0/datatypes/bug438.cvc
deleted file mode 100644
index 8326b8149..000000000
--- a/test/regress/regress0/datatypes/bug438.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: sat
-DATATYPE list[T] = cons(car:T, cdr:list[T]) | nil END;
-x : list[REAL];
-ASSERT x = cons(1.0,nil::list[REAL])::list[REAL];
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/bug438.cvc.smt2 b/test/regress/regress0/datatypes/bug438.cvc.smt2
new file mode 100644
index 000000000..cb8d03b0c
--- /dev/null
+++ b/test/regress/regress0/datatypes/bug438.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((list 1)) ((par (T)((cons (car T) (cdr (list T))) (nil)))))
+(declare-fun x () (list Real))
+(assert (= x ((as cons (list Real)) 1.0 (as nil (list Real)))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/bug438b.cvc b/test/regress/regress0/datatypes/bug438b.cvc
deleted file mode 100644
index 16d27fe28..000000000
--- a/test/regress/regress0/datatypes/bug438b.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: sat
-DATATYPE list[T] = cons(car:T, cdr:list[T]) | nil END;
-x : list[REAL];
-ASSERT x = cons(1.0,nil::list[REAL]);
-ASSERT x = cons(1.0,nil::list[REAL])::list[REAL];
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/bug438b.cvc.smt2 b/test/regress/regress0/datatypes/bug438b.cvc.smt2
new file mode 100644
index 000000000..dacb1758b
--- /dev/null
+++ b/test/regress/regress0/datatypes/bug438b.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((list 1)) ((par (T)((cons (car T) (cdr (list T))) (nil)))))
+(declare-fun x () (list Real))
+(assert (= x (cons 1.0 (as nil (list Real)))))
+(assert (= x ((as cons (list Real)) 1.0 (as nil (list Real)))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/datatype-dump.cvc b/test/regress/regress0/datatypes/datatype-dump.cvc
deleted file mode 100644
index 8a193b71a..000000000
--- a/test/regress/regress0/datatypes/datatype-dump.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% This regression is the same as datatype.cvc but tests the
-% dumping infrastructure.
-%
-% COMMAND-LINE: -o raw-benchmark
-%
-% EXPECT: OPTION "incremental" false;
-% EXPECT: OPTION "logic" "ALL";
-% EXPECT: DATATYPE
-% EXPECT: nat = succ(pred: nat) | zero
-% EXPECT: END;
-% EXPECT: x : nat;
-% EXPECT: QUERY NOT(is_succ(x)) AND NOT(is_zero(x));
-% EXPECT: not_entailed
-%
-
-DATATYPE nat = succ(pred : nat) | zero END;
-
-x : nat;
-
-QUERY (NOT is_succ(x) AND NOT is_zero(x));
diff --git a/test/regress/regress0/datatypes/datatype-dump.cvc.smt2 b/test/regress/regress0/datatypes/datatype-dump.cvc.smt2
new file mode 100644
index 000000000..f1aae6bb1
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype-dump.cvc.smt2
@@ -0,0 +1,14 @@
+; COMMAND-LINE: -o raw-benchmark
+; EXPECT: OPTION "incremental" false;
+; EXPECT: OPTION "logic" "ALL";
+; EXPECT: DATATYPE
+; EXPECT: nat = succ(pred: nat) | zero
+; EXPECT: END;
+; EXPECT: x : nat;
+; EXPECT: QUERY NOT(is_succ(x)) AND NOT(is_zero(x));
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)) (((succ (pred nat)) (zero))))
+(declare-fun x () nat)
+(check-sat-assuming ( (not (and (not ((_ is succ) x)) (not ((_ is zero) x)))) ))
diff --git a/test/regress/regress0/datatypes/datatype.cvc b/test/regress/regress0/datatypes/datatype.cvc
deleted file mode 100644
index 6a0e97fc3..000000000
--- a/test/regress/regress0/datatypes/datatype.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: not_entailed
-
-DATATYPE nat = succ(pred : nat) | zero END;
-
-x : nat;
-
-QUERY (NOT is_succ(x) AND NOT is_zero(x));
diff --git a/test/regress/regress0/datatypes/datatype.cvc.smt2 b/test/regress/regress0/datatypes/datatype.cvc.smt2
new file mode 100644
index 000000000..e2399517b
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)) (((succ (pred nat)) (zero))))
+(declare-fun x () nat)
+(check-sat-assuming ( (not (and (not ((_ is succ) x)) (not ((_ is zero) x)))) ))
diff --git a/test/regress/regress0/datatypes/datatype0.cvc b/test/regress/regress0/datatypes/datatype0.cvc
deleted file mode 100644
index 0b9e41024..000000000
--- a/test/regress/regress0/datatypes/datatype0.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-
-DATATYPE nat = succ(pred : nat) | zero END;
-
-x : nat;
-
-QUERY (is_succ(x) OR is_zero(x));
diff --git a/test/regress/regress0/datatypes/datatype0.cvc.smt2 b/test/regress/regress0/datatypes/datatype0.cvc.smt2
new file mode 100644
index 000000000..8ce186344
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype0.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)) (((succ (pred nat)) (zero))))
+(declare-fun x () nat)
+(check-sat-assuming ( (not (or ((_ is succ) x) ((_ is zero) x))) ))
diff --git a/test/regress/regress0/datatypes/datatype1.cvc b/test/regress/regress0/datatypes/datatype1.cvc
deleted file mode 100644
index 8b9497020..000000000
--- a/test/regress/regress0/datatypes/datatype1.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% COMMAND-LINE: -q
-% EXPECT: not_entailed
-
-DATATYPE
- tree = node(left : tree, right : tree) | leaf
-END;
-
-x : tree;
-z : tree;
-
-QUERY NOT (left(left(z)) = x AND is_node(z) AND z = x);
diff --git a/test/regress/regress0/datatypes/datatype1.cvc.smt2 b/test/regress/regress0/datatypes/datatype1.cvc.smt2
new file mode 100644
index 000000000..387899b68
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype1.cvc.smt2
@@ -0,0 +1,8 @@
+; COMMAND-LINE: -q
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((tree 0)) (((node (left tree) (right tree)) (leaf))))
+(declare-fun x () tree)
+(declare-fun z () tree)
+(check-sat-assuming ( (not (not (and (and (= (left (left z)) x) ((_ is node) z)) (= z x)))) ))
diff --git a/test/regress/regress0/datatypes/datatype13.cvc b/test/regress/regress0/datatypes/datatype13.cvc
deleted file mode 100644
index 78d28be00..000000000
--- a/test/regress/regress0/datatypes/datatype13.cvc
+++ /dev/null
@@ -1,43 +0,0 @@
-% EXPECT: entailed
-
-DATATYPE enum = enum1
-| enum2
-| enum3
-| enum4
-| enum5
-| enum6
-| enum7
-| enum8
-| enum9
-| enum10
-| enum11
-| enum12
-| enum13
-| enum14
-| enum15
-| enum16
-| enum17
-| enum18
-| enum19
-| enum20
-| enum21
-| enum22
-| enum23
-| enum24
-| enum25
-| enum26
-| enum27
-| enum28
-| enum29
-| enum30
-| enum31
-| enum32
-| enum33
-END;
-
-x,y:enum;
-
-ASSERT x = enum1;
-ASSERT y = enum33;
-QUERY x /= y;
-
diff --git a/test/regress/regress0/datatypes/datatype13.cvc.smt2 b/test/regress/regress0/datatypes/datatype13.cvc.smt2
new file mode 100644
index 000000000..378c87560
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype13.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((enum 0)) (((enum1) (enum2) (enum3) (enum4) (enum5) (enum6) (enum7) (enum8) (enum9) (enum10) (enum11) (enum12) (enum13) (enum14) (enum15) (enum16) (enum17) (enum18) (enum19) (enum20) (enum21) (enum22) (enum23) (enum24) (enum25) (enum26) (enum27) (enum28) (enum29) (enum30) (enum31) (enum32) (enum33))))
+(declare-fun x () enum)
+(declare-fun y () enum)
+(assert (= x enum1))
+(assert (= y enum33))
+(check-sat-assuming ( (not (not (= x y))) ))
diff --git a/test/regress/regress0/datatypes/datatype2.cvc b/test/regress/regress0/datatypes/datatype2.cvc
deleted file mode 100644
index 64c84de45..000000000
--- a/test/regress/regress0/datatypes/datatype2.cvc
+++ /dev/null
@@ -1,16 +0,0 @@
-% EXPECT: entailed
-
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(data : nat, children : list) | leaf
-END;
-
-x : nat;
-y : list;
-z : tree;
-
-ASSERT x = succ(zero);
-ASSERT z = IF is_cons(y) THEN car(y) ELSE node(x, null) ENDIF;
-
-QUERY (NOT is_cons(y)) => pred(data(z)) = zero;
diff --git a/test/regress/regress0/datatypes/datatype2.cvc.smt2 b/test/regress/regress0/datatypes/datatype2.cvc.smt2
new file mode 100644
index 000000000..44fee2acb
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype2.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (data nat) (children list)) (leaf))))
+(declare-fun x () nat)
+(declare-fun y () list)
+(declare-fun z () tree)
+(assert (= x (succ zero)))
+(assert (= z (ite ((_ is cons) y) (car y) (node x null))))
+(check-sat-assuming ( (not (=> (not ((_ is cons) y)) (= (pred (data z)) zero))) ))
diff --git a/test/regress/regress0/datatypes/datatype3.cvc b/test/regress/regress0/datatypes/datatype3.cvc
deleted file mode 100644
index 159709835..000000000
--- a/test/regress/regress0/datatypes/datatype3.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% COMMAND-LINE: -q
-% EXPECT: not_entailed
-
-DATATYPE
- tree = node(left : tree, right : tree) | leaf
-END;
-
-x : tree;
-z : tree;
-
-QUERY NOT (left(left(left(left(left(left(left(left(left(left(z)))))))))) = x AND is_node(z) AND z = x);
diff --git a/test/regress/regress0/datatypes/datatype3.cvc.smt2 b/test/regress/regress0/datatypes/datatype3.cvc.smt2
new file mode 100644
index 000000000..68db235de
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype3.cvc.smt2
@@ -0,0 +1,8 @@
+; COMMAND-LINE: -q
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((tree 0)) (((node (left tree) (right tree)) (leaf))))
+(declare-fun x () tree)
+(declare-fun z () tree)
+(check-sat-assuming ( (not (not (and (and (= (left (left (left (left (left (left (left (left (left (left z)))))))))) x) ((_ is node) z)) (= z x)))) ))
diff --git a/test/regress/regress0/datatypes/datatype4.cvc b/test/regress/regress0/datatypes/datatype4.cvc
deleted file mode 100644
index 83962f49a..000000000
--- a/test/regress/regress0/datatypes/datatype4.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: not_entailed
-DATATYPE
- TypeGeneric = generic
-END;
-
-f: TypeGeneric -> INT;
-a: TypeGeneric;
-
-QUERY(f(a) = 0);
diff --git a/test/regress/regress0/datatypes/datatype4.cvc.smt2 b/test/regress/regress0/datatypes/datatype4.cvc.smt2
new file mode 100644
index 000000000..27a069cc7
--- /dev/null
+++ b/test/regress/regress0/datatypes/datatype4.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((TypeGeneric 0)) (((generic))))
+(declare-fun f (TypeGeneric) Int)
+(declare-fun a () TypeGeneric)
+(check-sat-assuming ( (not (= (f a) 0)) ))
diff --git a/test/regress/regress0/datatypes/empty_tuprec.cvc b/test/regress/regress0/datatypes/empty_tuprec.cvc
deleted file mode 100644
index 6e8ffef8d..000000000
--- a/test/regress/regress0/datatypes/empty_tuprec.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% COMMAND-LINE:
-%
-OPTION "incremental";
-
-a1, a2 : []; % empty tuples (a unit type)
-b1, b2 : [##]; % empty records (a unit type)
-c1, c2 : [[]]; % 1-tuples of the empty tuple (a unit type)
-d1, d2 : [#x:[[##]],y:[#z:[]#]#]; % more complicated records (still a unit type)
-
-% EXPECT: entailed
-QUERY a1 = a2;
-
-% EXPECT: entailed
-QUERY b1 = b2;
-
-% EXPECT: entailed
-QUERY c1 = c2;
-
-% EXPECT: entailed
-QUERY d1 = d2;
-
diff --git a/test/regress/regress0/datatypes/empty_tuprec.cvc.smt2 b/test/regress/regress0/datatypes/empty_tuprec.cvc.smt2
new file mode 100644
index 000000000..31528824e
--- /dev/null
+++ b/test/regress/regress0/datatypes/empty_tuprec.cvc.smt2
@@ -0,0 +1,22 @@
+; COMMAND-LINE:
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental true)
+(declare-fun a1 () Tuple)
+(declare-fun a2 () Tuple)
+(declare-datatypes ((__cvc5_record 0)) (((__cvc5_record_ctor))))
+(declare-fun b1 () __cvc5_record)
+(declare-fun b2 () __cvc5_record)
+(declare-fun c1 () (Tuple Tuple))
+(declare-fun c2 () (Tuple Tuple))
+(declare-datatypes ((__cvc5_record_z_Tuple 0)) (((__cvc5_record_z_Tuple_ctor (z Tuple)))))
+(declare-datatypes ((|__cvc5_record_x_(Tuple __cvc5_record)_y___cvc5_record_z_Tuple| 0)) (((|__cvc5_record_x_(Tuple __cvc5_record)_y___cvc5_record_z_Tuple_ctor| (x (Tuple __cvc5_record)) (y __cvc5_record_z_Tuple)))))
+(declare-fun d1 () |__cvc5_record_x_(Tuple __cvc5_record)_y___cvc5_record_z_Tuple|)
+(declare-fun d2 () |__cvc5_record_x_(Tuple __cvc5_record)_y___cvc5_record_z_Tuple|)
+(check-sat-assuming ( (not (= a1 a2)) ))
+(check-sat-assuming ( (not (= b1 b2)) ))
+(check-sat-assuming ( (not (= c1 c2)) ))
+(check-sat-assuming ( (not (= d1 d2)) ))
diff --git a/test/regress/regress0/datatypes/issue2838.cvc b/test/regress/regress0/datatypes/issue2838.cvc
deleted file mode 100644
index 9fab5f423..000000000
--- a/test/regress/regress0/datatypes/issue2838.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% COMMAND-LINE: -q
-% EXPECT: sat
-Ints_0 : ARRAY INT OF INT;
-C : TYPE = [# i : INT #];
-CType : TYPE = ARRAY INT OF C;
-C_0 : CType;
-x : INT;
-C_1 : CType = C_0 WITH [0].i := 2;
-
-ASSERT C_0[0].i = 0;
-ASSERT C_0[1].i = 1;
-ASSERT Ints_0[2] = Ints_0[0];
-ASSERT x = Ints_0[C_1[0].i];
-ASSERT x /= Ints_0[C_1[1].i];
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/issue2838.cvc.smt2 b/test/regress/regress0/datatypes/issue2838.cvc.smt2
new file mode 100644
index 000000000..8693f0fd6
--- /dev/null
+++ b/test/regress/regress0/datatypes/issue2838.cvc.smt2
@@ -0,0 +1,17 @@
+; COMMAND-LINE: -q
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun Ints_0 () (Array Int Int))
+(declare-datatypes ((__cvc5_record_i_Int 0)) (((__cvc5_record_i_Int_ctor (i Int)))))
+
+
+(declare-fun C_0 () (Array Int __cvc5_record_i_Int))
+(declare-fun x () Int)
+(define-fun C_1 () (Array Int __cvc5_record_i_Int) (store C_0 0 ((_ update i) (select C_0 0) 2)))
+(assert (= (i (select C_0 0)) 0))
+(assert (= (i (select C_0 1)) 1))
+(assert (= (select Ints_0 2) (select Ints_0 0)))
+(assert (= x (select Ints_0 (i (select (store C_0 0 ((_ update i) (select C_0 0) 2)) 0)))))
+(assert (not (= x (select Ints_0 (i (select (store C_0 0 ((_ update i) (select C_0 0) 2)) 1))))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/mutually-recursive.cvc b/test/regress/regress0/datatypes/mutually-recursive.cvc
deleted file mode 100644
index 5bd857b6e..000000000
--- a/test/regress/regress0/datatypes/mutually-recursive.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-% EXPECT: entailed
-
-DATATYPE nat = succ(pred : nat2) | zero,
- nat2 = succ2(pred2 : nat) | zero2 END;
-
-x : nat;
-
-DATATYPE list = cons(car : tree, cdr: list) | nil,
- tree = node(left : tree, right : tree) | leaf(data : list) END;
-
-y : tree;
-
-QUERY (is_succ(x) => is_zero2(pred(x)) OR is_succ2(pred(x)))
- AND (is_leaf(y) => is_cons(data(y)) OR is_nil(data(y)));
diff --git a/test/regress/regress0/datatypes/mutually-recursive.cvc.smt2 b/test/regress/regress0/datatypes/mutually-recursive.cvc.smt2
new file mode 100644
index 000000000..a202e8058
--- /dev/null
+++ b/test/regress/regress0/datatypes/mutually-recursive.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(nat2 0)) (((succ (pred nat2)) (zero))((succ2 (pred2 nat)) (zero2))))
+(declare-fun x () nat)
+(declare-datatypes ((list 0)(tree 0)) (((cons (car tree) (cdr list)) (nil))((node (left tree) (right tree)) (leaf (data list)))))
+(declare-fun y () tree)
+(check-sat-assuming ( (not (let ((_let_1 (data y))) (let ((_let_2 (pred x))) (and (=> ((_ is succ) x) (or ((_ is zero2) _let_2) ((_ is succ2) _let_2))) (=> ((_ is leaf) y) (or ((_ is cons) _let_1) ((_ is nil) _let_1))))))) ))
diff --git a/test/regress/regress0/datatypes/pair-bool-bool.cvc b/test/regress/regress0/datatypes/pair-bool-bool.cvc
deleted file mode 100644
index 7525e2dbb..000000000
--- a/test/regress/regress0/datatypes/pair-bool-bool.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-
-DATATYPE
- pair[T1,T2] = mkpair(first:T1, second:T2)
-END;
-
-x : pair[BOOLEAN,BOOLEAN];
-
-ASSERT x = mkpair(TRUE,TRUE);
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/pair-bool-bool.cvc.smt2 b/test/regress/regress0/datatypes/pair-bool-bool.cvc.smt2
new file mode 100644
index 000000000..cd32a072a
--- /dev/null
+++ b/test/regress/regress0/datatypes/pair-bool-bool.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((pair 2)) ((par (T1 T2)((mkpair (first T1) (second T2))))))
+(declare-fun x () (pair Bool Bool))
+(assert (= x (mkpair true true)))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/parametric-alt-list.cvc b/test/regress/regress0/datatypes/parametric-alt-list.cvc
deleted file mode 100644
index f523272ae..000000000
--- a/test/regress/regress0/datatypes/parametric-alt-list.cvc
+++ /dev/null
@@ -1,13 +0,0 @@
-% EXPECT: sat
-DATATYPE
-List[X,Y] = nil | cons (head: X, tail: List[Y,X])
-END;
-
-x : List[INT,STRING]; % = cons(1, nil::List[STRING,INT]);
-y : List[INT,STRING];
-
-ASSERT NOT( x = y );
-
-ASSERT NOT ( x = tail(tail(x)) );
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/parametric-alt-list.cvc.smt2 b/test/regress/regress0/datatypes/parametric-alt-list.cvc.smt2
new file mode 100644
index 000000000..2ea829b6c
--- /dev/null
+++ b/test/regress/regress0/datatypes/parametric-alt-list.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((List 2)) ((par (X Y)((nil) (cons (head X) (tail (List Y X)))))))
+(declare-fun x () (List Int String))
+(declare-fun y () (List Int String))
+(assert (not (= x y)))
+(assert (not (= x (tail (tail x)))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/rec1.cvc b/test/regress/regress0/datatypes/rec1.cvc
deleted file mode 100644
index b3e205985..000000000
--- a/test/regress/regress0/datatypes/rec1.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-c : BOOLEAN;
-a17 : BOOLEAN = ((# _a := 2, _b := 2 #) = (
- IF c THEN (# _a := 3, _b := 2 #)
- ELSE (# _a := 1, _b := 2 #)
- ENDIF WITH ._a := 2));
-QUERY a17;
diff --git a/test/regress/regress0/datatypes/rec1.cvc.smt2 b/test/regress/regress0/datatypes/rec1.cvc.smt2
new file mode 100644
index 000000000..b6d4ba58e
--- /dev/null
+++ b/test/regress/regress0/datatypes/rec1.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun c () Bool)
+(declare-datatypes ((__cvc5_record__a_Int__b_Int 0)) (((__cvc5_record__a_Int__b_Int_ctor (_a Int) (_b Int)))))
+(define-fun a17 () Bool (= (__cvc5_record__a_Int__b_Int_ctor 2 2) ((_ update _a) (ite c (__cvc5_record__a_Int__b_Int_ctor 3 2) (__cvc5_record__a_Int__b_Int_ctor 1 2)) 2)))
+(check-sat-assuming ( (not (= (__cvc5_record__a_Int__b_Int_ctor 2 2) ((_ update _a) (ite c (__cvc5_record__a_Int__b_Int_ctor 3 2) (__cvc5_record__a_Int__b_Int_ctor 1 2)) 2))) ))
diff --git a/test/regress/regress0/datatypes/rec2.cvc b/test/regress/regress0/datatypes/rec2.cvc
deleted file mode 100644
index 56864c088..000000000
--- a/test/regress/regress0/datatypes/rec2.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: entailed
-c : BOOLEAN;
-a16 : [# _a : INT, _b : INT #] = (
- IF c THEN (# _a := 3, _b := 2 #)
- ELSE (# _a := 1, _b := 5 #)
- ENDIF WITH ._a := 2);
-a21 : BOOLEAN =
- IF c THEN ((# _a := 2, _b := 2 #) = a16)
- ELSE ((# _a := 2, _b := 5 #) = a16)
- ENDIF;
-QUERY a21;
diff --git a/test/regress/regress0/datatypes/rec2.cvc.smt2 b/test/regress/regress0/datatypes/rec2.cvc.smt2
new file mode 100644
index 000000000..594516246
--- /dev/null
+++ b/test/regress/regress0/datatypes/rec2.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun c () Bool)
+(declare-datatypes ((__cvc5_record__a_Int__b_Int 0)) (((__cvc5_record__a_Int__b_Int_ctor (_a Int) (_b Int)))))
+(define-fun a16 () __cvc5_record__a_Int__b_Int ((_ update _a) (ite c (__cvc5_record__a_Int__b_Int_ctor 3 2) (__cvc5_record__a_Int__b_Int_ctor 1 5)) 2))
+(define-fun a21 () Bool (let ((_let_1 ((_ update _a) (ite c (__cvc5_record__a_Int__b_Int_ctor 3 2) (__cvc5_record__a_Int__b_Int_ctor 1 5)) 2))) (ite c (= (__cvc5_record__a_Int__b_Int_ctor 2 2) _let_1) (= (__cvc5_record__a_Int__b_Int_ctor 2 5) _let_1))))
+(check-sat-assuming ( (not (let ((_let_1 ((_ update _a) (ite c (__cvc5_record__a_Int__b_Int_ctor 3 2) (__cvc5_record__a_Int__b_Int_ctor 1 5)) 2))) (ite c (= (__cvc5_record__a_Int__b_Int_ctor 2 2) _let_1) (= (__cvc5_record__a_Int__b_Int_ctor 2 5) _let_1)))) ))
diff --git a/test/regress/regress0/datatypes/rec4.cvc b/test/regress/regress0/datatypes/rec4.cvc
deleted file mode 100644
index f7f29755f..000000000
--- a/test/regress/regress0/datatypes/rec4.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: entailed
-a : BOOLEAN;
-a49 : BOOLEAN = (
- IF a THEN (# _a := 1 #)
- ELSE (# _a := 2 #)
- ENDIF = (# _a :=
- IF a THEN 1
- ELSE 2
- ENDIF #));
-QUERY a49;
diff --git a/test/regress/regress0/datatypes/rec4.cvc.smt2 b/test/regress/regress0/datatypes/rec4.cvc.smt2
new file mode 100644
index 000000000..7fa37011b
--- /dev/null
+++ b/test/regress/regress0/datatypes/rec4.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-datatypes ((__cvc5_record__a_Int 0)) (((__cvc5_record__a_Int_ctor (_a Int)))))
+(define-fun a49 () Bool (= (ite a (__cvc5_record__a_Int_ctor 1) (__cvc5_record__a_Int_ctor 2)) (__cvc5_record__a_Int_ctor (ite a 1 2))))
+(check-sat-assuming ( (not (= (ite a (__cvc5_record__a_Int_ctor 1) (__cvc5_record__a_Int_ctor 2)) (__cvc5_record__a_Int_ctor (ite a 1 2)))) ))
diff --git a/test/regress/regress0/datatypes/rewriter.cvc b/test/regress/regress0/datatypes/rewriter.cvc
deleted file mode 100644
index e9b7662a0..000000000
--- a/test/regress/regress0/datatypes/rewriter.cvc
+++ /dev/null
@@ -1,12 +0,0 @@
-% EXPECT: entailed
-
-% simple test for rewriter cases
-
-DATATYPE single_ctor = foo(bar:REAL) END;
-DATATYPE double_ctor = foo2(bar2:REAL) | baz END;
-
-x: single_ctor;
-y: double_ctor;
-
-QUERY is_foo(x) AND bar2(foo2(0.0)) = 0.0;
-
diff --git a/test/regress/regress0/datatypes/rewriter.cvc.smt2 b/test/regress/regress0/datatypes/rewriter.cvc.smt2
new file mode 100644
index 000000000..76f39e66e
--- /dev/null
+++ b/test/regress/regress0/datatypes/rewriter.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((single_ctor 0)) (((foo (bar Real)))))
+(declare-datatypes ((double_ctor 0)) (((foo2 (bar2 Real)) (baz))))
+(declare-fun x () single_ctor)
+(declare-fun y () double_ctor)
+(check-sat-assuming ( (not (let ((_let_1 0.0)) (and ((_ is foo) x) (= (bar2 (foo2 _let_1)) _let_1)))) ))
diff --git a/test/regress/regress0/datatypes/some-boolean-tests.cvc b/test/regress/regress0/datatypes/some-boolean-tests.cvc
deleted file mode 100644
index ae57666d3..000000000
--- a/test/regress/regress0/datatypes/some-boolean-tests.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-DATATYPE list[T] = cons(car:T, care:BOOLEAN, cdr:list[T]) | nil END;
-x : list[REAL];
-
-y : [INT,BOOLEAN,INT];
-ASSERT y = (5,TRUE,4);
-
-ASSERT y.1;
-
-ASSERT x = cons(1.1,TRUE,nil::list[REAL])::list[REAL];
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/some-boolean-tests.cvc.smt2 b/test/regress/regress0/datatypes/some-boolean-tests.cvc.smt2
new file mode 100644
index 000000000..d581b37b9
--- /dev/null
+++ b/test/regress/regress0/datatypes/some-boolean-tests.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((list 1)) ((par (T)((cons (car T) (care Bool) (cdr (list T))) (nil)))))
+(declare-fun x () (list Real))
+(declare-fun y () (Tuple Int Bool Int))
+(assert (= y (mkTuple 5 true 4)))
+(assert ((_ tupSel 1) y))
+(assert (= x ((as cons (list Real)) (/ 11 10) true (as nil (list Real)))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/tree-get-value.cvc b/test/regress/regress0/datatypes/tree-get-value.cvc
deleted file mode 100644
index 0a7da7f69..000000000
--- a/test/regress/regress0/datatypes/tree-get-value.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-% EXPECT: ((left(x), leaf))
-OPTION "produce-models";
-DATATYPE
- tree = node(left : tree, right : tree) | leaf
-END;
-x : tree;
-ASSERT is_leaf(left(x));
-CHECKSAT;
-GET_VALUE left(x);
diff --git a/test/regress/regress0/datatypes/tree-get-value.cvc.smt2 b/test/regress/regress0/datatypes/tree-get-value.cvc.smt2
new file mode 100644
index 000000000..01f2d12ef
--- /dev/null
+++ b/test/regress/regress0/datatypes/tree-get-value.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: sat
+; EXPECT: (((left x) leaf))
+(set-logic ALL)
+(set-option :incremental false)
+(set-option :produce-models true)
+(declare-datatypes ((tree 0)) (((node (left tree) (right tree)) (leaf))))
+(declare-fun x () tree)
+(assert ((_ is leaf) (left x)))
+(check-sat)
+(get-value ( (left x) ))
diff --git a/test/regress/regress0/datatypes/tuple-model.cvc b/test/regress/regress0/datatypes/tuple-model.cvc
deleted file mode 100644
index 1d1b4000c..000000000
--- a/test/regress/regress0/datatypes/tuple-model.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% This was breaking with --check-models due to tuple model breakage.
-% EXPECT: sat
-x : [ INT, INT ];
-ASSERT x.0 = 5;
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/tuple-model.cvc.smt2 b/test/regress/regress0/datatypes/tuple-model.cvc.smt2
new file mode 100644
index 000000000..dcd68d03a
--- /dev/null
+++ b/test/regress/regress0/datatypes/tuple-model.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () (Tuple Int Int))
+(assert (= ((_ tupSel 0) x) 5))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/tuple-no-clash.cvc b/test/regress/regress0/datatypes/tuple-no-clash.cvc
deleted file mode 100644
index 586d5d259..000000000
--- a/test/regress/regress0/datatypes/tuple-no-clash.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-
-x : [ REAL, REAL ];
-y : REAL;
-z : REAL;
-
-ASSERT x = (y, z) OR x = (z, y);
-ASSERT x = (0.0,0.0) OR x = (1.0,1.0);
-
-CHECKSAT;
diff --git a/test/regress/regress0/datatypes/tuple-no-clash.cvc.smt2 b/test/regress/regress0/datatypes/tuple-no-clash.cvc.smt2
new file mode 100644
index 000000000..1d05489b3
--- /dev/null
+++ b/test/regress/regress0/datatypes/tuple-no-clash.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+(declare-fun x () (Tuple Real Real))
+(declare-fun y () Real)
+(declare-fun z () Real)
+(assert (or (= x (mkTuple y z)) (= x (mkTuple z y))))
+(assert (let ((_let_1 1.0)) (let ((_let_2 0.0)) (or (= x (mkTuple _let_2 _let_2)) (= x (mkTuple _let_1 _let_1))))))
+(check-sat)
diff --git a/test/regress/regress0/datatypes/tuple-record-bug.cvc b/test/regress/regress0/datatypes/tuple-record-bug.cvc
deleted file mode 100644
index 0e519a64f..000000000
--- a/test/regress/regress0/datatypes/tuple-record-bug.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: not_entailed
-
-Mem_0 : TYPE = ARRAY INT OF INT;
-
-MEMORY : TYPE = [# int : Mem_0, queries : Mem_0 #];
-
-x : INT;
-
-foo : MEMORY -> MEMORY
- = LAMBDA (x : MEMORY) : LET y = x WITH .int := x.int IN y;
-
-m : MEMORY;
-
-w : [MEMORY,INT] =
- IF x = 0
- THEN (foo(m),0)
- ELSE (m, 0)
- ENDIF;
-
-QUERY w.1 = 1;
diff --git a/test/regress/regress0/datatypes/tuple-record-bug.cvc.smt2 b/test/regress/regress0/datatypes/tuple-record-bug.cvc.smt2
new file mode 100644
index 000000000..433a79797
--- /dev/null
+++ b/test/regress/regress0/datatypes/tuple-record-bug.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+
+(declare-datatypes ((|__cvc5_record_int_(Array Int Int)_queries_(Array Int Int)| 0)) (((|__cvc5_record_int_(Array Int Int)_queries_(Array Int Int)_ctor| (int (Array Int Int)) (queries (Array Int Int))))))
+
+(declare-fun x () Int)
+(define-fun foo ((x |__cvc5_record_int_(Array Int Int)_queries_(Array Int Int)|)) |__cvc5_record_int_(Array Int Int)_queries_(Array Int Int)| ((_ update int) x (int x)))
+(declare-fun m () |__cvc5_record_int_(Array Int Int)_queries_(Array Int Int)|)
+(define-fun w () (Tuple |__cvc5_record_int_(Array Int Int)_queries_(Array Int Int)| Int) (ite (= x 0) (mkTuple (foo m) 0) (mkTuple m 0)))
+(check-sat-assuming ( (not (= ((_ tupSel 1) (ite (= x 0) (mkTuple (foo m) 0) (mkTuple m 0))) 1)) ))
diff --git a/test/regress/regress0/datatypes/tuple.cvc b/test/regress/regress0/datatypes/tuple.cvc
deleted file mode 100644
index 00ab8d4db..000000000
--- a/test/regress/regress0/datatypes/tuple.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: entailed
-x: [REAL,INT,REAL] = ( 4/5, 9, 11/9 );
-first_elem: REAL = x.0;
-third_elem: REAL = x.2;
-
-Tup: TYPE = [REAL,INT,REAL];
-y: Tup = ( 4/5, 9, 11/9 );
-y1: Tup = y WITH .1 := 3;
-
-QUERY x=y AND first_elem = y1.0 AND third_elem = y1.2 AND y1.1 = 3;
diff --git a/test/regress/regress0/datatypes/tuple.cvc.smt2 b/test/regress/regress0/datatypes/tuple.cvc.smt2
new file mode 100644
index 000000000..2b0959968
--- /dev/null
+++ b/test/regress/regress0/datatypes/tuple.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(define-fun x () (Tuple Real Int Real) (mkTuple (/ 4 5) 9 (/ 11 9)))
+(define-fun first_elem () Real ((_ tupSel 0) (mkTuple (/ 4 5) 9 (/ 11 9))))
+(define-fun third_elem () Real ((_ tupSel 2) (mkTuple (/ 4 5) 9 (/ 11 9))))
+
+(define-fun y () (Tuple Real Int Real) (mkTuple (/ 4 5) 9 (/ 11 9)))
+(define-fun y1 () (Tuple Real Int Real) ((_ tuple_update 1) (mkTuple (/ 4 5) 9 (/ 11 9)) 3))
+(check-sat-assuming ( (not (let ((_let_1 (mkTuple (/ 4 5) 9 (/ 11 9)))) (let ((_let_2 ((_ tuple_update 1) _let_1 3))) (and (and (and (= _let_1 _let_1) (= ((_ tupSel 0) _let_1) ((_ tupSel 0) _let_2))) (= ((_ tupSel 2) _let_1) ((_ tupSel 2) _let_2))) (= ((_ tupSel 1) _let_2) 3))))) ))
diff --git a/test/regress/regress0/datatypes/typed_v10l30054.cvc b/test/regress/regress0/datatypes/typed_v10l30054.cvc
deleted file mode 100644
index 72c23d888..000000000
--- a/test/regress/regress0/datatypes/typed_v10l30054.cvc
+++ /dev/null
@@ -1,43 +0,0 @@
-% EXPECT: entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : nat ;
-x4 : nat ;
-x5 : nat ;
-x6 : nat ;
-x7 : nat ;
-x8 : nat ;
-x9 : nat ;
-x10 : nat ;
-x11 : list ;
-x12 : list ;
-x13 : list ;
-x14 : list ;
-x15 : list ;
-x16 : list ;
-x17 : list ;
-x18 : list ;
-x19 : list ;
-x20 : list ;
-x21 : tree ;
-x22 : tree ;
-x23 : tree ;
-x24 : tree ;
-x25 : tree ;
-x26 : tree ;
-x27 : tree ;
-x28 : tree ;
-x29 : tree ;
-x30 : tree ;
-
-QUERY
-
-(NOT (((x4 = x4)
- AND (NOT is_leaf((LET x81 = null IN (IF is_cons(x81) THEN car(x81) ELSE leaf(zero) ENDIF)))))
- AND (NOT (x10 = x2))));
diff --git a/test/regress/regress0/datatypes/typed_v10l30054.cvc.smt2 b/test/regress/regress0/datatypes/typed_v10l30054.cvc.smt2
new file mode 100644
index 000000000..81890f6af
--- /dev/null
+++ b/test/regress/regress0/datatypes/typed_v10l30054.cvc.smt2
@@ -0,0 +1,35 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () nat)
+(declare-fun x4 () nat)
+(declare-fun x5 () nat)
+(declare-fun x6 () nat)
+(declare-fun x7 () nat)
+(declare-fun x8 () nat)
+(declare-fun x9 () nat)
+(declare-fun x10 () nat)
+(declare-fun x11 () list)
+(declare-fun x12 () list)
+(declare-fun x13 () list)
+(declare-fun x14 () list)
+(declare-fun x15 () list)
+(declare-fun x16 () list)
+(declare-fun x17 () list)
+(declare-fun x18 () list)
+(declare-fun x19 () list)
+(declare-fun x20 () list)
+(declare-fun x21 () tree)
+(declare-fun x22 () tree)
+(declare-fun x23 () tree)
+(declare-fun x24 () tree)
+(declare-fun x25 () tree)
+(declare-fun x26 () tree)
+(declare-fun x27 () tree)
+(declare-fun x28 () tree)
+(declare-fun x29 () tree)
+(declare-fun x30 () tree)
+(check-sat-assuming ( (not (not (and (and (= x4 x4) (not ((_ is leaf) (ite ((_ is cons) null) (car null) (leaf zero))))) (not (= x10 x2))))) ))
diff --git a/test/regress/regress0/datatypes/typed_v1l80005.cvc b/test/regress/regress0/datatypes/typed_v1l80005.cvc
deleted file mode 100644
index 95b1a935f..000000000
--- a/test/regress/regress0/datatypes/typed_v1l80005.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% EXPECT: entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : list ;
-x3 : tree ;
-
-QUERY
-
-(NOT ((((((((NOT is_succ((LET x90 = (LET x91 = node(cons(x3,cons((LET x92 = (LET x93 = cons(node(x2),(LET x94 = node((LET x95 = null IN (IF is_cons(x95) THEN cdr(x95) ELSE null ENDIF))) IN (IF is_node(x94) THEN children(x94) ELSE null ENDIF))) IN (IF is_cons(x93) THEN cdr(x93) ELSE null ENDIF)) IN (IF is_cons(x92) THEN car(x92) ELSE leaf(zero) ENDIF)),cons(node(cons(node((LET x96 = node(x2) IN (IF is_node(x96) THEN children(x96) ELSE null ENDIF))),cons((LET x97 = (LET x98 = leaf((LET x99 = node((LET x100 = null IN (IF is_cons(x100) THEN cdr(x100) ELSE null ENDIF))) IN (IF is_leaf(x99) THEN data(x99) ELSE zero ENDIF))) IN (IF is_node(x98) THEN children(x98) ELSE null ENDIF)) IN (IF is_cons(x97) THEN car(x97) ELSE leaf(zero) ENDIF)),(LET x101 = (LET x102 = (LET x103 = node(x2) IN (IF is_node(x103) THEN children(x103) ELSE null ENDIF)) IN (IF is_cons(x102) THEN car(x102) ELSE leaf(zero) ENDIF)) IN (IF is_node(x101) THEN children(x101) ELSE null ENDIF))))),cons(leaf(succ((LET x104 = (LET x105 = (LET x106 = null IN (IF is_cons(x106) THEN car(x106) ELSE leaf(zero) ENDIF)) IN (IF is_leaf(x105) THEN data(x105) ELSE zero ENDIF)) IN (IF is_succ(x104) THEN pred(x104) ELSE zero ENDIF)))),null))))) IN (IF is_leaf(x91) THEN data(x91) ELSE zero ENDIF)) IN (IF is_succ(x90) THEN pred(x90) ELSE zero ENDIF))))
- AND (node((LET x87 = cons((LET x88 = null IN (IF is_cons(x88) THEN car(x88) ELSE leaf(zero) ENDIF)),(LET x89 = cons(node(cons(x3,x2)),null) IN (IF is_cons(x89) THEN cdr(x89) ELSE null ENDIF))) IN (IF is_cons(x87) THEN cdr(x87) ELSE null ENDIF))) = (LET x85 = (LET x86 = x3 IN (IF is_node(x86) THEN children(x86) ELSE null ENDIF)) IN (IF is_cons(x85) THEN car(x85) ELSE leaf(zero) ENDIF))))
- AND is_null((LET x83 = cons(node(null),(LET x84 = x2 IN (IF is_cons(x84) THEN cdr(x84) ELSE null ENDIF))) IN (IF is_cons(x83) THEN cdr(x83) ELSE null ENDIF))))
- AND is_null(cons(leaf((LET x77 = succ((LET x78 = (LET x79 = zero IN (IF is_succ(x79) THEN pred(x79) ELSE zero ENDIF)) IN (IF is_succ(x78) THEN pred(x78) ELSE zero ENDIF))) IN (IF is_succ(x77) THEN pred(x77) ELSE zero ENDIF))),(LET x80 = leaf((LET x81 = succ((LET x82 = x3 IN (IF is_leaf(x82) THEN data(x82) ELSE zero ENDIF))) IN (IF is_succ(x81) THEN pred(x81) ELSE zero ENDIF))) IN (IF is_node(x80) THEN children(x80) ELSE null ENDIF)))))
- AND is_node(leaf(zero)))
- AND (NOT (x2 = null)))
- AND (NOT is_zero((LET x76 = node(cons(leaf(succ(zero)),null)) IN (IF is_leaf(x76) THEN data(x76) ELSE zero ENDIF)))))
- AND is_null((LET x74 = (LET x75 = null IN (IF is_cons(x75) THEN cdr(x75) ELSE null ENDIF)) IN (IF is_cons(x74) THEN cdr(x74) ELSE null ENDIF)))));
diff --git a/test/regress/regress0/datatypes/typed_v1l80005.cvc.smt2 b/test/regress/regress0/datatypes/typed_v1l80005.cvc.smt2
new file mode 100644
index 000000000..c9ce01ccf
--- /dev/null
+++ b/test/regress/regress0/datatypes/typed_v1l80005.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () list)
+(declare-fun x3 () tree)
+(check-sat-assuming ( (not (let ((_let_1 ((_ is cons) null))) (let ((_let_2 (ite _let_1 (cdr null) null))) (let ((_let_3 (node (cons (leaf (succ zero)) null)))) (let ((_let_4 (leaf zero))) (let ((_let_5 (succ (ite ((_ is leaf) x3) (data x3) zero)))) (let ((_let_6 (leaf (ite ((_ is succ) _let_5) (pred _let_5) zero)))) (let ((_let_7 (ite ((_ is succ) zero) (pred zero) zero))) (let ((_let_8 (succ (ite ((_ is succ) _let_7) (pred _let_7) zero)))) (let ((_let_9 (cons (node null) (ite ((_ is cons) x2) (cdr x2) null)))) (let ((_let_10 (ite ((_ is node) x3) (children x3) null))) (let ((_let_11 (cons (node (cons x3 x2)) null))) (let ((_let_12 (ite _let_1 (car null) _let_4))) (let ((_let_13 (cons _let_12 (ite ((_ is cons) _let_11) (cdr _let_11) null)))) (let ((_let_14 (ite ((_ is leaf) _let_12) (data _let_12) zero))) (let ((_let_15 (node x2))) (let ((_let_16 (ite ((_ is node) _let_15) (children _let_15) null))) (let ((_let_17 (ite ((_ is cons) _let_16) (car _let_16) _let_4))) (let ((_let_18 (node _let_2))) (let ((_let_19 (leaf (ite ((_ is leaf) _let_18) (data _let_18) zero)))) (let ((_let_20 (ite ((_ is node) _let_19) (children _let_19) null))) (let ((_let_21 (cons _let_15 (ite ((_ is node) _let_18) (children _let_18) null)))) (let ((_let_22 (ite ((_ is cons) _let_21) (cdr _let_21) null))) (let ((_let_23 (node (cons x3 (cons (ite ((_ is cons) _let_22) (car _let_22) _let_4) (cons (node (cons (node _let_16) (cons (ite ((_ is cons) _let_20) (car _let_20) _let_4) (ite ((_ is node) _let_17) (children _let_17) null)))) (cons (leaf (succ (ite ((_ is succ) _let_14) (pred _let_14) zero))) null))))))) (let ((_let_24 (ite ((_ is leaf) _let_23) (data _let_23) zero))) (not (and (and (and (and (and (and (and (not ((_ is succ) (ite ((_ is succ) _let_24) (pred _let_24) zero))) (= (node (ite ((_ is cons) _let_13) (cdr _let_13) null)) (ite ((_ is cons) _let_10) (car _let_10) _let_4))) ((_ is null) (ite ((_ is cons) _let_9) (cdr _let_9) null))) ((_ is null) (cons (leaf (ite ((_ is succ) _let_8) (pred _let_8) zero)) (ite ((_ is node) _let_6) (children _let_6) null)))) ((_ is node) _let_4)) (not (= x2 null))) (not ((_ is zero) (ite ((_ is leaf) _let_3) (data _let_3) zero)))) ((_ is null) (ite ((_ is cons) _let_2) (cdr _let_2) null))))))))))))))))))))))))))))) ))
diff --git a/test/regress/regress0/datatypes/typed_v2l30079.cvc b/test/regress/regress0/datatypes/typed_v2l30079.cvc
deleted file mode 100644
index 2295d1518..000000000
--- a/test/regress/regress0/datatypes/typed_v2l30079.cvc
+++ /dev/null
@@ -1,19 +0,0 @@
-% EXPECT: not_entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : list ;
-x4 : list ;
-x5 : tree ;
-x6 : tree ;
-
-QUERY
-
-(NOT ((is_node(x6)
- AND (x6 = x5))
- AND (NOT (null = cons(x6,x3)))));
diff --git a/test/regress/regress0/datatypes/typed_v2l30079.cvc.smt2 b/test/regress/regress0/datatypes/typed_v2l30079.cvc.smt2
new file mode 100644
index 000000000..844b68a01
--- /dev/null
+++ b/test/regress/regress0/datatypes/typed_v2l30079.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () list)
+(declare-fun x4 () list)
+(declare-fun x5 () tree)
+(declare-fun x6 () tree)
+(check-sat-assuming ( (not (not (and (and ((_ is node) x6) (= x6 x5)) (not (= null (cons x6 x3)))))) ))
diff --git a/test/regress/regress0/datatypes/typed_v3l20092.cvc b/test/regress/regress0/datatypes/typed_v3l20092.cvc
deleted file mode 100644
index e067852df..000000000
--- a/test/regress/regress0/datatypes/typed_v3l20092.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% EXPECT: entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : nat ;
-x4 : list ;
-x5 : list ;
-x6 : list ;
-x7 : tree ;
-x8 : tree ;
-x9 : tree ;
-
-QUERY
-
-(NOT (((LET x137 = x1 IN (IF is_succ(x137) THEN pred(x137) ELSE zero ENDIF)) = (LET x135 = (LET x136 = null IN (IF is_cons(x136) THEN car(x136) ELSE leaf(zero) ENDIF)) IN (IF is_leaf(x135) THEN data(x135) ELSE zero ENDIF)))
- AND (cons(node(x6),(LET x134 = x7 IN (IF is_node(x134) THEN children(x134) ELSE null ENDIF))) = (LET x132 = node((LET x133 = x6 IN (IF is_cons(x133) THEN cdr(x133) ELSE null ENDIF))) IN (IF is_node(x132) THEN children(x132) ELSE null ENDIF)))));
diff --git a/test/regress/regress0/datatypes/typed_v3l20092.cvc.smt2 b/test/regress/regress0/datatypes/typed_v3l20092.cvc.smt2
new file mode 100644
index 000000000..6ed774840
--- /dev/null
+++ b/test/regress/regress0/datatypes/typed_v3l20092.cvc.smt2
@@ -0,0 +1,14 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () nat)
+(declare-fun x4 () list)
+(declare-fun x5 () list)
+(declare-fun x6 () list)
+(declare-fun x7 () tree)
+(declare-fun x8 () tree)
+(declare-fun x9 () tree)
+(check-sat-assuming ( (not (let ((_let_1 (node (ite ((_ is cons) x6) (cdr x6) null)))) (let ((_let_2 (ite ((_ is cons) null) (car null) (leaf zero)))) (not (and (= (ite ((_ is succ) x1) (pred x1) zero) (ite ((_ is leaf) _let_2) (data _let_2) zero)) (= (cons (node x6) (ite ((_ is node) x7) (children x7) null)) (ite ((_ is node) _let_1) (children _let_1) null))))))) ))
diff --git a/test/regress/regress0/datatypes/typed_v5l30069.cvc b/test/regress/regress0/datatypes/typed_v5l30069.cvc
deleted file mode 100644
index f980acc69..000000000
--- a/test/regress/regress0/datatypes/typed_v5l30069.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% EXPECT: entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : nat ;
-x4 : nat ;
-x5 : nat ;
-x6 : list ;
-x7 : list ;
-x8 : list ;
-x9 : list ;
-x10 : list ;
-x11 : tree ;
-x12 : tree ;
-x13 : tree ;
-x14 : tree ;
-x15 : tree ;
-
-QUERY
-
-(NOT ((is_cons((LET x121 = leaf((LET x122 = x13 IN (IF is_leaf(x122) THEN data(x122) ELSE zero ENDIF))) IN (IF is_node(x121) THEN children(x121) ELSE null ENDIF)))
- AND (x15 = node(x6)))
- AND (NOT is_cons(x10))));
diff --git a/test/regress/regress0/datatypes/typed_v5l30069.cvc.smt2 b/test/regress/regress0/datatypes/typed_v5l30069.cvc.smt2
new file mode 100644
index 000000000..96a50854c
--- /dev/null
+++ b/test/regress/regress0/datatypes/typed_v5l30069.cvc.smt2
@@ -0,0 +1,20 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () nat)
+(declare-fun x4 () nat)
+(declare-fun x5 () nat)
+(declare-fun x6 () list)
+(declare-fun x7 () list)
+(declare-fun x8 () list)
+(declare-fun x9 () list)
+(declare-fun x10 () list)
+(declare-fun x11 () tree)
+(declare-fun x12 () tree)
+(declare-fun x13 () tree)
+(declare-fun x14 () tree)
+(declare-fun x15 () tree)
+(check-sat-assuming ( (not (let ((_let_1 (leaf (ite ((_ is leaf) x13) (data x13) zero)))) (not (and (and ((_ is cons) (ite ((_ is node) _let_1) (children _let_1) null)) (= x15 (node x6))) (not ((_ is cons) x10)))))) ))
diff --git a/test/regress/regress0/datatypes/v10l40099.cvc b/test/regress/regress0/datatypes/v10l40099.cvc
deleted file mode 100644
index 257bf2ccc..000000000
--- a/test/regress/regress0/datatypes/v10l40099.cvc
+++ /dev/null
@@ -1,44 +0,0 @@
-% EXPECT: entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : nat ;
-x4 : nat ;
-x5 : nat ;
-x6 : nat ;
-x7 : nat ;
-x8 : nat ;
-x9 : nat ;
-x10 : nat ;
-x11 : list ;
-x12 : list ;
-x13 : list ;
-x14 : list ;
-x15 : list ;
-x16 : list ;
-x17 : list ;
-x18 : list ;
-x19 : list ;
-x20 : list ;
-x21 : tree ;
-x22 : tree ;
-x23 : tree ;
-x24 : tree ;
-x25 : tree ;
-x26 : tree ;
-x27 : tree ;
-x28 : tree ;
-x29 : tree ;
-x30 : tree ;
-
-QUERY
-
-(NOT ((((NOT is_zero(x3))
- AND (x8 = zero))
- AND (NOT (x25 = x28)))
- AND (NOT is_zero(x8))));
diff --git a/test/regress/regress0/datatypes/v10l40099.cvc.smt2 b/test/regress/regress0/datatypes/v10l40099.cvc.smt2
new file mode 100644
index 000000000..d54e69d76
--- /dev/null
+++ b/test/regress/regress0/datatypes/v10l40099.cvc.smt2
@@ -0,0 +1,35 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () nat)
+(declare-fun x4 () nat)
+(declare-fun x5 () nat)
+(declare-fun x6 () nat)
+(declare-fun x7 () nat)
+(declare-fun x8 () nat)
+(declare-fun x9 () nat)
+(declare-fun x10 () nat)
+(declare-fun x11 () list)
+(declare-fun x12 () list)
+(declare-fun x13 () list)
+(declare-fun x14 () list)
+(declare-fun x15 () list)
+(declare-fun x16 () list)
+(declare-fun x17 () list)
+(declare-fun x18 () list)
+(declare-fun x19 () list)
+(declare-fun x20 () list)
+(declare-fun x21 () tree)
+(declare-fun x22 () tree)
+(declare-fun x23 () tree)
+(declare-fun x24 () tree)
+(declare-fun x25 () tree)
+(declare-fun x26 () tree)
+(declare-fun x27 () tree)
+(declare-fun x28 () tree)
+(declare-fun x29 () tree)
+(declare-fun x30 () tree)
+(check-sat-assuming ( (not (not (and (and (and (not ((_ is zero) x3)) (= x8 zero)) (not (= x25 x28))) (not ((_ is zero) x8))))) ))
diff --git a/test/regress/regress0/datatypes/v2l40025.cvc b/test/regress/regress0/datatypes/v2l40025.cvc
deleted file mode 100644
index d3411e12e..000000000
--- a/test/regress/regress0/datatypes/v2l40025.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : list ;
-x4 : list ;
-x5 : tree ;
-x6 : tree ;
-
-QUERY
-
-(NOT (((is_leaf(x5)
- AND (NOT (x2 = x1)))
- AND (x2 = pred(pred(zero))))
- AND (NOT is_node(node(null)))));
diff --git a/test/regress/regress0/datatypes/v2l40025.cvc.smt2 b/test/regress/regress0/datatypes/v2l40025.cvc.smt2
new file mode 100644
index 000000000..b45175a74
--- /dev/null
+++ b/test/regress/regress0/datatypes/v2l40025.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () list)
+(declare-fun x4 () list)
+(declare-fun x5 () tree)
+(declare-fun x6 () tree)
+(check-sat-assuming ( (not (not (and (and (and ((_ is leaf) x5) (not (= x2 x1))) (= x2 (pred (pred zero)))) (not ((_ is node) (node null)))))) ))
diff --git a/test/regress/regress0/datatypes/v3l60006.cvc b/test/regress/regress0/datatypes/v3l60006.cvc
deleted file mode 100644
index 8816caa9a..000000000
--- a/test/regress/regress0/datatypes/v3l60006.cvc
+++ /dev/null
@@ -1,26 +0,0 @@
-% COMMAND-LINE: -q
-% EXPECT: not_entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : nat ;
-x4 : list ;
-x5 : list ;
-x6 : list ;
-x7 : tree ;
-x8 : tree ;
-x9 : tree ;
-
-QUERY
-
-(NOT ((((((NOT is_succ(pred(data(leaf(x3)))))
- AND (x1 = zero))
- AND (NOT is_zero(succ(succ(zero)))))
- AND (NOT (x3 = x2)))
- AND (x4 = cdr(x5)))
- AND is_cons(cons(x8,x5))));
diff --git a/test/regress/regress0/datatypes/v3l60006.cvc.smt2 b/test/regress/regress0/datatypes/v3l60006.cvc.smt2
new file mode 100644
index 000000000..8906757a9
--- /dev/null
+++ b/test/regress/regress0/datatypes/v3l60006.cvc.smt2
@@ -0,0 +1,15 @@
+; COMMAND-LINE: -q
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () nat)
+(declare-fun x4 () list)
+(declare-fun x5 () list)
+(declare-fun x6 () list)
+(declare-fun x7 () tree)
+(declare-fun x8 () tree)
+(declare-fun x9 () tree)
+(check-sat-assuming ( (not (not (and (and (and (and (and (not ((_ is succ) (pred (data (leaf x3))))) (= x1 zero)) (not ((_ is zero) (succ (succ zero))))) (not (= x3 x2))) (= x4 (cdr x5))) ((_ is cons) (cons x8 x5))))) ))
diff --git a/test/regress/regress0/datatypes/v5l30058.cvc b/test/regress/regress0/datatypes/v5l30058.cvc
deleted file mode 100644
index d3db742ae..000000000
--- a/test/regress/regress0/datatypes/v5l30058.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% EXPECT: not_entailed
-DATATYPE
- nat = succ(pred : nat) | zero,
- list = cons(car : tree, cdr : list) | null,
- tree = node(children : list) | leaf(data : nat)
-END;
-
-x1 : nat ;
-x2 : nat ;
-x3 : nat ;
-x4 : nat ;
-x5 : nat ;
-x6 : list ;
-x7 : list ;
-x8 : list ;
-x9 : list ;
-x10 : list ;
-x11 : tree ;
-x12 : tree ;
-x13 : tree ;
-x14 : tree ;
-x15 : tree ;
-
-QUERY
-
-(NOT (((NOT (node(x9) = car(x8)))
- AND (node(x6) = x11))
- AND (NOT is_node(x15))));
diff --git a/test/regress/regress0/datatypes/v5l30058.cvc.smt2 b/test/regress/regress0/datatypes/v5l30058.cvc.smt2
new file mode 100644
index 000000000..b081b80d1
--- /dev/null
+++ b/test/regress/regress0/datatypes/v5l30058.cvc.smt2
@@ -0,0 +1,20 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)(list 0)(tree 0)) (((succ (pred nat)) (zero))((cons (car tree) (cdr list)) (null))((node (children list)) (leaf (data nat)))))
+(declare-fun x1 () nat)
+(declare-fun x2 () nat)
+(declare-fun x3 () nat)
+(declare-fun x4 () nat)
+(declare-fun x5 () nat)
+(declare-fun x6 () list)
+(declare-fun x7 () list)
+(declare-fun x8 () list)
+(declare-fun x9 () list)
+(declare-fun x10 () list)
+(declare-fun x11 () tree)
+(declare-fun x12 () tree)
+(declare-fun x13 () tree)
+(declare-fun x14 () tree)
+(declare-fun x15 () tree)
+(check-sat-assuming ( (not (not (and (and (not (= (node x9) (car x8))) (= (node x6) x11)) (not ((_ is node) x15))))) ))
diff --git a/test/regress/regress0/datatypes/wrong-sel-simp.cvc b/test/regress/regress0/datatypes/wrong-sel-simp.cvc
deleted file mode 100644
index 31065ba41..000000000
--- a/test/regress/regress0/datatypes/wrong-sel-simp.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% COMMAND-LINE: -q
-% EXPECT: not_entailed
-DATATYPE
- nat = succ(pred : nat) | zero
-END;
-
-QUERY pred(zero) = zero;
diff --git a/test/regress/regress0/datatypes/wrong-sel-simp.cvc.smt2 b/test/regress/regress0/datatypes/wrong-sel-simp.cvc.smt2
new file mode 100644
index 000000000..1e8d52ff5
--- /dev/null
+++ b/test/regress/regress0/datatypes/wrong-sel-simp.cvc.smt2
@@ -0,0 +1,6 @@
+; COMMAND-LINE: -q
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-datatypes ((nat 0)) (((succ (pred nat)) (zero))))
+(check-sat-assuming ( (not (= (pred zero) zero)) ))
diff --git a/test/regress/regress0/expect/scrub.06.cvc b/test/regress/regress0/expect/scrub.06.cvc
deleted file mode 100644
index 071a2278f..000000000
--- a/test/regress/regress0/expect/scrub.06.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% COMMAND-LINE: --force-logic=QF_LRA
-% SCRUBBER: sed -e 's/The fact in question: .*$/The fact in question: TERM/' -e 's/in a linear logic: .*$/in a linear logic: TERM/' -e '/^[[:space:]]*$/d'
-% EXPECT: A non-linear fact was asserted to arithmetic in a linear logic.
-% EXPECT: The fact in question: TERM
-% EXIT: 1
-
-n : REAL;
-
-QUERY (n/n) = 1;
diff --git a/test/regress/regress0/expect/scrub.06.cvc.smt2 b/test/regress/regress0/expect/scrub.06.cvc.smt2
new file mode 100644
index 000000000..90c532e71
--- /dev/null
+++ b/test/regress/regress0/expect/scrub.06.cvc.smt2
@@ -0,0 +1,12 @@
+; COMMAND-LINE: --force-logic=QF_LRA
+; EXIT: 1
+; EXPECT: (error "A non-linear fact was asserted to arithmetic in a linear logic.
+; EXPECT: The fact in question: TERM
+; EXPECT: ")
+;
+;
+; SCRUBBER: sed -e 's/The fact in question: .*$/The fact in question: TERM/' -e 's/in a linear logic: .*$/in a linear logic: TERM/' -e '/^[[:space:]]*$/d'
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun n () Real)
+(check-sat-assuming ( (= (/ n n) 1) ))
diff --git a/test/regress/regress0/fmf/bug-041417-set-options.cvc b/test/regress/regress0/fmf/bug-041417-set-options.cvc
deleted file mode 100644
index c4e9ba834..000000000
--- a/test/regress/regress0/fmf/bug-041417-set-options.cvc
+++ /dev/null
@@ -1,16 +0,0 @@
-% EXPECT: not_entailed
-OPTION "finite-model-find";
-OPTION "fmf-fun";
-
-DATATYPE
- Node = A | B
-END;
-
-link, reach: (Node,Node,INT) -> BOOLEAN;
-
-ASSERT FORALL(x,y:Node, c:INT):
- link(x,y,c) => reach(x,y,c);
-
-ASSERT link(A,B,1);
-
-QUERY reach(A,B,5);
diff --git a/test/regress/regress0/fmf/bug-041417-set-options.cvc.smt2 b/test/regress/regress0/fmf/bug-041417-set-options.cvc.smt2
new file mode 100644
index 000000000..06c1415c2
--- /dev/null
+++ b/test/regress/regress0/fmf/bug-041417-set-options.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(set-option :finite-model-find true)
+(set-option :fmf-fun true)
+(declare-datatypes ((Node 0)) (((A) (B))))
+(declare-fun link (Node Node Int) Bool)
+(declare-fun reach (Node Node Int) Bool)
+(assert (forall ((x Node) (y Node) (c Int)) (=> (link x y c) (reach x y c))))
+(assert (link A B 1))
+(check-sat-assuming ( (reach A B 5) ))
diff --git a/test/regress/regress0/fmf/quant_real_univ.cvc b/test/regress/regress0/fmf/quant_real_univ.cvc
deleted file mode 100644
index c3dbb2cd6..000000000
--- a/test/regress/regress0/fmf/quant_real_univ.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% EXPECT: sat
-OPTION "fmf-bound";
-OPTION "sets-ext";
-Atom : TYPE;
-REAL_UNIVERSE : SET OF [REAL];
-ATOM_UNIVERSE : SET OF [Atom];
-ASSERT REAL_UNIVERSE = UNIVERSE :: SET OF [REAL];
-ASSERT ATOM_UNIVERSE = UNIVERSE :: SET OF [Atom];
-
-levelVal : SET OF [Atom, REAL];
-ASSERT FORALL (s : Atom, v1, v2 : REAL) :
- (TUPLE(s) IS_IN ATOM_UNIVERSE AND TUPLE(v1) IS_IN REAL_UNIVERSE AND TUPLE(v2) IS_IN REAL_UNIVERSE)
- => (((s, v1) IS_IN levelVal AND (s, v2) IS_IN levelVal) => (v1 = v2));
-
-CHECKSAT;
diff --git a/test/regress/regress0/fmf/quant_real_univ.cvc.smt2 b/test/regress/regress0/fmf/quant_real_univ.cvc.smt2
new file mode 100644
index 000000000..f4724355b
--- /dev/null
+++ b/test/regress/regress0/fmf/quant_real_univ.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(set-option :fmf-bound true)
+(set-option :sets-ext true)
+(declare-sort Atom 0)
+(declare-fun REAL_UNIVERSE () (Set (Tuple Real)))
+(declare-fun ATOM_UNIVERSE () (Set (Tuple Atom)))
+(assert (= REAL_UNIVERSE (as univset (Set (Tuple Real)))))
+(assert (= ATOM_UNIVERSE (as univset (Set (Tuple Atom)))))
+(declare-fun levelVal () (Set (Tuple Atom Real)))
+(assert (forall ((s Atom) (v1 Real) (v2 Real)) (=> (and (and (member (mkTuple s) ATOM_UNIVERSE) (member (mkTuple v1) REAL_UNIVERSE)) (member (mkTuple v2) REAL_UNIVERSE)) (=> (and (member (mkTuple s v1) levelVal) (member (mkTuple s v2) levelVal)) (= v1 v2)))))
+(check-sat)
diff --git a/test/regress/regress0/ite.cvc b/test/regress/regress0/ite.cvc
deleted file mode 100644
index adb2cb0ae..000000000
--- a/test/regress/regress0/ite.cvc
+++ /dev/null
@@ -1,3 +0,0 @@
-% EXPECT: unsat
-x, y : REAL;
-CHECKSAT (NOT (x = IF TRUE THEN x ELSE y ENDIF));
diff --git a/test/regress/regress0/ite.cvc.smt2 b/test/regress/regress0/ite.cvc.smt2
new file mode 100644
index 000000000..3d4495610
--- /dev/null
+++ b/test/regress/regress0/ite.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental true)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(push 1)
+
+(assert (not (= x (ite true x y))))
+
+(check-sat)
+
+(pop 1)
+
diff --git a/test/regress/regress0/let.cvc b/test/regress/regress0/let.cvc
deleted file mode 100644
index d0f5c5e1f..000000000
--- a/test/regress/regress0/let.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-U: TYPE;
-a: U;
-b: U;
-f: U -> U;
-QUERY LET v_0 = (a = b)
-IN NOT (v_0 AND NOT v_0);
diff --git a/test/regress/regress0/let.cvc.smt2 b/test/regress/regress0/let.cvc.smt2
new file mode 100644
index 000000000..cf4b76726
--- /dev/null
+++ b/test/regress/regress0/let.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-sort U 0)
+(declare-fun a () U)
+(declare-fun b () U)
+(declare-fun f (U) U)
+(check-sat-assuming ( (not (let ((_let_1 (= a b))) (not (and _let_1 (not _let_1))))) ))
diff --git a/test/regress/regress0/logops.01.cvc b/test/regress/regress0/logops.01.cvc
deleted file mode 100644
index 305f2d396..000000000
--- a/test/regress/regress0/logops.01.cvc
+++ /dev/null
@@ -1,3 +0,0 @@
-a, b, c: BOOLEAN;
-% EXPECT: entailed
-QUERY (a XOR b) <=> (NOT a AND b) OR (NOT b AND a);
diff --git a/test/regress/regress0/logops.01.cvc.smt2 b/test/regress/regress0/logops.01.cvc.smt2
new file mode 100644
index 000000000..c7721fc5b
--- /dev/null
+++ b/test/regress/regress0/logops.01.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (xor a b) (or (and (not a) b) (and (not b) a)))) ))
diff --git a/test/regress/regress0/logops.02.cvc b/test/regress/regress0/logops.02.cvc
deleted file mode 100644
index c74c11983..000000000
--- a/test/regress/regress0/logops.02.cvc
+++ /dev/null
@@ -1,3 +0,0 @@
-a, b, c: BOOLEAN;
-% EXPECT: not_entailed
-QUERY NOT c AND b;
diff --git a/test/regress/regress0/logops.02.cvc.smt2 b/test/regress/regress0/logops.02.cvc.smt2
new file mode 100644
index 000000000..f78fa6de7
--- /dev/null
+++ b/test/regress/regress0/logops.02.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (and (not c) b)) ))
diff --git a/test/regress/regress0/logops.03.cvc b/test/regress/regress0/logops.03.cvc
deleted file mode 100644
index 1c86ce594..000000000
--- a/test/regress/regress0/logops.03.cvc
+++ /dev/null
@@ -1,3 +0,0 @@
-a, b, c: BOOLEAN;
-% EXPECT: entailed
-QUERY (IF c THEN a ELSE b ENDIF) <=> ((c AND a) OR (NOT c AND b));
diff --git a/test/regress/regress0/logops.03.cvc.smt2 b/test/regress/regress0/logops.03.cvc.smt2
new file mode 100644
index 000000000..0d62df51d
--- /dev/null
+++ b/test/regress/regress0/logops.03.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (ite c a b) (or (and c a) (and (not c) b)))) ))
diff --git a/test/regress/regress0/logops.04.cvc b/test/regress/regress0/logops.04.cvc
deleted file mode 100644
index 254b0ed87..000000000
--- a/test/regress/regress0/logops.04.cvc
+++ /dev/null
@@ -1,3 +0,0 @@
-a, b, c: BOOLEAN;
-% EXPECT: entailed
-QUERY (a => b) <=> (NOT a OR b);
diff --git a/test/regress/regress0/logops.04.cvc.smt2 b/test/regress/regress0/logops.04.cvc.smt2
new file mode 100644
index 000000000..8bd1a799b
--- /dev/null
+++ b/test/regress/regress0/logops.04.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (=> a b) (or (not a) b))) ))
diff --git a/test/regress/regress0/logops.05.cvc b/test/regress/regress0/logops.05.cvc
deleted file mode 100644
index 2897dbc0c..000000000
--- a/test/regress/regress0/logops.05.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c: BOOLEAN;
-% EXPECT: entailed
-QUERY TRUE XOR FALSE;
-
diff --git a/test/regress/regress0/logops.05.cvc.smt2 b/test/regress/regress0/logops.05.cvc.smt2
new file mode 100644
index 000000000..395eb1f63
--- /dev/null
+++ b/test/regress/regress0/logops.05.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (xor true false)) ))
diff --git a/test/regress/regress0/precedence/and-not.cvc b/test/regress/regress0/precedence/and-not.cvc
deleted file mode 100644
index 3ede8d211..000000000
--- a/test/regress/regress0/precedence/and-not.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of AND and NOT.
-
-A, B: BOOLEAN;
-
-QUERY (A AND NOT B) <=> (A AND (NOT B));
diff --git a/test/regress/regress0/precedence/and-not.cvc.smt2 b/test/regress/regress0/precedence/and-not.cvc.smt2
new file mode 100644
index 000000000..13a8e9083
--- /dev/null
+++ b/test/regress/regress0/precedence/and-not.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (and A (not B)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/and-xor.cvc b/test/regress/regress0/precedence/and-xor.cvc
deleted file mode 100644
index ec69087d1..000000000
--- a/test/regress/regress0/precedence/and-xor.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of XOR and AND.
-
-A, B, C: BOOLEAN;
-
-QUERY (A AND B XOR C) <=> ((A AND B) XOR C);
diff --git a/test/regress/regress0/precedence/and-xor.cvc.smt2 b/test/regress/regress0/precedence/and-xor.cvc.smt2
new file mode 100644
index 000000000..32959f6f4
--- /dev/null
+++ b/test/regress/regress0/precedence/and-xor.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (xor (and A B) C))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/bool-cmp.cvc b/test/regress/regress0/precedence/bool-cmp.cvc
deleted file mode 100644
index 4f81c86ad..000000000
--- a/test/regress/regress0/precedence/bool-cmp.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of comparisons and booleans
-
-x , y, z: INT;
-
-QUERY (x > y AND y = z OR x < z) <=> (((x > y) AND (y = z)) OR (x < z));
diff --git a/test/regress/regress0/precedence/bool-cmp.cvc.smt2 b/test/regress/regress0/precedence/bool-cmp.cvc.smt2
new file mode 100644
index 000000000..43ba051f8
--- /dev/null
+++ b/test/regress/regress0/precedence/bool-cmp.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Int)
+(declare-fun y () Int)
+(declare-fun z () Int)
+(check-sat-assuming ( (not (let ((_let_1 (or (and (> x y) (= y z)) (< x z)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/cmp-plus.cvc b/test/regress/regress0/precedence/cmp-plus.cvc
deleted file mode 100644
index 54ee7b8f8..000000000
--- a/test/regress/regress0/precedence/cmp-plus.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of comparisons and plus/minus
-
-x, y, z: INT;
-
-QUERY (x + y - z > 0 AND 0 < x - y + z) <=>
- ((((x + y) - z) > 0) AND (0 < ((x - y) + z)));
diff --git a/test/regress/regress0/precedence/cmp-plus.cvc.smt2 b/test/regress/regress0/precedence/cmp-plus.cvc.smt2
new file mode 100644
index 000000000..fda067f16
--- /dev/null
+++ b/test/regress/regress0/precedence/cmp-plus.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Int)
+(declare-fun y () Int)
+(declare-fun z () Int)
+(check-sat-assuming ( (not (let ((_let_1 (and (> (- (+ x y) z) 0) (< 0 (+ (- x y) z))))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/eq-fun.cvc b/test/regress/regress0/precedence/eq-fun.cvc
deleted file mode 100644
index af81ea10d..000000000
--- a/test/regress/regress0/precedence/eq-fun.cvc
+++ /dev/null
@@ -1,8 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of function application and =
-
-T : TYPE;
-x , y: T;
-f : T -> T;
-
-QUERY (f(x) = f(y)) <=> ((f(x)) = (f(y)));
diff --git a/test/regress/regress0/precedence/eq-fun.cvc.smt2 b/test/regress/regress0/precedence/eq-fun.cvc.smt2
new file mode 100644
index 000000000..082cc6875
--- /dev/null
+++ b/test/regress/regress0/precedence/eq-fun.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-sort T 0)
+(declare-fun x () T)
+(declare-fun y () T)
+(declare-fun f (T) T)
+(check-sat-assuming ( (not (let ((_let_1 (= (f x) (f y)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/iff-assoc.cvc b/test/regress/regress0/precedence/iff-assoc.cvc
deleted file mode 100644
index 4643292b6..000000000
--- a/test/regress/regress0/precedence/iff-assoc.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right associativity of <=>
-
-A, B, C: BOOLEAN;
-
-QUERY (A <=> B <=> C) <=> (A <=> (B <=> C));
diff --git a/test/regress/regress0/precedence/iff-assoc.cvc.smt2 b/test/regress/regress0/precedence/iff-assoc.cvc.smt2
new file mode 100644
index 000000000..f70676f93
--- /dev/null
+++ b/test/regress/regress0/precedence/iff-assoc.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (= (= (= A B) C) (= A (= B C)))) ))
diff --git a/test/regress/regress0/precedence/iff-implies.cvc b/test/regress/regress0/precedence/iff-implies.cvc
deleted file mode 100644
index 24181487d..000000000
--- a/test/regress/regress0/precedence/iff-implies.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of <=> and =>.
-
-A, B, C: BOOLEAN;
-
-QUERY (A <=> B => C) <=> ((A <=> (B => C)));
diff --git a/test/regress/regress0/precedence/iff-implies.cvc.smt2 b/test/regress/regress0/precedence/iff-implies.cvc.smt2
new file mode 100644
index 000000000..d0e2887a6
--- /dev/null
+++ b/test/regress/regress0/precedence/iff-implies.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (= A (=> B C)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/implies-assoc.cvc b/test/regress/regress0/precedence/implies-assoc.cvc
deleted file mode 100644
index c6883c6ad..000000000
--- a/test/regress/regress0/precedence/implies-assoc.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right associativity of =>
-
-A, B, C: BOOLEAN;
-
-QUERY (A => B => C) <=> (A => (B => C));
diff --git a/test/regress/regress0/precedence/implies-assoc.cvc.smt2 b/test/regress/regress0/precedence/implies-assoc.cvc.smt2
new file mode 100644
index 000000000..2910f8359
--- /dev/null
+++ b/test/regress/regress0/precedence/implies-assoc.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (=> A (=> B C)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/implies-iff.cvc b/test/regress/regress0/precedence/implies-iff.cvc
deleted file mode 100644
index 9ebed72d4..000000000
--- a/test/regress/regress0/precedence/implies-iff.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of <=> and =>.
-
-A, B, C: BOOLEAN;
-
-QUERY (A => B <=> C) <=> ((A => B) <=> C);
diff --git a/test/regress/regress0/precedence/implies-iff.cvc.smt2 b/test/regress/regress0/precedence/implies-iff.cvc.smt2
new file mode 100644
index 000000000..af4b570a9
--- /dev/null
+++ b/test/regress/regress0/precedence/implies-iff.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (= (=> A B) C))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/implies-or.cvc b/test/regress/regress0/precedence/implies-or.cvc
deleted file mode 100644
index 883e7d4a1..000000000
--- a/test/regress/regress0/precedence/implies-or.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of => and OR.
-
-A, B, C: BOOLEAN;
-
-QUERY (A => B OR C) <=> (A => (B OR C));
diff --git a/test/regress/regress0/precedence/implies-or.cvc.smt2 b/test/regress/regress0/precedence/implies-or.cvc.smt2
new file mode 100644
index 000000000..75fd03257
--- /dev/null
+++ b/test/regress/regress0/precedence/implies-or.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (=> A (or B C)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/not-and.cvc b/test/regress/regress0/precedence/not-and.cvc
deleted file mode 100644
index 579531ded..000000000
--- a/test/regress/regress0/precedence/not-and.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of AND and NOT.
-
-A, B, C: BOOLEAN;
-
-QUERY (NOT A AND B) <=> ((NOT A) AND B);
diff --git a/test/regress/regress0/precedence/not-and.cvc.smt2 b/test/regress/regress0/precedence/not-and.cvc.smt2
new file mode 100644
index 000000000..2e683102d
--- /dev/null
+++ b/test/regress/regress0/precedence/not-and.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (and (not A) B))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/not-eq.cvc b/test/regress/regress0/precedence/not-eq.cvc
deleted file mode 100644
index f8c7366be..000000000
--- a/test/regress/regress0/precedence/not-eq.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of = and NOT.
-
-A, B: INT;
-
-QUERY (NOT A = B) <=> (NOT (A = B));
diff --git a/test/regress/regress0/precedence/not-eq.cvc.smt2 b/test/regress/regress0/precedence/not-eq.cvc.smt2
new file mode 100644
index 000000000..d7bf167b7
--- /dev/null
+++ b/test/regress/regress0/precedence/not-eq.cvc.smt2
@@ -0,0 +1,6 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Int)
+(declare-fun B () Int)
+(check-sat-assuming ( (not (let ((_let_1 (not (= A B)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/or-implies.cvc b/test/regress/regress0/precedence/or-implies.cvc
deleted file mode 100644
index 746f142e4..000000000
--- a/test/regress/regress0/precedence/or-implies.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of => and OR.
-
-A, B, C: BOOLEAN;
-
-QUERY (A OR B => C) <=> ((A OR B) => C);
diff --git a/test/regress/regress0/precedence/or-implies.cvc.smt2 b/test/regress/regress0/precedence/or-implies.cvc.smt2
new file mode 100644
index 000000000..7908299de
--- /dev/null
+++ b/test/regress/regress0/precedence/or-implies.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (=> (or A B) C))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/or-xor.cvc b/test/regress/regress0/precedence/or-xor.cvc
deleted file mode 100644
index 405cb68b7..000000000
--- a/test/regress/regress0/precedence/or-xor.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of OR and XOR.
-
-A, B, C: BOOLEAN;
-
-QUERY ((A OR B XOR C) <=> ((A OR B) XOR C))
- AND ((A XOR B OR C) <=> ((A XOR B) OR C));
diff --git a/test/regress/regress0/precedence/or-xor.cvc.smt2 b/test/regress/regress0/precedence/or-xor.cvc.smt2
new file mode 100644
index 000000000..2b33ff6c8
--- /dev/null
+++ b/test/regress/regress0/precedence/or-xor.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (or (xor A B) C))) (let ((_let_2 (xor (or A B) C))) (and (= _let_2 _let_2) (= _let_1 _let_1))))) ))
diff --git a/test/regress/regress0/precedence/plus-mult.cvc b/test/regress/regress0/precedence/plus-mult.cvc
deleted file mode 100644
index 57b9b99cf..000000000
--- a/test/regress/regress0/precedence/plus-mult.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of plus/minus and mult/divide
-
-a, b, c, d, e: INT;
-
-QUERY (a + 2 * b / 3 - c / 4 * 5 + d / 6 - e ) =
- ((((a + ((2 * b) / 3)) - ((c / 4) * 5)) + (d / 6)) - e);
diff --git a/test/regress/regress0/precedence/plus-mult.cvc.smt2 b/test/regress/regress0/precedence/plus-mult.cvc.smt2
new file mode 100644
index 000000000..1b2711597
--- /dev/null
+++ b/test/regress/regress0/precedence/plus-mult.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Int)
+(declare-fun b () Int)
+(declare-fun c () Int)
+(declare-fun d () Int)
+(declare-fun e () Int)
+(check-sat-assuming ( (not (let ((_let_1 (- (+ (- (+ a (/ (* 2 b) 3)) (* (/ c 4) 5)) (/ d 6)) e))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/xor-and.cvc b/test/regress/regress0/precedence/xor-and.cvc
deleted file mode 100644
index 08c939c5e..000000000
--- a/test/regress/regress0/precedence/xor-and.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of XOR and AND.
-
-A, B, C: BOOLEAN;
-
-QUERY (A XOR B AND C) <=> (A XOR (B AND C));
diff --git a/test/regress/regress0/precedence/xor-and.cvc.smt2 b/test/regress/regress0/precedence/xor-and.cvc.smt2
new file mode 100644
index 000000000..0a62397d6
--- /dev/null
+++ b/test/regress/regress0/precedence/xor-and.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (xor A (and B C)))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/xor-assoc.cvc b/test/regress/regress0/precedence/xor-assoc.cvc
deleted file mode 100644
index 5f4646b1f..000000000
--- a/test/regress/regress0/precedence/xor-assoc.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for left associativity of XOR
-
-A, B, C: BOOLEAN;
-
-QUERY (A XOR B XOR C) <=> ((A XOR B) XOR C);
diff --git a/test/regress/regress0/precedence/xor-assoc.cvc.smt2 b/test/regress/regress0/precedence/xor-assoc.cvc.smt2
new file mode 100644
index 000000000..2daa39e65
--- /dev/null
+++ b/test/regress/regress0/precedence/xor-assoc.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (xor (xor A B) C))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/precedence/xor-or.cvc b/test/regress/regress0/precedence/xor-or.cvc
deleted file mode 100644
index 87abc0e73..000000000
--- a/test/regress/regress0/precedence/xor-or.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: entailed
-% Simple test for right precedence of OR and XOR.
-
-A, B, C: BOOLEAN;
-
-QUERY (A XOR B OR C) <=> ((A XOR B) OR C);
diff --git a/test/regress/regress0/precedence/xor-or.cvc.smt2 b/test/regress/regress0/precedence/xor-or.cvc.smt2
new file mode 100644
index 000000000..125752734
--- /dev/null
+++ b/test/regress/regress0/precedence/xor-or.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun A () Bool)
+(declare-fun B () Bool)
+(declare-fun C () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (or (xor A B) C))) (= _let_1 _let_1))) ))
diff --git a/test/regress/regress0/preprocess/preprocess_00.cvc b/test/regress/regress0/preprocess/preprocess_00.cvc
deleted file mode 100644
index 2e51a42ad..000000000
--- a/test/regress/regress0/preprocess/preprocess_00.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: entailed
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9: BOOLEAN;
-
-ASSERT (a5);
-
-QUERY (a0 OR a1 OR a2 OR a3 OR a4 OR a5 OR a6 OR a7 OR a8 OR a9);
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_00.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_00.cvc.smt2
new file mode 100644
index 000000000..685718c3e
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_00.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(declare-fun a9 () Bool)
+(assert a5)
+(check-sat-assuming ( (not (or (or (or (or (or (or (or (or (or a0 a1) a2) a3) a4) a5) a6) a7) a8) a9)) ))
diff --git a/test/regress/regress0/preprocess/preprocess_01.cvc b/test/regress/regress0/preprocess/preprocess_01.cvc
deleted file mode 100644
index 1d3fafae8..000000000
--- a/test/regress/regress0/preprocess/preprocess_01.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: unsat
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9: BOOLEAN;
-
-ASSERT (a5);
-
-ASSERT NOT (a0 OR a1 OR a2 OR a3 OR a4 OR a5 OR a6 OR a7 OR a8 OR a9);
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_01.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_01.cvc.smt2
new file mode 100644
index 000000000..f6bf17ac5
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_01.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(declare-fun a9 () Bool)
+(assert a5)
+(assert (not (or (or (or (or (or (or (or (or (or a0 a1) a2) a3) a4) a5) a6) a7) a8) a9)))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_02.cvc b/test/regress/regress0/preprocess/preprocess_02.cvc
deleted file mode 100644
index 0f94103f6..000000000
--- a/test/regress/regress0/preprocess/preprocess_02.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: entailed
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9: BOOLEAN;
-
-ASSERT (NOT a5);
-
-QUERY NOT (a0 AND a1 AND a2 AND a3 AND a4 AND a5 AND a6 AND a7 AND a8 AND a9);
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_02.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_02.cvc.smt2
new file mode 100644
index 000000000..d4bf1f3d4
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_02.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(declare-fun a9 () Bool)
+(assert (not a5))
+(check-sat-assuming ( (not (not (and (and (and (and (and (and (and (and (and a0 a1) a2) a3) a4) a5) a6) a7) a8) a9))) ))
diff --git a/test/regress/regress0/preprocess/preprocess_03.cvc b/test/regress/regress0/preprocess/preprocess_03.cvc
deleted file mode 100644
index 7503594df..000000000
--- a/test/regress/regress0/preprocess/preprocess_03.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: unsat
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9: BOOLEAN;
-
-ASSERT (NOT a5);
-ASSERT (a0 AND a1 AND a2 AND a3 AND a4 AND a5 AND a6 AND a7 AND a8 AND a9);
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_03.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_03.cvc.smt2
new file mode 100644
index 000000000..34d203dc7
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_03.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(declare-fun a9 () Bool)
+(assert (not a5))
+(assert (and (and (and (and (and (and (and (and (and a0 a1) a2) a3) a4) a5) a6) a7) a8) a9))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_04.cvc b/test/regress/regress0/preprocess/preprocess_04.cvc
deleted file mode 100644
index fd4121432..000000000
--- a/test/regress/regress0/preprocess/preprocess_04.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% EXPECT: unsat
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8: BOOLEAN;
-
-ASSERT (NOT a1);
-ASSERT (a4 AND a7);
-ASSERT
- IF (a0 AND a1 AND a2)
- THEN (a3 AND a4 AND a5)
- ELSE (a6 AND NOT a7 AND a8)
- ENDIF;
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_04.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_04.cvc.smt2
new file mode 100644
index 000000000..3cf309173
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_04.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(assert (not a1))
+(assert (and a4 a7))
+(assert (ite (and (and a0 a1) a2) (and (and a3 a4) a5) (and (and a6 (not a7)) a8)))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_05.cvc b/test/regress/regress0/preprocess/preprocess_05.cvc
deleted file mode 100644
index 54e070ab5..000000000
--- a/test/regress/regress0/preprocess/preprocess_05.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% EXPECT: sat
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8: BOOLEAN;
-
-ASSERT (NOT a1);
-ASSERT (a4 AND a7);
-ASSERT
- IF (a0 AND a1 AND a2)
- THEN (a3 AND a4 AND a5)
- ELSE (a6 AND a7 AND a8)
- ENDIF;
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_05.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_05.cvc.smt2
new file mode 100644
index 000000000..23d3c238b
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_05.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(assert (not a1))
+(assert (and a4 a7))
+(assert (ite (and (and a0 a1) a2) (and (and a3 a4) a5) (and (and a6 a7) a8)))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_06.cvc b/test/regress/regress0/preprocess/preprocess_06.cvc
deleted file mode 100644
index abcc7a6ac..000000000
--- a/test/regress/regress0/preprocess/preprocess_06.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-% EXPECT: entailed
-
-a0, a1, a2, a3, a4, a5: BOOLEAN;
-
-ASSERT (a0 => a1);
-ASSERT (a1 => a2);
-ASSERT (a2 => a3);
-ASSERT (a3 => a4);
-ASSERT (a4 => a5);
-ASSERT a0;
-
-QUERY (a0 <=> a5);
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_06.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_06.cvc.smt2
new file mode 100644
index 000000000..d86faccbb
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_06.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(assert (=> a0 a1))
+(assert (=> a1 a2))
+(assert (=> a2 a3))
+(assert (=> a3 a4))
+(assert (=> a4 a5))
+(assert a0)
+(check-sat-assuming ( (not (= a0 a5)) ))
diff --git a/test/regress/regress0/preprocess/preprocess_07.cvc b/test/regress/regress0/preprocess/preprocess_07.cvc
deleted file mode 100644
index 3de66a9ac..000000000
--- a/test/regress/regress0/preprocess/preprocess_07.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-
-a0, a1, a2, a3, a4, a5: BOOLEAN;
-
-ASSERT ((a0 AND a1 AND a2) <=> (a3 OR a4 OR a5));
-ASSERT (a4);
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_07.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_07.cvc.smt2
new file mode 100644
index 000000000..b071c0641
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_07.cvc.smt2
@@ -0,0 +1,12 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(assert (= (and (and a0 a1) a2) (or (or a3 a4) a5)))
+(assert a4)
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_08.cvc b/test/regress/regress0/preprocess/preprocess_08.cvc
deleted file mode 100644
index 880c84912..000000000
--- a/test/regress/regress0/preprocess/preprocess_08.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-
-a0, a1, a2, a3, a4, a5: BOOLEAN;
-
-ASSERT ((a0 AND a1 AND a2) <=> (a3 OR a4 OR a5));
-ASSERT (NOT a1);
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_08.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_08.cvc.smt2
new file mode 100644
index 000000000..baf16dbfa
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_08.cvc.smt2
@@ -0,0 +1,12 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(assert (= (and (and a0 a1) a2) (or (or a3 a4) a5)))
+(assert (not a1))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_09.cvc b/test/regress/regress0/preprocess/preprocess_09.cvc
deleted file mode 100644
index 1ee07e301..000000000
--- a/test/regress/regress0/preprocess/preprocess_09.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-% EXPECT: sat
-
-a0, a1, a2, a3, a4, a5: BOOLEAN;
-
-ASSERT ((a0 AND a1 AND a2) <=> (a3 OR a4 OR a5));
-ASSERT (a0);
-ASSERT (a1);
-ASSERT (a2);
-ASSERT (NOT a3);
-ASSERT (NOT a5);
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_09.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_09.cvc.smt2
new file mode 100644
index 000000000..e035c6071
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_09.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(assert (= (and (and a0 a1) a2) (or (or a3 a4) a5)))
+(assert a0)
+(assert a1)
+(assert a2)
+(assert (not a3))
+(assert (not a5))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_10.cvc b/test/regress/regress0/preprocess/preprocess_10.cvc
deleted file mode 100644
index 6158d6f2a..000000000
--- a/test/regress/regress0/preprocess/preprocess_10.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-x: REAL;
-b: BOOLEAN;
-
-ASSERT (x = IF b THEN 10 ELSE -10 ENDIF);
-ASSERT b;
-
-CHECKSAT;
-
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_10.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_10.cvc.smt2
new file mode 100644
index 000000000..f928a51e7
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_10.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun b () Bool)
+(assert (= x (ite b 10 (- 10))))
+(assert b)
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_11.cvc b/test/regress/regress0/preprocess/preprocess_11.cvc
deleted file mode 100644
index fe0aed70c..000000000
--- a/test/regress/regress0/preprocess/preprocess_11.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-
-x: REAL;
-y: REAL;
-
-ASSERT ((0 = IF TRUE THEN x ELSE 1 ENDIF) AND (0 = IF (x = 0) THEN 0 ELSE 1 ENDIF) AND (x = IF TRUE THEN y ELSE 0 ENDIF) AND (0 = IF TRUE THEN 0 ELSE 0 ENDIF));
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_11.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_11.cvc.smt2
new file mode 100644
index 000000000..6cb631b6b
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_11.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(assert (and (and (and (= 0 (ite true x 1)) (= 0 (ite (= x 0) 0 1))) (= x (ite true y 0))) (= 0 (ite true 0 0))))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_12.cvc b/test/regress/regress0/preprocess/preprocess_12.cvc
deleted file mode 100644
index a1da32c57..000000000
--- a/test/regress/regress0/preprocess/preprocess_12.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-
-x: REAL;
-y: REAL;
-b: BOOLEAN;
-
-ASSERT ((0 = IF b THEN x - y ELSE 2*x ENDIF));
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_12.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_12.cvc.smt2
new file mode 100644
index 000000000..c1fd76ad5
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_12.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(declare-fun b () Bool)
+(assert (= 0 (ite b (- x y) (* 2 x))))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_13.cvc b/test/regress/regress0/preprocess/preprocess_13.cvc
deleted file mode 100644
index 9a6cd797c..000000000
--- a/test/regress/regress0/preprocess/preprocess_13.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: entailed
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9: BOOLEAN;
-
-ASSERT (a5);
-
-QUERY (a0 OR (a1 OR (a2 OR (a3 OR (a4 OR (a5 OR (FALSE OR (a6 OR (a7 OR (a8 OR a9))))))))));
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_13.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_13.cvc.smt2
new file mode 100644
index 000000000..757c98cbb
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_13.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(declare-fun a9 () Bool)
+(assert a5)
+(check-sat-assuming ( (not (or a0 (or a1 (or a2 (or a3 (or a4 (or a5 (or false (or a6 (or a7 (or a8 a9))))))))))) ))
diff --git a/test/regress/regress0/preprocess/preprocess_14.cvc b/test/regress/regress0/preprocess/preprocess_14.cvc
deleted file mode 100644
index 4fbbce64b..000000000
--- a/test/regress/regress0/preprocess/preprocess_14.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9: BOOLEAN;
-
-ASSERT (a5);
-
-ASSERT (a0 OR (a1 AND (a2 OR (a3 AND (a4 AND (a5 AND (TRUE AND (a6 AND (a7 AND (a8 AND a9))))))))));
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_14.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_14.cvc.smt2
new file mode 100644
index 000000000..a63ea247b
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_14.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(declare-fun a9 () Bool)
+(assert a5)
+(assert (or a0 (and a1 (or a2 (and a3 (and a4 (and a5 (and true (and a6 (and a7 (and a8 a9)))))))))))
+(check-sat)
diff --git a/test/regress/regress0/preprocess/preprocess_15.cvc b/test/regress/regress0/preprocess/preprocess_15.cvc
deleted file mode 100644
index ea468c8a4..000000000
--- a/test/regress/regress0/preprocess/preprocess_15.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-
-a0, a1, a2, a3, a4, a5, a6, a7, a8, a9: BOOLEAN;
-
-ASSERT (a5);
-
-ASSERT (a0 OR (a1 AND (a2 OR (a3 AND (a4 AND (a5 AND (TRUE AND (a3 AND (a6 AND (a7 AND (a8 AND a9)))))))))));
-
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/preprocess/preprocess_15.cvc.smt2 b/test/regress/regress0/preprocess/preprocess_15.cvc.smt2
new file mode 100644
index 000000000..b480f0753
--- /dev/null
+++ b/test/regress/regress0/preprocess/preprocess_15.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a0 () Bool)
+(declare-fun a1 () Bool)
+(declare-fun a2 () Bool)
+(declare-fun a3 () Bool)
+(declare-fun a4 () Bool)
+(declare-fun a5 () Bool)
+(declare-fun a6 () Bool)
+(declare-fun a7 () Bool)
+(declare-fun a8 () Bool)
+(declare-fun a9 () Bool)
+(assert a5)
+(assert (or a0 (and a1 (or a2 (and a3 (and a4 (and a5 (and true (and a3 (and a6 (and a7 (and a8 a9))))))))))))
+(check-sat)
diff --git a/test/regress/regress0/print_lambda.cvc b/test/regress/regress0/print_lambda.cvc
deleted file mode 100644
index 99e5ff174..000000000
--- a/test/regress/regress0/print_lambda.cvc
+++ /dev/null
@@ -1,12 +0,0 @@
-% SCRUBBER: sed -e 's/f : (INT) -> INT = (LAMBDA(.*:INT): 0);$/f : (INT) -> INT = (LAMBDA(VAR:INT): 0);/'
-% COMMAND-LINE: --produce-models
-% EXPECT: sat
-% EXPECT: MODEL BEGIN
-% EXPECT: f : (INT) -> INT = (LAMBDA(VAR:INT): 0);
-% EXPECT: MODEL END;
-
-f : INT -> INT;
-ASSERT f(1) = 0;
-CHECKSAT;
-COUNTEREXAMPLE;
-
diff --git a/test/regress/regress0/print_lambda.cvc.smt2 b/test/regress/regress0/print_lambda.cvc.smt2
new file mode 100644
index 000000000..6a9345b8b
--- /dev/null
+++ b/test/regress/regress0/print_lambda.cvc.smt2
@@ -0,0 +1,11 @@
+; COMMAND-LINE: --produce-models
+; EXPECT: sat
+; EXPECT: (
+; EXPECT: (define-fun f ((_arg_1 Int)) Int 0)
+; EXPECT: )
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun f (Int) Int)
+(assert (= (f 1) 0))
+(check-sat)
+(get-model)
diff --git a/test/regress/regress0/print_model.cvc b/test/regress/regress0/print_model.cvc
deleted file mode 100644
index 0ad9ddf4c..000000000
--- a/test/regress/regress0/print_model.cvc
+++ /dev/null
@@ -1,12 +0,0 @@
-% COMMAND-LINE: --produce-models
-% EXPECT: sat
-% EXPECT: MODEL BEGIN
-% EXPECT: s1 : INT = 2;
-% EXPECT: s2 : INT = 1;
-% EXPECT: MODEL END;
-
-OPTION "produce-models";
-s1, s2 : INT;
-ASSERT s1 = 2;
-CHECKSAT s2 > 0 AND s2 < s1;
-COUNTERMODEL;
diff --git a/test/regress/regress0/print_model.cvc.smt2 b/test/regress/regress0/print_model.cvc.smt2
new file mode 100644
index 000000000..ac7ce80bb
--- /dev/null
+++ b/test/regress/regress0/print_model.cvc.smt2
@@ -0,0 +1,20 @@
+; COMMAND-LINE: --produce-models
+; EXPECT: sat
+; EXPECT: (
+; EXPECT: (define-fun s1 () Int 2)
+; EXPECT: (define-fun s2 () Int 1)
+; EXPECT: )
+(set-logic ALL)
+(set-option :incremental true)
+(set-option :produce-models true)
+(declare-fun s1 () Int)
+(declare-fun s2 () Int)
+(assert (= s1 2))
+(push 1)
+
+(assert (and (> s2 0) (< s2 s1)))
+
+(check-sat)
+(get-model)
+
+(pop 1)
diff --git a/test/regress/regress0/printer/tuples_and_records.cvc b/test/regress/regress0/printer/tuples_and_records.cvc
deleted file mode 100644
index 966668002..000000000
--- a/test/regress/regress0/printer/tuples_and_records.cvc
+++ /dev/null
@@ -1,18 +0,0 @@
-% EXPECT: not_entailed
-% EXPECT: ((r.a, "active"))
-% EXPECT: ((y.1, 9))
-OPTION "produce-models";
-
-R : TYPE = [#
- a : STRING,
- b : STRING
-#];
-r : R;
-
-y: [REAL, INT, REAL];
-
-ASSERT r = (# a := "active", b := "who knows?" #);
-ASSERT y = ( 4/5, 9, 11/9 );
-QUERY r.a = "what?";
-GET_VALUE r.a;
-GET_VALUE y.1;
diff --git a/test/regress/regress0/printer/tuples_and_records.cvc.smt2 b/test/regress/regress0/printer/tuples_and_records.cvc.smt2
new file mode 100644
index 000000000..49d12d1c0
--- /dev/null
+++ b/test/regress/regress0/printer/tuples_and_records.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: sat
+; EXPECT: (((a r) "active"))
+; EXPECT: ((((_ tupSel 1) y) 9))
+(set-logic ALL)
+(set-option :incremental false)
+(set-option :produce-models true)
+(declare-datatypes ((__cvc5_record_a_String_b_String 0)) (((__cvc5_record_a_String_b_String_ctor (a String) (b String)))))
+
+(declare-fun r () __cvc5_record_a_String_b_String)
+(declare-fun y () (Tuple Real Int Real))
+(assert (= r (__cvc5_record_a_String_b_String_ctor "active" "who knows?")))
+(assert (= y (mkTuple (/ 4 5) 9 (/ 11 9))))
+(check-sat-assuming ( (not (= (a r) "what?")) ))
+(get-value ( (a r) ))
+(get-value ( ((_ tupSel 1) y) ))
diff --git a/test/regress/regress0/push-pop/bug233.cvc b/test/regress/regress0/push-pop/bug233.cvc
deleted file mode 100644
index 1a6049329..000000000
--- a/test/regress/regress0/push-pop/bug233.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% Tests the invariants for multiple queries.
-% COMMAND-LINE: --incremental
-
-a, b: BOOLEAN;
-
-% EXPECT: entailed
-QUERY (a AND b) OR NOT (a AND b);
-
-% EXPECT: not_entailed
-QUERY (a OR b);
-
diff --git a/test/regress/regress0/push-pop/bug233.cvc.smt2 b/test/regress/regress0/push-pop/bug233.cvc.smt2
new file mode 100644
index 000000000..422f8d5ca
--- /dev/null
+++ b/test/regress/regress0/push-pop/bug233.cvc.smt2
@@ -0,0 +1,8 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: sat
+(set-logic ALL)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(check-sat-assuming ( (not (let ((_let_1 (and a b))) (or _let_1 (not _let_1)))) ))
+(check-sat-assuming ( (not (or a b)) ))
diff --git a/test/regress/regress0/push-pop/incremental-subst-bug.cvc b/test/regress/regress0/push-pop/incremental-subst-bug.cvc
deleted file mode 100644
index 657e74486..000000000
--- a/test/regress/regress0/push-pop/incremental-subst-bug.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% COMMAND-LINE: --incremental
-U : TYPE;
-x, y : U;
-% EXPECT: not_entailed
-QUERY x = y;
-ASSERT x = y;
-% EXPECT: entailed
-QUERY x = y;
-PUSH;
-z : U;
-% EXPECT: entailed
-QUERY x = y;
-% EXPECT: not_entailed
-QUERY x = z;
-% EXPECT: not_entailed
-QUERY z = x;
-% EXPECT: not_entailed
-QUERY z /= x;
-POP;
-% EXPECT: not_entailed
-QUERY z /= x;
diff --git a/test/regress/regress0/push-pop/incremental-subst-bug.cvc.smt2 b/test/regress/regress0/push-pop/incremental-subst-bug.cvc.smt2
new file mode 100644
index 000000000..dc94e8f94
--- /dev/null
+++ b/test/regress/regress0/push-pop/incremental-subst-bug.cvc.smt2
@@ -0,0 +1,23 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: sat
+; EXPECT: sat
+; EXPECT: sat
+; EXPECT: sat
+(set-logic ALL)
+(declare-sort U 0)
+(declare-fun x () U)
+(declare-fun y () U)
+(check-sat-assuming ( (not (= x y)) ))
+(assert (= x y))
+(check-sat-assuming ( (not (= x y)) ))
+(declare-fun z () U)
+(push 1)
+(check-sat-assuming ( (not (= x y)) ))
+(check-sat-assuming ( (not (= x z)) ))
+(check-sat-assuming ( (not (= z x)) ))
+(check-sat-assuming ( (= z x) ))
+(pop 1)
+(check-sat-assuming ( (= z x) ))
diff --git a/test/regress/regress0/push-pop/test.00.cvc b/test/regress/regress0/push-pop/test.00.cvc
deleted file mode 100644
index 78d7b9f2c..000000000
--- a/test/regress/regress0/push-pop/test.00.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% COMMAND-LINE: --incremental
-x: BOOLEAN;
-
-PUSH;
-ASSERT x;
-% EXPECT: sat
-CHECKSAT;
-POP;
-ASSERT (NOT x);
-% EXPECT: sat
-CHECKSAT;
diff --git a/test/regress/regress0/push-pop/test.00.cvc.smt2 b/test/regress/regress0/push-pop/test.00.cvc.smt2
new file mode 100644
index 000000000..2a1de615e
--- /dev/null
+++ b/test/regress/regress0/push-pop/test.00.cvc.smt2
@@ -0,0 +1,11 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: sat
+(set-logic ALL)
+(declare-fun x () Bool)
+(push 1)
+(assert x)
+(check-sat)
+(pop 1)
+(assert (not x))
+(check-sat)
diff --git a/test/regress/regress0/push-pop/test.01.cvc b/test/regress/regress0/push-pop/test.01.cvc
deleted file mode 100644
index 2bb5877f5..000000000
--- a/test/regress/regress0/push-pop/test.01.cvc
+++ /dev/null
@@ -1,19 +0,0 @@
-% COMMAND-LINE: --incremental
-
-x, y: BOOLEAN;
-
-ASSERT (x OR y);
-% EXPECT: sat
-CHECKSAT;
-PUSH;
-ASSERT (NOT x);
-% EXPECT: sat
-CHECKSAT;
-POP;
-PUSH;
-ASSERT (NOT y);
-% EXPECT: sat
-CHECKSAT;
-POP;
-% EXPECT: sat
-CHECKSAT;
diff --git a/test/regress/regress0/push-pop/test.01.cvc.smt2 b/test/regress/regress0/push-pop/test.01.cvc.smt2
new file mode 100644
index 000000000..23342e334
--- /dev/null
+++ b/test/regress/regress0/push-pop/test.01.cvc.smt2
@@ -0,0 +1,19 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: sat
+; EXPECT: sat
+; EXPECT: sat
+(set-logic ALL)
+(declare-fun x () Bool)
+(declare-fun y () Bool)
+(assert (or x y))
+(check-sat)
+(push 1)
+(assert (not x))
+(check-sat)
+(pop 1)
+(push 1)
+(assert (not y))
+(check-sat)
+(pop 1)
+(check-sat)
diff --git a/test/regress/regress0/push-pop/units.cvc b/test/regress/regress0/push-pop/units.cvc
deleted file mode 100644
index 3550174d8..000000000
--- a/test/regress/regress0/push-pop/units.cvc
+++ /dev/null
@@ -1,29 +0,0 @@
-% COMMAND-LINE: --incremental
-x, y: BOOLEAN;
-ASSERT x OR y;
-% EXPECT: sat
-CHECKSAT;
-PUSH;
- ASSERT NOT x;
-% EXPECT: sat
- CHECKSAT;
- PUSH;
- ASSERT NOT y;
-% EXPECT: unsat
- CHECKSAT;
- POP;
-% EXPECT: sat
- CHECKSAT;
-POP;
-% EXPECT: sat
-CHECKSAT;
-PUSH 2;
-ASSERT x;
-ASSERT NOT x;
-% EXPECT: unsat
-CHECKSAT;
-POP 2;
-% EXPECT: sat
-CHECKSAT;
-
-
diff --git a/test/regress/regress0/push-pop/units.cvc.smt2 b/test/regress/regress0/push-pop/units.cvc.smt2
new file mode 100644
index 000000000..7d1feadf4
--- /dev/null
+++ b/test/regress/regress0/push-pop/units.cvc.smt2
@@ -0,0 +1,31 @@
+; COMMAND-LINE: --incremental
+; EXPECT: sat
+; EXPECT: sat
+; EXPECT: unsat
+; EXPECT: sat
+; EXPECT: sat
+; EXPECT: unsat
+; EXPECT: sat
+(set-logic ALL)
+(declare-fun x () Bool)
+(declare-fun y () Bool)
+(assert (or x y))
+(check-sat)
+(push 1)
+(assert (not x))
+(check-sat)
+(push 1)
+(assert (not y))
+(check-sat)
+(pop 1)
+(check-sat)
+(pop 1)
+(check-sat)
+(push 1)
+(push 1)
+(assert x)
+(assert (not x))
+(check-sat)
+(pop 1)
+(pop 1)
+(check-sat)
diff --git a/test/regress/regress0/quantifiers/cegqi-nl-simp.cvc b/test/regress/regress0/quantifiers/cegqi-nl-simp.cvc
deleted file mode 100644
index eaefbe651..000000000
--- a/test/regress/regress0/quantifiers/cegqi-nl-simp.cvc
+++ /dev/null
@@ -1,3 +0,0 @@
-% COMMAND-LINE: --nl-rlv=none
-% EXPECT: entailed
-QUERY FORALL (x:INT) : EXISTS (y:INT) : (x*y=x) ;
diff --git a/test/regress/regress0/quantifiers/cegqi-nl-simp.cvc.smt2 b/test/regress/regress0/quantifiers/cegqi-nl-simp.cvc.smt2
new file mode 100644
index 000000000..e91d9233f
--- /dev/null
+++ b/test/regress/regress0/quantifiers/cegqi-nl-simp.cvc.smt2
@@ -0,0 +1,5 @@
+; COMMAND-LINE: --nl-rlv=none
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(check-sat-assuming ( (not (forall ((x Int)) (exists ((y Int)) (= (* x y) x)))) ))
diff --git a/test/regress/regress0/rels/addr_book_0.cvc b/test/regress/regress0/rels/addr_book_0.cvc
deleted file mode 100644
index bae21f178..000000000
--- a/test/regress/regress0/rels/addr_book_0.cvc
+++ /dev/null
@@ -1,49 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-Atom : TYPE;
-AtomTup : TYPE = [Atom];
-AtomBinTup : TYPE = [Atom, Atom];
-AtomTerTup : TYPE = [Atom, Atom, Atom];
-Target: SET OF AtomTup;
-
-Name: SET OF AtomTup;
-Addr: SET OF AtomTup;
-Book: SET OF AtomTup;
-names: SET OF AtomBinTup;
-addr: SET OF AtomTerTup;
-
-b1: Atom;
-b1_tup : AtomTup;
-ASSERT b1_tup = TUPLE(b1);
-ASSERT b1_tup IS_IN Book;
-
-b2: Atom;
-b2_tup : AtomTup;
-ASSERT b2_tup = TUPLE(b2);
-ASSERT b2_tup IS_IN Book;
-
-b3: Atom;
-b3_tup : AtomTup;
-ASSERT b3_tup = TUPLE(b3);
-ASSERT b3_tup IS_IN Book;
-
-n: Atom;
-n_tup : AtomTup;
-ASSERT n_tup = TUPLE(n);
-ASSERT n_tup IS_IN Name;
-
-t: Atom;
-t_tup : AtomTup;
-ASSERT t_tup = TUPLE(t);
-ASSERT t_tup IS_IN Target;
-
-ASSERT ((Book JOIN addr) JOIN Target) <= Name;
-ASSERT (Book JOIN names) <= Name;
-ASSERT (Name & Addr) = {}::SET OF AtomTup;
-
-ASSERT ({n_tup} JOIN ({b1_tup} JOIN addr)) = {}::SET OF AtomTup;
-ASSERT ({n_tup} JOIN ({b2_tup} JOIN addr)) = ({n_tup} JOIN ({b1_tup} JOIN addr)) | {t_tup};
-ASSERT ({n_tup} JOIN ({b3_tup} JOIN addr)) = ({n_tup} JOIN ({b2_tup} JOIN addr)) - {t_tup};
-ASSERT NOT (({n_tup} JOIN ({b1_tup} JOIN addr)) = ({n_tup} JOIN ({b3_tup} JOIN addr)));
-
-CHECKSAT; \ No newline at end of file
diff --git a/test/regress/regress0/rels/addr_book_0.cvc.smt2 b/test/regress/regress0/rels/addr_book_0.cvc.smt2
new file mode 100644
index 000000000..a27be5b4b
--- /dev/null
+++ b/test/regress/regress0/rels/addr_book_0.cvc.smt2
@@ -0,0 +1,41 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+(declare-sort Atom 0)
+
+
+
+(declare-fun Target () (Set (Tuple Atom)))
+(declare-fun Name () (Set (Tuple Atom)))
+(declare-fun Addr () (Set (Tuple Atom)))
+(declare-fun Book () (Set (Tuple Atom)))
+(declare-fun names () (Set (Tuple Atom Atom)))
+(declare-fun addr () (Set (Tuple Atom Atom Atom)))
+(declare-fun b1 () Atom)
+(declare-fun b1_tup () (Tuple Atom))
+(assert (= b1_tup (mkTuple b1)))
+(assert (member b1_tup Book))
+(declare-fun b2 () Atom)
+(declare-fun b2_tup () (Tuple Atom))
+(assert (= b2_tup (mkTuple b2)))
+(assert (member b2_tup Book))
+(declare-fun b3 () Atom)
+(declare-fun b3_tup () (Tuple Atom))
+(assert (= b3_tup (mkTuple b3)))
+(assert (member b3_tup Book))
+(declare-fun n () Atom)
+(declare-fun n_tup () (Tuple Atom))
+(assert (= n_tup (mkTuple n)))
+(assert (member n_tup Name))
+(declare-fun t () Atom)
+(declare-fun t_tup () (Tuple Atom))
+(assert (= t_tup (mkTuple t)))
+(assert (member t_tup Target))
+(assert (subset (join (join Book addr) Target) Name))
+(assert (subset (join Book names) Name))
+(assert (= (intersection Name Addr) (as emptyset (Set (Tuple Atom)))))
+(assert (= (join (singleton n_tup) (join (singleton b1_tup) addr)) (as emptyset (Set (Tuple Atom)))))
+(assert (let ((_let_1 (singleton n_tup))) (= (join _let_1 (join (singleton b2_tup) addr)) (union (join _let_1 (join (singleton b1_tup) addr)) (singleton t_tup)))))
+(assert (let ((_let_1 (singleton n_tup))) (= (join _let_1 (join (singleton b3_tup) addr)) (setminus (join _let_1 (join (singleton b2_tup) addr)) (singleton t_tup)))))
+(assert (let ((_let_1 (singleton n_tup))) (not (= (join _let_1 (join (singleton b1_tup) addr)) (join _let_1 (join (singleton b3_tup) addr))))))
+(check-sat)
diff --git a/test/regress/regress0/rels/atom_univ2.cvc b/test/regress/regress0/rels/atom_univ2.cvc
deleted file mode 100644
index b290a2bb0..000000000
--- a/test/regress/regress0/rels/atom_univ2.cvc
+++ /dev/null
@@ -1,24 +0,0 @@
-% EXPECT: unsat
-OPTION "sets-ext";
-OPTION "logic" "ALL";
-Atom: TYPE;
-
-a : SET OF [Atom];
-b : SET OF [Atom, Atom];
-
-x : Atom;
-y : Atom;
-
-ASSERT NOT(x = y);
-
-ASSERT TUPLE(y) IS_IN a;
-ASSERT (x, y) IS_IN b;
-
-ASSERT UNIVERSE::SET OF [Atom, Atom] = (UNIVERSE::SET OF [Atom] PRODUCT UNIVERSE::SET OF [Atom]);
-
-u : SET OF [Atom, Atom];
-ASSERT u = UNIVERSE::SET OF [Atom, Atom];
-
-ASSERT NOT (x, y) IS_IN u;
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/atom_univ2.cvc.smt2 b/test/regress/regress0/rels/atom_univ2.cvc.smt2
new file mode 100644
index 000000000..0fba2f00c
--- /dev/null
+++ b/test/regress/regress0/rels/atom_univ2.cvc.smt2
@@ -0,0 +1,17 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-option :sets-ext true)
+(set-logic ALL)
+(declare-sort Atom 0)
+(declare-fun a () (Set (Tuple Atom)))
+(declare-fun b () (Set (Tuple Atom Atom)))
+(declare-fun x () Atom)
+(declare-fun y () Atom)
+(assert (not (= x y)))
+(assert (member (mkTuple y) a))
+(assert (member (mkTuple x y) b))
+(assert (= (as univset (Set (Tuple Atom Atom))) (product (as univset (Set (Tuple Atom))) (as univset (Set (Tuple Atom))))))
+(declare-fun u () (Set (Tuple Atom Atom)))
+(assert (= u (as univset (Set (Tuple Atom Atom)))))
+(assert (not (member (mkTuple x y) u)))
+(check-sat)
diff --git a/test/regress/regress0/rels/card_transpose.cvc b/test/regress/regress0/rels/card_transpose.cvc
deleted file mode 100644
index 383b0bc21..000000000
--- a/test/regress/regress0/rels/card_transpose.cvc
+++ /dev/null
@@ -1,6 +0,0 @@
-% EXPECT: unknown (INCOMPLETE)
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-ASSERT (CARD(TRANSPOSE(x)) > 0);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/card_transpose.cvc.smt2 b/test/regress/regress0/rels/card_transpose.cvc.smt2
new file mode 100644
index 000000000..8356eca41
--- /dev/null
+++ b/test/regress/regress0/rels/card_transpose.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unknown
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(assert (> (card (transpose x)) 0))
+(check-sat)
diff --git a/test/regress/regress0/rels/iden_0.cvc b/test/regress/regress0/rels/iden_0.cvc
deleted file mode 100644
index 70e365b8f..000000000
--- a/test/regress/regress0/rels/iden_0.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-Atom: TYPE;
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-id : SET OF IntPair;
-
-t : SET OF [INT];
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT TUPLE(1) IS_IN t;
-ASSERT TUPLE(2) IS_IN t;
-ASSERT z IS_IN x;
-ASSERT zt IS_IN x;
-ASSERT v IS_IN x;
-ASSERT a IS_IN x;
-ASSERT id = IDEN(t);
-ASSERT NOT ((1, 1) IS_IN (id & x));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/iden_0.cvc.smt2 b/test/regress/regress0/rels/iden_0.cvc.smt2
new file mode 100644
index 000000000..fca943912
--- /dev/null
+++ b/test/regress/regress0/rels/iden_0.cvc.smt2
@@ -0,0 +1,25 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+(declare-sort Atom 0)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun id () (Set (Tuple Int Int)))
+(declare-fun t () (Set (Tuple Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1) t))
+(assert (member (mkTuple 2) t))
+(assert (member z x))
+(assert (member zt x))
+(assert (member v x))
+(assert (member a x))
+(assert (= id (iden t)))
+(assert (not (member (mkTuple 1 1) (intersection id x))))
+(check-sat)
diff --git a/test/regress/regress0/rels/iden_1.cvc b/test/regress/regress0/rels/iden_1.cvc
deleted file mode 100644
index d874c9381..000000000
--- a/test/regress/regress0/rels/iden_1.cvc
+++ /dev/null
@@ -1,19 +0,0 @@
-% EXPECT: unsat
-OPTION "sets-ext";
-OPTION "logic" "ALL";
-Atom:TYPE;
-AtomPair: TYPE = [Atom, Atom];
-x : SET OF AtomPair;
-t : SET OF [Atom];
-univ : SET OF [Atom];
-
-a : Atom;
-b : Atom;
-c : Atom;
-d : Atom;
-ASSERT univ = UNIVERSE::SET OF [Atom];
-ASSERT (a, b) IS_IN x;
-ASSERT (c, d) IS_IN x;
-ASSERT NOT(a = b);
-ASSERT IDEN(x JOIN univ) = x;
-CHECKSAT;
diff --git a/test/regress/regress0/rels/iden_1.cvc.smt2 b/test/regress/regress0/rels/iden_1.cvc.smt2
new file mode 100644
index 000000000..5a59eda53
--- /dev/null
+++ b/test/regress/regress0/rels/iden_1.cvc.smt2
@@ -0,0 +1,19 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-option :sets-ext true)
+(set-logic ALL)
+(declare-sort Atom 0)
+
+(declare-fun x () (Set (Tuple Atom Atom)))
+(declare-fun t () (Set (Tuple Atom)))
+(declare-fun univ () (Set (Tuple Atom)))
+(declare-fun a () Atom)
+(declare-fun b () Atom)
+(declare-fun c () Atom)
+(declare-fun d () Atom)
+(assert (= univ (as univset (Set (Tuple Atom)))))
+(assert (member (mkTuple a b) x))
+(assert (member (mkTuple c d) x))
+(assert (not (= a b)))
+(assert (= (iden (join x univ)) x))
+(check-sat)
diff --git a/test/regress/regress0/rels/join-eq-u-sat.cvc b/test/regress/regress0/rels/join-eq-u-sat.cvc
deleted file mode 100644
index 1c45aa46b..000000000
--- a/test/regress/regress0/rels/join-eq-u-sat.cvc
+++ /dev/null
@@ -1,22 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-DATATYPE unit = u END;
-IntUPair: TYPE = [INT, unit];
-UIntPair: TYPE = [unit, INT];
-w : SET OF IntUPair;
-z : SET OF UIntPair;
-
-ASSERT (x JOIN y) = (w JOIN z);
-
-ASSERT (0,1) IS_IN (x JOIN y);
-ASSERT (0,u) IS_IN w;
-
-t : INT;
-ASSERT t > 0 AND t < 3;
-
-ASSERT NOT (u, t ) IS_IN z;
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/join-eq-u-sat.cvc.smt2 b/test/regress/regress0/rels/join-eq-u-sat.cvc.smt2
new file mode 100644
index 000000000..3801be252
--- /dev/null
+++ b/test/regress/regress0/rels/join-eq-u-sat.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-datatypes ((unit 0)) (((u))))
+
+
+(declare-fun w () (Set (Tuple Int unit)))
+(declare-fun z () (Set (Tuple unit Int)))
+(assert (= (join x y) (join w z)))
+(assert (member (mkTuple 0 1) (join x y)))
+(assert (member (mkTuple 0 u) w))
+(declare-fun t () Int)
+(assert (and (> t 0) (< t 3)))
+(assert (not (member (mkTuple u t) z)))
+(check-sat)
diff --git a/test/regress/regress0/rels/join-eq-u.cvc b/test/regress/regress0/rels/join-eq-u.cvc
deleted file mode 100644
index 174e5dc16..000000000
--- a/test/regress/regress0/rels/join-eq-u.cvc
+++ /dev/null
@@ -1,22 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-DATATYPE unit = u END;
-IntUPair: TYPE = [INT, unit];
-UIntPair: TYPE = [unit, INT];
-w : SET OF IntUPair;
-z : SET OF UIntPair;
-
-ASSERT (x JOIN y) = (w JOIN z);
-
-ASSERT (0,1) IS_IN (x JOIN y);
-ASSERT (0,u) IS_IN w;
-
-t : INT;
-ASSERT t > 0 AND t < 2;
-
-ASSERT NOT (u, t ) IS_IN z;
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/join-eq-u.cvc.smt2 b/test/regress/regress0/rels/join-eq-u.cvc.smt2
new file mode 100644
index 000000000..a455e1d36
--- /dev/null
+++ b/test/regress/regress0/rels/join-eq-u.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-datatypes ((unit 0)) (((u))))
+
+
+(declare-fun w () (Set (Tuple Int unit)))
+(declare-fun z () (Set (Tuple unit Int)))
+(assert (= (join x y) (join w z)))
+(assert (member (mkTuple 0 1) (join x y)))
+(assert (member (mkTuple 0 u) w))
+(declare-fun t () Int)
+(assert (and (> t 0) (< t 2)))
+(assert (not (member (mkTuple u t) z)))
+(check-sat)
diff --git a/test/regress/regress0/rels/joinImg_0.cvc b/test/regress/regress0/rels/joinImg_0.cvc
deleted file mode 100644
index b3dc944fd..000000000
--- a/test/regress/regress0/rels/joinImg_0.cvc
+++ /dev/null
@@ -1,34 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-OPTION "sets-ext";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-t : SET OF [INT];
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT z IS_IN x;
-
-ASSERT (7, 5) IS_IN y;
-
-ASSERT t = (x JOIN_IMAGE 2);
-
-ASSERT TUPLE(3) IS_IN (x JOIN_IMAGE 2);
-
-ASSERT NOT(TUPLE(1) IS_IN (x JOIN_IMAGE 2));
-
-ASSERT TUPLE(4) IS_IN (x JOIN_IMAGE 2);
-
-ASSERT TUPLE(1) IS_IN (x JOIN_IMAGE 1);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/joinImg_0.cvc.smt2 b/test/regress/regress0/rels/joinImg_0.cvc.smt2
new file mode 100644
index 000000000..a2ae87de9
--- /dev/null
+++ b/test/regress/regress0/rels/joinImg_0.cvc.smt2
@@ -0,0 +1,26 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+(set-option :sets-ext true)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun t () (Set (Tuple Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member z x))
+(assert (member (mkTuple 7 5) y))
+(assert (= t (join_image x 2)))
+(assert (member (mkTuple 3) (join_image x 2)))
+(assert (not (member (mkTuple 1) (join_image x 2))))
+(assert (member (mkTuple 4) (join_image x 2)))
+(assert (member (mkTuple 1) (join_image x 1)))
+(check-sat)
diff --git a/test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc b/test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc
deleted file mode 100644
index f39c23438..000000000
--- a/test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc
+++ /dev/null
@@ -1,19 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "QF_UFDTFS";
-DATATYPE Atom = atom END;
-
-
-t : SET OF [Atom, Atom];
-b : Atom;
-a : Atom;
-c : Atom;
-J : ( SET OF [Atom], SET OF [Atom, Atom] ) -> SET OF [Atom];
-T : SET OF [Atom, Atom] -> SET OF [Atom, Atom];
-
-%ASSERT t = {} :: SET OF [Atom, Atom];
-
-
-ASSERT ({TUPLE(a)} JOIN t) = J({TUPLE(a)}, t);
-ASSERT NOT( ({TUPLE(c)} JOIN TCLOSURE(t)) = {TUPLE(c)} );
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc.smt2 b/test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc.smt2
new file mode 100644
index 000000000..4beb03a76
--- /dev/null
+++ b/test/regress/regress0/rels/oneLoc_no_quant-int_0_1.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic QF_UFDTFS)
+(declare-datatypes ((Atom 0)) (((atom))))
+(declare-fun t () (Set (Tuple Atom Atom)))
+(declare-fun b () Atom)
+(declare-fun a () Atom)
+(declare-fun c () Atom)
+(declare-fun J ((Set (Tuple Atom)) (Set (Tuple Atom Atom))) (Set (Tuple Atom)))
+(declare-fun T ((Set (Tuple Atom Atom))) (Set (Tuple Atom Atom)))
+(assert (let ((_let_1 (singleton (mkTuple a)))) (= (join _let_1 t) (J _let_1 t))))
+(assert (let ((_let_1 (singleton (mkTuple c)))) (not (= (join _let_1 (tclosure t)) _let_1))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_1tup_0.cvc b/test/regress/regress0/rels/rel_1tup_0.cvc
deleted file mode 100644
index 90a22856e..000000000
--- a/test/regress/regress0/rels/rel_1tup_0.cvc
+++ /dev/null
@@ -1,24 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntTup: TYPE = [INT];
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntTup;
-z: SET OF IntTup;
-
-b : IntPair;
-ASSERT b = (2, 1);
-ASSERT b IS_IN x;
-
-a : IntTup;
-ASSERT a = TUPLE(1);
-ASSERT a IS_IN y;
-
-c : IntTup;
-ASSERT c = TUPLE(2);
-
-ASSERT z = (x JOIN y);
-
-ASSERT NOT (c IS_IN z);
-
-CHECKSAT; \ No newline at end of file
diff --git a/test/regress/regress0/rels/rel_1tup_0.cvc.smt2 b/test/regress/regress0/rels/rel_1tup_0.cvc.smt2
new file mode 100644
index 000000000..0d0ccbfdc
--- /dev/null
+++ b/test/regress/regress0/rels/rel_1tup_0.cvc.smt2
@@ -0,0 +1,19 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int)))
+(declare-fun z () (Set (Tuple Int)))
+(declare-fun b () (Tuple Int Int))
+(assert (= b (mkTuple 2 1)))
+(assert (member b x))
+(declare-fun a () (Tuple Int))
+(assert (= a (mkTuple 1)))
+(assert (member a y))
+(declare-fun c () (Tuple Int))
+(assert (= c (mkTuple 2)))
+(assert (= z (join x y)))
+(assert (not (member c z)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_complex_0.cvc b/test/regress/regress0/rels/rel_complex_0.cvc
deleted file mode 100644
index c4cf0a01f..000000000
--- a/test/regress/regress0/rels/rel_complex_0.cvc
+++ /dev/null
@@ -1,31 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-z : SET OF INT;
-f : INT;
-g : INT;
-
-e : IntPair;
-ASSERT e = (4, f);
-ASSERT e IS_IN x;
-
-d : IntPair;
-ASSERT d = (g,3);
-ASSERT d IS_IN y;
-
-
-ASSERT z = {f, g};
-ASSERT 0 = f - g;
-
-
-
-a : IntPair;
-ASSERT a = (4,3);
-
-ASSERT r = (x JOIN y);
-
-ASSERT NOT (a IS_IN r);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_complex_0.cvc.smt2 b/test/regress/regress0/rels/rel_complex_0.cvc.smt2
new file mode 100644
index 000000000..f7705987d
--- /dev/null
+++ b/test/regress/regress0/rels/rel_complex_0.cvc.smt2
@@ -0,0 +1,23 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Set Int))
+(declare-fun f () Int)
+(declare-fun g () Int)
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 f)))
+(assert (member e x))
+(declare-fun d () (Tuple Int Int))
+(assert (= d (mkTuple g 3)))
+(assert (member d y))
+(assert (= z (union (singleton f) (singleton g))))
+(assert (= 0 (- f g)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 4 3)))
+(assert (= r (join x y)))
+(assert (not (member a r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_complex_1.cvc b/test/regress/regress0/rels/rel_complex_1.cvc
deleted file mode 100644
index 4b23cdd2b..000000000
--- a/test/regress/regress0/rels/rel_complex_1.cvc
+++ /dev/null
@@ -1,34 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-IntTup: TYPE = [INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-w : SET OF IntTup;
-z : SET OF IntTup;
-r2 : SET OF IntPair;
-
-a : IntPair;
-ASSERT a = (3,1);
-ASSERT a IS_IN x;
-
-d : IntPair;
-ASSERT d = (1,3);
-ASSERT d IS_IN y;
-
-e : IntPair;
-ASSERT e = (4,3);
-ASSERT r = (x JOIN y);
-
-ASSERT TUPLE(1) IS_IN w;
-ASSERT TUPLE(2) IS_IN z;
-ASSERT r2 = (w PRODUCT z);
-
-ASSERT NOT (e IS_IN r);
-%ASSERT e IS_IN r2;
-ASSERT (r <= r2);
-ASSERT NOT ((3,3) IS_IN r2);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_complex_1.cvc.smt2 b/test/regress/regress0/rels/rel_complex_1.cvc.smt2
new file mode 100644
index 000000000..823fb7ed1
--- /dev/null
+++ b/test/regress/regress0/rels/rel_complex_1.cvc.smt2
@@ -0,0 +1,27 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun w () (Set (Tuple Int)))
+(declare-fun z () (Set (Tuple Int)))
+(declare-fun r2 () (Set (Tuple Int Int)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 3 1)))
+(assert (member a x))
+(declare-fun d () (Tuple Int Int))
+(assert (= d (mkTuple 1 3)))
+(assert (member d y))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 3)))
+(assert (= r (join x y)))
+(assert (member (mkTuple 1) w))
+(assert (member (mkTuple 2) z))
+(assert (= r2 (product w z)))
+(assert (not (member e r)))
+(assert (subset r r2))
+(assert (not (member (mkTuple 3 3) r2)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_conflict_0.cvc b/test/regress/regress0/rels/rel_conflict_0.cvc
deleted file mode 100644
index bc6750035..000000000
--- a/test/regress/regress0/rels/rel_conflict_0.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-e : IntPair;
-ASSERT e = (4, 4);
-ASSERT e IS_IN x;
-
-ASSERT NOT ((4, 4) IS_IN x);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_conflict_0.cvc.smt2 b/test/regress/regress0/rels/rel_conflict_0.cvc.smt2
new file mode 100644
index 000000000..4af1f8530
--- /dev/null
+++ b/test/regress/regress0/rels/rel_conflict_0.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 4)))
+(assert (member e x))
+(assert (not (member (mkTuple 4 4) x)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_0.cvc b/test/regress/regress0/rels/rel_join_0.cvc
deleted file mode 100644
index e0b76f2c9..000000000
--- a/test/regress/regress0/rels/rel_join_0.cvc
+++ /dev/null
@@ -1,24 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (7, 5) IS_IN y;
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT NOT (a IS_IN (x JOIN y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_0.cvc.smt2 b/test/regress/regress0/rels/rel_join_0.cvc.smt2
new file mode 100644
index 000000000..3e4a68377
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_0.cvc.smt2
@@ -0,0 +1,21 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 7 5) y))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member a (join x y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_0_1.cvc b/test/regress/regress0/rels/rel_join_0_1.cvc
deleted file mode 100644
index 5fa5f14ef..000000000
--- a/test/regress/regress0/rels/rel_join_0_1.cvc
+++ /dev/null
@@ -1,27 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (4, 3) IS_IN x;
-ASSERT (7, 5) IS_IN y;
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-%ASSERT a IS_IN (x JOIN y);
-%ASSERT NOT (v IS_IN (x JOIN y));
-ASSERT a IS_IN (x JOIN y);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_0_1.cvc.smt2 b/test/regress/regress0/rels/rel_join_0_1.cvc.smt2
new file mode 100644
index 000000000..1c8f7b472
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_0_1.cvc.smt2
@@ -0,0 +1,22 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 4 3) x))
+(assert (member (mkTuple 7 5) y))
+(assert (member z x))
+(assert (member zt y))
+(assert (member a (join x y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_1.cvc b/test/regress/regress0/rels/rel_join_1.cvc
deleted file mode 100644
index da3217642..000000000
--- a/test/regress/regress0/rels/rel_join_1.cvc
+++ /dev/null
@@ -1,31 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (3, 4) IS_IN x;
-
-ASSERT (7, 5) IS_IN y;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-
-%ASSERT (a IS_IN (r JOIN(x JOIN y)));
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT NOT (a IS_IN (x JOIN y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_1.cvc.smt2 b/test/regress/regress0/rels/rel_join_1.cvc.smt2
new file mode 100644
index 000000000..22e5e7f8f
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_1.cvc.smt2
@@ -0,0 +1,25 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 3 4) x))
+(assert (member (mkTuple 7 5) y))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member a (join x y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_1_1.cvc b/test/regress/regress0/rels/rel_join_1_1.cvc
deleted file mode 100644
index ab00ed8b3..000000000
--- a/test/regress/regress0/rels/rel_join_1_1.cvc
+++ /dev/null
@@ -1,31 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (3, 4) IS_IN x;
-
-ASSERT (7, 5) IS_IN y;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-
-%ASSERT (a IS_IN (r JOIN(x JOIN y)));
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT r = (x JOIN y);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_1_1.cvc.smt2 b/test/regress/regress0/rels/rel_join_1_1.cvc.smt2
new file mode 100644
index 000000000..54e51cfe6
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_1_1.cvc.smt2
@@ -0,0 +1,25 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 3 4) x))
+(assert (member (mkTuple 7 5) y))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (member z x))
+(assert (member zt y))
+(assert (= r (join x y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_2.cvc b/test/regress/regress0/rels/rel_join_2.cvc
deleted file mode 100644
index 0f50757fc..000000000
--- a/test/regress/regress0/rels/rel_join_2.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-IntTup: TYPE = [INT, INT, INT];
-x : SET OF IntPair;
-y : SET OF IntTup;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntTup;
-ASSERT zt = (2,1,3);
-a : IntTup;
-ASSERT a = (1,1,3);
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-
-ASSERT NOT (a IS_IN (x JOIN y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_2.cvc.smt2 b/test/regress/regress0/rels/rel_join_2.cvc.smt2
new file mode 100644
index 000000000..0ab915f7e
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_2.cvc.smt2
@@ -0,0 +1,17 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int Int))
+(assert (= zt (mkTuple 2 1 3)))
+(declare-fun a () (Tuple Int Int Int))
+(assert (= a (mkTuple 1 1 3)))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member a (join x y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_2_1.cvc b/test/regress/regress0/rels/rel_join_2_1.cvc
deleted file mode 100644
index 4d412c649..000000000
--- a/test/regress/regress0/rels/rel_join_2_1.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-IntTup: TYPE = [INT, INT, INT];
-x : SET OF IntPair;
-y : SET OF IntTup;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntTup;
-ASSERT zt = (2,1,3);
-a : IntTup;
-ASSERT a = (1,1,3);
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-
-ASSERT a IS_IN (x JOIN y);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_2_1.cvc.smt2 b/test/regress/regress0/rels/rel_join_2_1.cvc.smt2
new file mode 100644
index 000000000..47269ef64
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_2_1.cvc.smt2
@@ -0,0 +1,17 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int Int))
+(assert (= zt (mkTuple 2 1 3)))
+(declare-fun a () (Tuple Int Int Int))
+(assert (= a (mkTuple 1 1 3)))
+(assert (member z x))
+(assert (member zt y))
+(assert (member a (join x y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_3.cvc b/test/regress/regress0/rels/rel_join_3.cvc
deleted file mode 100644
index fb48aba77..000000000
--- a/test/regress/regress0/rels/rel_join_3.cvc
+++ /dev/null
@@ -1,29 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (3, 4) IS_IN x;
-
-ASSERT (7, 5) IS_IN y;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT r = (x JOIN y);
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT NOT (a IS_IN r);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_3.cvc.smt2 b/test/regress/regress0/rels/rel_join_3.cvc.smt2
new file mode 100644
index 000000000..e726271d1
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_3.cvc.smt2
@@ -0,0 +1,26 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 3 4) x))
+(assert (member (mkTuple 7 5) y))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (= r (join x y)))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member a r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_3_1.cvc b/test/regress/regress0/rels/rel_join_3_1.cvc
deleted file mode 100644
index 238028e18..000000000
--- a/test/regress/regress0/rels/rel_join_3_1.cvc
+++ /dev/null
@@ -1,29 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (3, 4) IS_IN x;
-
-ASSERT (7, 5) IS_IN y;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT r = (x JOIN y);
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT a IS_IN r;
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_3_1.cvc.smt2 b/test/regress/regress0/rels/rel_join_3_1.cvc.smt2
new file mode 100644
index 000000000..3b06bfb38
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_3_1.cvc.smt2
@@ -0,0 +1,26 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 3 4) x))
+(assert (member (mkTuple 7 5) y))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (= r (join x y)))
+(assert (member z x))
+(assert (member zt y))
+(assert (member a r))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_4.cvc b/test/regress/regress0/rels/rel_join_4.cvc
deleted file mode 100644
index c5210af1c..000000000
--- a/test/regress/regress0/rels/rel_join_4.cvc
+++ /dev/null
@@ -1,32 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-b : IntPair;
-ASSERT b = (7, 5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (3, 4) IS_IN x;
-
-ASSERT b IS_IN y;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT r = (x JOIN y);
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT NOT (a IS_IN r);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_4.cvc.smt2 b/test/regress/regress0/rels/rel_join_4.cvc.smt2
new file mode 100644
index 000000000..76ad33633
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_4.cvc.smt2
@@ -0,0 +1,28 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(declare-fun b () (Tuple Int Int))
+(assert (= b (mkTuple 7 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 3 4) x))
+(assert (member b y))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (= r (join x y)))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member a r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_5.cvc b/test/regress/regress0/rels/rel_join_5.cvc
deleted file mode 100644
index 541e7bf37..000000000
--- a/test/regress/regress0/rels/rel_join_5.cvc
+++ /dev/null
@@ -1,19 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntPair;
-
-ASSERT (7, 1) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT (3, 4) IS_IN z;
-
-a : IntPair;
-ASSERT a = (1,4);
-ASSERT r = ((TRANSPOSE(x) JOIN y) JOIN z);
-ASSERT NOT (a IS_IN r);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_5.cvc.smt2 b/test/regress/regress0/rels/rel_join_5.cvc.smt2
new file mode 100644
index 000000000..1d138befa
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_5.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(assert (member (mkTuple 7 1) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (member (mkTuple 3 4) z))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 4)))
+(assert (= r (join (join (transpose x) y) z)))
+(assert (not (member a r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_6.cvc b/test/regress/regress0/rels/rel_join_6.cvc
deleted file mode 100644
index cd76d9afe..000000000
--- a/test/regress/regress0/rels/rel_join_6.cvc
+++ /dev/null
@@ -1,13 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-ASSERT x = {(1,2), (3, 4)};
-
-ASSERT y = (x JOIN {(2,1), (4,3)});
-
-ASSERT NOT ((1,1) IS_IN y);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_6.cvc.smt2 b/test/regress/regress0/rels/rel_join_6.cvc.smt2
new file mode 100644
index 000000000..391bd0fad
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_6.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(assert (= x (union (singleton (mkTuple 1 2)) (singleton (mkTuple 3 4)))))
+(assert (= y (join x (union (singleton (mkTuple 2 1)) (singleton (mkTuple 4 3))))))
+(assert (not (member (mkTuple 1 1) y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_join_7.cvc b/test/regress/regress0/rels/rel_join_7.cvc
deleted file mode 100644
index c2f581114..000000000
--- a/test/regress/regress0/rels/rel_join_7.cvc
+++ /dev/null
@@ -1,26 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-w : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (1,5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (7, 5) IS_IN y;
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT w = (r | (x JOIN y));
-ASSERT NOT (a IS_IN w);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_join_7.cvc.smt2 b/test/regress/regress0/rels/rel_join_7.cvc.smt2
new file mode 100644
index 000000000..6488df50e
--- /dev/null
+++ b/test/regress/regress0/rels/rel_join_7.cvc.smt2
@@ -0,0 +1,23 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun w () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 7 5) y))
+(assert (member z x))
+(assert (member zt y))
+(assert (= w (union r (join x y))))
+(assert (not (member a w)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_product_0.cvc b/test/regress/regress0/rels/rel_product_0.cvc
deleted file mode 100644
index 3765fa8cb..000000000
--- a/test/regress/regress0/rels/rel_product_0.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-IntTup: TYPE = [INT, INT, INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntTup;
-ASSERT v = (1,2,2,1);
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT NOT (v IS_IN (x PRODUCT y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_product_0.cvc.smt2 b/test/regress/regress0/rels/rel_product_0.cvc.smt2
new file mode 100644
index 000000000..1b9f4e369
--- /dev/null
+++ b/test/regress/regress0/rels/rel_product_0.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int Int Int))
+(assert (= v (mkTuple 1 2 2 1)))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member v (product x y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_product_0_1.cvc b/test/regress/regress0/rels/rel_product_0_1.cvc
deleted file mode 100644
index 160543407..000000000
--- a/test/regress/regress0/rels/rel_product_0_1.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-IntTup: TYPE = [INT, INT, INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntTup;
-ASSERT v = (1,2,2,1);
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT v IS_IN (x PRODUCT y);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_product_0_1.cvc.smt2 b/test/regress/regress0/rels/rel_product_0_1.cvc.smt2
new file mode 100644
index 000000000..2929a51ee
--- /dev/null
+++ b/test/regress/regress0/rels/rel_product_0_1.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int Int Int))
+(assert (= v (mkTuple 1 2 2 1)))
+(assert (member z x))
+(assert (member zt y))
+(assert (member v (product x y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_product_1.cvc b/test/regress/regress0/rels/rel_product_1.cvc
deleted file mode 100644
index 6f64ee892..000000000
--- a/test/regress/regress0/rels/rel_product_1.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT, INT];
-IntTup: TYPE = [INT, INT, INT, INT,INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2,3);
-zt : IntPair;
-ASSERT zt = (3,2,1);
-v : IntTup;
-ASSERT v = (1,2,3,3,2,1);
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT NOT (v IS_IN (x PRODUCT y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_product_1.cvc.smt2 b/test/regress/regress0/rels/rel_product_1.cvc.smt2
new file mode 100644
index 000000000..93d2eb725
--- /dev/null
+++ b/test/regress/regress0/rels/rel_product_1.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int Int)))
+(declare-fun y () (Set (Tuple Int Int Int)))
+(declare-fun r () (Set (Tuple Int Int Int)))
+(declare-fun z () (Tuple Int Int Int))
+(assert (= z (mkTuple 1 2 3)))
+(declare-fun zt () (Tuple Int Int Int))
+(assert (= zt (mkTuple 3 2 1)))
+(declare-fun v () (Tuple Int Int Int Int Int Int))
+(assert (= v (mkTuple 1 2 3 3 2 1)))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member v (product x y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_product_1_1.cvc b/test/regress/regress0/rels/rel_product_1_1.cvc
deleted file mode 100644
index 8371632b9..000000000
--- a/test/regress/regress0/rels/rel_product_1_1.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT, INT];
-IntTup: TYPE = [INT, INT, INT, INT,INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntTup;
-
-z : IntPair;
-ASSERT z = (1,2,3);
-zt : IntPair;
-ASSERT zt = (3,2,1);
-
-
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT (1,1,1,1,1,1) IS_IN r;
-ASSERT r = (x PRODUCT y);
-
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_product_1_1.cvc.smt2 b/test/regress/regress0/rels/rel_product_1_1.cvc.smt2
new file mode 100644
index 000000000..696ae31ba
--- /dev/null
+++ b/test/regress/regress0/rels/rel_product_1_1.cvc.smt2
@@ -0,0 +1,17 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int Int)))
+(declare-fun y () (Set (Tuple Int Int Int)))
+(declare-fun r () (Set (Tuple Int Int Int Int Int Int)))
+(declare-fun z () (Tuple Int Int Int))
+(assert (= z (mkTuple 1 2 3)))
+(declare-fun zt () (Tuple Int Int Int))
+(assert (= zt (mkTuple 3 2 1)))
+(assert (member z x))
+(assert (member zt y))
+(assert (member (mkTuple 1 1 1 1 1 1) r))
+(assert (= r (product x y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_symbolic_1.cvc b/test/regress/regress0/rels/rel_symbolic_1.cvc
deleted file mode 100644
index 91df3e6de..000000000
--- a/test/regress/regress0/rels/rel_symbolic_1.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-f : INT;
-d : IntPair;
-ASSERT d = (f,3);
-ASSERT d IS_IN y;
-e : IntPair;
-ASSERT e = (4, f);
-ASSERT e IS_IN x;
-
-a : IntPair;
-ASSERT a = (4,3);
-
-ASSERT r = (x JOIN y);
-
-ASSERT NOT (a IS_IN r);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_symbolic_1.cvc.smt2 b/test/regress/regress0/rels/rel_symbolic_1.cvc.smt2
new file mode 100644
index 000000000..9952b64ec
--- /dev/null
+++ b/test/regress/regress0/rels/rel_symbolic_1.cvc.smt2
@@ -0,0 +1,19 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun f () Int)
+(declare-fun d () (Tuple Int Int))
+(assert (= d (mkTuple f 3)))
+(assert (member d y))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 f)))
+(assert (member e x))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 4 3)))
+(assert (= r (join x y)))
+(assert (not (member a r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_symbolic_1_1.cvc b/test/regress/regress0/rels/rel_symbolic_1_1.cvc
deleted file mode 100644
index 7890ca2e2..000000000
--- a/test/regress/regress0/rels/rel_symbolic_1_1.cvc
+++ /dev/null
@@ -1,20 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-d : IntPair;
-ASSERT d IS_IN y;
-
-a : IntPair;
-ASSERT a IS_IN x;
-
-e : IntPair;
-ASSERT e = (4,3);
-
-ASSERT r = (x JOIN y);
-
-ASSERT NOT (e IS_IN r);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_symbolic_1_1.cvc.smt2 b/test/regress/regress0/rels/rel_symbolic_1_1.cvc.smt2
new file mode 100644
index 000000000..b677ddb0e
--- /dev/null
+++ b/test/regress/regress0/rels/rel_symbolic_1_1.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun d () (Tuple Int Int))
+(assert (member d y))
+(declare-fun a () (Tuple Int Int))
+(assert (member a x))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 3)))
+(assert (= r (join x y)))
+(assert (not (member e r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_symbolic_2_1.cvc b/test/regress/regress0/rels/rel_symbolic_2_1.cvc
deleted file mode 100644
index ae0eeffae..000000000
--- a/test/regress/regress0/rels/rel_symbolic_2_1.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-d : IntPair;
-ASSERT d = (1,3);
-ASSERT (1,3) IS_IN y;
-
-a : IntPair;
-ASSERT a IS_IN x;
-
-e : IntPair;
-ASSERT e = (4,3);
-
-ASSERT r = (x JOIN y);
-
-ASSERT NOT (e IS_IN r);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_symbolic_2_1.cvc.smt2 b/test/regress/regress0/rels/rel_symbolic_2_1.cvc.smt2
new file mode 100644
index 000000000..21f7c6d89
--- /dev/null
+++ b/test/regress/regress0/rels/rel_symbolic_2_1.cvc.smt2
@@ -0,0 +1,17 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun d () (Tuple Int Int))
+(assert (= d (mkTuple 1 3)))
+(assert (member (mkTuple 1 3) y))
+(declare-fun a () (Tuple Int Int))
+(assert (member a x))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 3)))
+(assert (= r (join x y)))
+(assert (not (member e r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_symbolic_3_1.cvc b/test/regress/regress0/rels/rel_symbolic_3_1.cvc
deleted file mode 100644
index bdfcaf5a8..000000000
--- a/test/regress/regress0/rels/rel_symbolic_3_1.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-f : INT;
-d : IntPair;
-ASSERT d IS_IN y;
-
-e : IntPair;
-ASSERT e = (4, f);
-ASSERT e IS_IN x;
-
-a : IntPair;
-ASSERT a = (4,3);
-
-ASSERT r = (x JOIN y);
-
-ASSERT NOT (a IS_IN r);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_symbolic_3_1.cvc.smt2 b/test/regress/regress0/rels/rel_symbolic_3_1.cvc.smt2
new file mode 100644
index 000000000..7302a53b1
--- /dev/null
+++ b/test/regress/regress0/rels/rel_symbolic_3_1.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun f () Int)
+(declare-fun d () (Tuple Int Int))
+(assert (member d y))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 f)))
+(assert (member e x))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 4 3)))
+(assert (= r (join x y)))
+(assert (not (member a r)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tc_11.cvc b/test/regress/regress0/rels/rel_tc_11.cvc
deleted file mode 100644
index c3447622d..000000000
--- a/test/regress/regress0/rels/rel_tc_11.cvc
+++ /dev/null
@@ -1,18 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-IntTup: TYPE = [INT, INT, INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntTup;
-ASSERT (2, 3) IS_IN x;
-ASSERT (5, 3) IS_IN x;
-ASSERT (3, 9) IS_IN x;
-ASSERT z = (x PRODUCT y);
-ASSERT (1, 2, 3, 4) IS_IN z;
-ASSERT NOT ((5, 9) IS_IN x);
-ASSERT (3, 8) IS_IN y;
-ASSERT y = TCLOSURE(x);
-ASSERT NOT ((1, 2) IS_IN y);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tc_11.cvc.smt2 b/test/regress/regress0/rels/rel_tc_11.cvc.smt2
new file mode 100644
index 000000000..0b0cd0d07
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tc_11.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int Int Int)))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 5 3) x))
+(assert (member (mkTuple 3 9) x))
+(assert (= z (product x y)))
+(assert (member (mkTuple 1 2 3 4) z))
+(assert (not (member (mkTuple 5 9) x)))
+(assert (member (mkTuple 3 8) y))
+(assert (= y (tclosure x)))
+(assert (not (member (mkTuple 1 2) y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tc_2_1.cvc b/test/regress/regress0/rels/rel_tc_2_1.cvc
deleted file mode 100644
index e396b886d..000000000
--- a/test/regress/regress0/rels/rel_tc_2_1.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
- e: INT;
-
-a : IntPair;
-ASSERT a = (1, e);
-
-d : IntPair;
-ASSERT d = (e,5);
-
-ASSERT a IS_IN x;
-ASSERT d IS_IN x;
-ASSERT NOT ((1,1) IS_IN x);
-ASSERT NOT ((1,2) IS_IN x);
-ASSERT NOT ((1,3) IS_IN x);
-ASSERT NOT ((1,4) IS_IN x);
-ASSERT NOT ((1,5) IS_IN x);
-ASSERT NOT ((1,6) IS_IN x);
-ASSERT NOT ((1,7) IS_IN x);
-
-ASSERT y = TCLOSURE(x);
-
-ASSERT (1, 5) IS_IN y;
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tc_2_1.cvc.smt2 b/test/regress/regress0/rels/rel_tc_2_1.cvc.smt2
new file mode 100644
index 000000000..689390402
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tc_2_1.cvc.smt2
@@ -0,0 +1,23 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun e () Int)
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 e)))
+(declare-fun d () (Tuple Int Int))
+(assert (= d (mkTuple e 5)))
+(assert (member a x))
+(assert (member d x))
+(assert (not (member (mkTuple 1 1) x)))
+(assert (not (member (mkTuple 1 2) x)))
+(assert (not (member (mkTuple 1 3) x)))
+(assert (not (member (mkTuple 1 4) x)))
+(assert (not (member (mkTuple 1 5) x)))
+(assert (not (member (mkTuple 1 6) x)))
+(assert (not (member (mkTuple 1 7) x)))
+(assert (= y (tclosure x)))
+(assert (member (mkTuple 1 5) y))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tc_3.cvc b/test/regress/regress0/rels/rel_tc_3.cvc
deleted file mode 100644
index 080c676a8..000000000
--- a/test/regress/regress0/rels/rel_tc_3.cvc
+++ /dev/null
@@ -1,22 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-a: INT;
-b:INT;
-c:INT;
-d:INT;
-ASSERT (1, a) IS_IN x;
-ASSERT (1, c) IS_IN x;
-ASSERT (1, d) IS_IN x;
-ASSERT (b, 1) IS_IN x;
-ASSERT (b = d);
-ASSERT (b > (d -1));
-ASSERT (b < (d+1));
-%ASSERT (2,3) IS_IN ((x JOIN x) JOIN x);
-%ASSERT NOT (2, 3) IS_IN TCLOSURE(x);
-ASSERT y = TCLOSURE(x);
-ASSERT NOT ((1, 1) IS_IN y);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tc_3.cvc.smt2 b/test/regress/regress0/rels/rel_tc_3.cvc.smt2
new file mode 100644
index 000000000..46b7cff5b
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tc_3.cvc.smt2
@@ -0,0 +1,20 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun a () Int)
+(declare-fun b () Int)
+(declare-fun c () Int)
+(declare-fun d () Int)
+(assert (member (mkTuple 1 a) x))
+(assert (member (mkTuple 1 c) x))
+(assert (member (mkTuple 1 d) x))
+(assert (member (mkTuple b 1) x))
+(assert (= b d))
+(assert (> b (- d 1)))
+(assert (< b (+ d 1)))
+(assert (= y (tclosure x)))
+(assert (not (member (mkTuple 1 1) y)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tc_3_1.cvc b/test/regress/regress0/rels/rel_tc_3_1.cvc
deleted file mode 100644
index f1d9bbadc..000000000
--- a/test/regress/regress0/rels/rel_tc_3_1.cvc
+++ /dev/null
@@ -1,18 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-a: INT;
-b:INT;
-c:INT;
-d:INT;
-ASSERT (1, a) IS_IN x;
-ASSERT (1, c) IS_IN x;
-ASSERT (1, d) IS_IN x;
-ASSERT (b, 1) IS_IN x;
-ASSERT (b = d);
-
-ASSERT y = TCLOSURE(x);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tc_3_1.cvc.smt2 b/test/regress/regress0/rels/rel_tc_3_1.cvc.smt2
new file mode 100644
index 000000000..4d44f31a5
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tc_3_1.cvc.smt2
@@ -0,0 +1,17 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun a () Int)
+(declare-fun b () Int)
+(declare-fun c () Int)
+(declare-fun d () Int)
+(assert (member (mkTuple 1 a) x))
+(assert (member (mkTuple 1 c) x))
+(assert (member (mkTuple 1 d) x))
+(assert (member (mkTuple b 1) x))
+(assert (= b d))
+(assert (= y (tclosure x)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tc_7.cvc b/test/regress/regress0/rels/rel_tc_7.cvc
deleted file mode 100644
index d68779310..000000000
--- a/test/regress/regress0/rels/rel_tc_7.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-ASSERT y = (TCLOSURE(x) JOIN x);
-ASSERT (1,2) IS_IN ((x JOIN x) JOIN x);
-ASSERT NOT (y <= TCLOSURE(x));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tc_7.cvc.smt2 b/test/regress/regress0/rels/rel_tc_7.cvc.smt2
new file mode 100644
index 000000000..f5abb8eef
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tc_7.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(assert (= y (join (tclosure x) x)))
+(assert (member (mkTuple 1 2) (join (join x x) x)))
+(assert (not (subset y (tclosure x))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tc_8.cvc b/test/regress/regress0/rels/rel_tc_8.cvc
deleted file mode 100644
index 1a81ab569..000000000
--- a/test/regress/regress0/rels/rel_tc_8.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-
-ASSERT (2, 2) IS_IN TCLOSURE(x);
-ASSERT x = {}::SET OF IntPair;
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tc_8.cvc.smt2 b/test/regress/regress0/rels/rel_tc_8.cvc.smt2
new file mode 100644
index 000000000..9dc3f9f50
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tc_8.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(assert (member (mkTuple 2 2) (tclosure x)))
+(assert (= x (as emptyset (Set (Tuple Int Int)))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_3_1.cvc b/test/regress/regress0/rels/rel_tp_3_1.cvc
deleted file mode 100644
index 6284d3041..000000000
--- a/test/regress/regress0/rels/rel_tp_3_1.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-z: SET OF IntPair;
-
-ASSERT (1, 3) IS_IN x;
-ASSERT ((2,3) IS_IN z OR (2,1) IS_IN z);
-ASSERT y = TRANSPOSE(x);
-ASSERT NOT (1,2) IS_IN y;
-
-ASSERT x = z;
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_3_1.cvc.smt2 b/test/regress/regress0/rels/rel_tp_3_1.cvc.smt2
new file mode 100644
index 000000000..5db2710d8
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_3_1.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(assert (member (mkTuple 1 3) x))
+(assert (or (member (mkTuple 2 3) z) (member (mkTuple 2 1) z)))
+(assert (= y (transpose x)))
+(assert (not (member (mkTuple 1 2) y)))
+(assert (= x z))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_0.cvc b/test/regress/regress0/rels/rel_tp_join_0.cvc
deleted file mode 100644
index 7ea179d26..000000000
--- a/test/regress/regress0/rels/rel_tp_join_0.cvc
+++ /dev/null
@@ -1,32 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-r : SET OF IntPair;
-
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-v : IntPair;
-ASSERT v = (1,1);
-a : IntPair;
-ASSERT a = (5,1);
-
-b : IntPair;
-ASSERT b = (7, 5);
-
-ASSERT (1, 7) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (3, 4) IS_IN x;
-
-ASSERT b IS_IN y;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT r = (x JOIN y);
-ASSERT z IS_IN x;
-ASSERT zt IS_IN y;
-ASSERT NOT (a IS_IN TRANSPOSE(r));
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_0.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_0.cvc.smt2
new file mode 100644
index 000000000..594e0c52f
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_0.cvc.smt2
@@ -0,0 +1,28 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(declare-fun v () (Tuple Int Int))
+(assert (= v (mkTuple 1 1)))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 5 1)))
+(declare-fun b () (Tuple Int Int))
+(assert (= b (mkTuple 7 5)))
+(assert (member (mkTuple 1 7) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 3 4) x))
+(assert (member b y))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (= r (join x y)))
+(assert (member z x))
+(assert (member zt y))
+(assert (not (member a (transpose r))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_1.cvc b/test/regress/regress0/rels/rel_tp_join_1.cvc
deleted file mode 100644
index 845f26dce..000000000
--- a/test/regress/regress0/rels/rel_tp_join_1.cvc
+++ /dev/null
@@ -1,32 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntPair;
-
-b : IntPair;
-ASSERT b = (1,7);
-c : IntPair;
-ASSERT c = (2,3);
-ASSERT b IS_IN x;
-ASSERT c IS_IN x;
-
-d : IntPair;
-ASSERT d = (7,3);
-e : IntPair;
-ASSERT e = (4,7);
-
-ASSERT d IS_IN y;
-ASSERT e IS_IN y;
-
-ASSERT (3, 4) IS_IN z;
-
-a : IntPair;
-ASSERT a = (4,1);
-
-ASSERT r = ((x JOIN y) JOIN z);
-
-ASSERT NOT (a IS_IN TRANSPOSE(r));
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_1.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_1.cvc.smt2
new file mode 100644
index 000000000..fe2f9f2db
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_1.cvc.smt2
@@ -0,0 +1,26 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun b () (Tuple Int Int))
+(assert (= b (mkTuple 1 7)))
+(declare-fun c () (Tuple Int Int))
+(assert (= c (mkTuple 2 3)))
+(assert (member b x))
+(assert (member c x))
+(declare-fun d () (Tuple Int Int))
+(assert (= d (mkTuple 7 3)))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 7)))
+(assert (member d y))
+(assert (member e y))
+(assert (member (mkTuple 3 4) z))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 4 1)))
+(assert (= r (join (join x y) z)))
+(assert (not (member a (transpose r))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_2.cvc b/test/regress/regress0/rels/rel_tp_join_2.cvc
deleted file mode 100644
index a7b96b83b..000000000
--- a/test/regress/regress0/rels/rel_tp_join_2.cvc
+++ /dev/null
@@ -1,19 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntPair;
-
-ASSERT (7, 1) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT (3, 4) IS_IN z;
-
-a : IntPair;
-ASSERT a = (4,1);
-ASSERT r = ((TRANSPOSE(x) JOIN y) JOIN z);
-ASSERT NOT (a IS_IN TRANSPOSE(r));
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_2.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_2.cvc.smt2
new file mode 100644
index 000000000..fb402a909
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_2.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(assert (member (mkTuple 7 1) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (member (mkTuple 3 4) z))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 4 1)))
+(assert (= r (join (join (transpose x) y) z)))
+(assert (not (member a (transpose r))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_3.cvc b/test/regress/regress0/rels/rel_tp_join_3.cvc
deleted file mode 100644
index 3f39f5773..000000000
--- a/test/regress/regress0/rels/rel_tp_join_3.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% EXPECT: unsat
-% crash on this
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-w : SET OF IntPair;
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntPair;
-
-ASSERT (7, 1) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (7, 3) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT (3, 4) IS_IN z;
-ASSERT (3, 3) IS_IN w;
-
-a : IntPair;
-ASSERT a = (4,1);
-%ASSERT r = ((TRANSPOSE(x) JOIN y) JOIN (w JOIN z));
-ASSERT NOT (a IS_IN TRANSPOSE(r));
-
-zz : SET OF IntPair;
-ASSERT zz = (TRANSPOSE(x) JOIN y);
-ASSERT NOT ((1,3) IS_IN w);
-ASSERT NOT ((1,3) IS_IN (w | zz) );
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_3.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_3.cvc.smt2
new file mode 100644
index 000000000..23c235be6
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_3.cvc.smt2
@@ -0,0 +1,23 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun w () (Set (Tuple Int Int)))
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(assert (member (mkTuple 7 1) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 7 3) y))
+(assert (member (mkTuple 4 7) y))
+(assert (member (mkTuple 3 4) z))
+(assert (member (mkTuple 3 3) w))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 4 1)))
+(assert (not (member a (transpose r))))
+(declare-fun zz () (Set (Tuple Int Int)))
+(assert (= zz (join (transpose x) y)))
+(assert (not (member (mkTuple 1 3) w)))
+(assert (not (member (mkTuple 1 3) (union w zz))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_eq_0.cvc b/test/regress/regress0/rels/rel_tp_join_eq_0.cvc
deleted file mode 100644
index 852e93466..000000000
--- a/test/regress/regress0/rels/rel_tp_join_eq_0.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntPair;
-
-
-ASSERT x = {(1,7), (2,3)};
-
-d : IntPair;
-ASSERT d = (7,3);
-e : IntPair;
-ASSERT e = (4,7);
-
-ASSERT d IS_IN y;
-ASSERT e IS_IN y;
-
-ASSERT (3, 4) IS_IN z;
-
-a : IntPair;
-ASSERT a = (4,1);
-
-ASSERT r = ((x JOIN y) JOIN z);
-
-ASSERT NOT (a IS_IN TRANSPOSE(r));
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_eq_0.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_eq_0.cvc.smt2
new file mode 100644
index 000000000..672844f08
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_eq_0.cvc.smt2
@@ -0,0 +1,21 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(assert (= x (union (singleton (mkTuple 1 7)) (singleton (mkTuple 2 3)))))
+(declare-fun d () (Tuple Int Int))
+(assert (= d (mkTuple 7 3)))
+(declare-fun e () (Tuple Int Int))
+(assert (= e (mkTuple 4 7)))
+(assert (member d y))
+(assert (member e y))
+(assert (member (mkTuple 3 4) z))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 4 1)))
+(assert (= r (join (join x y) z)))
+(assert (not (member a (transpose r))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_int_0.cvc b/test/regress/regress0/rels/rel_tp_join_int_0.cvc
deleted file mode 100644
index 6ab678881..000000000
--- a/test/regress/regress0/rels/rel_tp_join_int_0.cvc
+++ /dev/null
@@ -1,26 +0,0 @@
-% EXPECT: unsat
-% crash on this
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-w : SET OF IntPair;
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntPair;
-
-t : INT;
-u : INT;
-
-ASSERT 4 < t AND t < 6;
-ASSERT 4 < u AND u < 6;
-
-ASSERT (1, u) IS_IN x;
-ASSERT (t, 3) IS_IN y;
-
-a : IntPair;
-ASSERT a = (1,3);
-
-ASSERT NOT (a IS_IN (x JOIN y));
-
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_int_0.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_int_0.cvc.smt2
new file mode 100644
index 000000000..83b6ab904
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_int_0.cvc.smt2
@@ -0,0 +1,19 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun w () (Set (Tuple Int Int)))
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun t () Int)
+(declare-fun u () Int)
+(assert (and (< 4 t) (< t 6)))
+(assert (and (< 4 u) (< u 6)))
+(assert (member (mkTuple 1 u) x))
+(assert (member (mkTuple t 3) y))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 3)))
+(assert (not (member a (join x y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_pro_0.cvc b/test/regress/regress0/rels/rel_tp_join_pro_0.cvc
deleted file mode 100644
index 18eaa51a9..000000000
--- a/test/regress/regress0/rels/rel_tp_join_pro_0.cvc
+++ /dev/null
@@ -1,21 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-IntTup: TYPE = [INT, INT, INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntTup;
-
-ASSERT (2, 1) IS_IN x;
-ASSERT (2, 3) IS_IN x;
-ASSERT (2, 2) IS_IN y;
-ASSERT (4, 7) IS_IN y;
-ASSERT (3, 4) IS_IN z;
-
-v : IntTup;
-ASSERT v = (4,3,2,1);
-
-ASSERT r = ((TRANSPOSE(x) JOIN y) PRODUCT z);
-ASSERT NOT (v IS_IN TRANSPOSE(r));
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_pro_0.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_pro_0.cvc.smt2
new file mode 100644
index 000000000..f3bcad8a1
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_pro_0.cvc.smt2
@@ -0,0 +1,19 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int Int Int)))
+(assert (member (mkTuple 2 1) x))
+(assert (member (mkTuple 2 3) x))
+(assert (member (mkTuple 2 2) y))
+(assert (member (mkTuple 4 7) y))
+(assert (member (mkTuple 3 4) z))
+(declare-fun v () (Tuple Int Int Int Int))
+(assert (= v (mkTuple 4 3 2 1)))
+(assert (= r (product (join (transpose x) y) z)))
+(assert (not (member v (transpose r))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_tp_join_var_0.cvc b/test/regress/regress0/rels/rel_tp_join_var_0.cvc
deleted file mode 100644
index 08a9d0bb5..000000000
--- a/test/regress/regress0/rels/rel_tp_join_var_0.cvc
+++ /dev/null
@@ -1,28 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-w : SET OF IntPair;
-x : SET OF IntPair;
-y : SET OF IntPair;
-z : SET OF IntPair;
-r : SET OF IntPair;
-
-t : INT;
-u : INT;
-
-ASSERT 4 < t AND t < 6;
-ASSERT 4 < u AND u < 6;
-
-ASSERT (1, t) IS_IN x;
-ASSERT (u, 3) IS_IN y;
-
-a : IntPair;
-ASSERT a = (1,3);
-
-ASSERT NOT (a IS_IN (x JOIN y));
-
-st : SET OF INT;
-su : SET OF INT;
-ASSERT t IS_IN st;
-ASSERT u IS_IN su;
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_tp_join_var_0.cvc.smt2 b/test/regress/regress0/rels/rel_tp_join_var_0.cvc.smt2
new file mode 100644
index 000000000..0fee2c136
--- /dev/null
+++ b/test/regress/regress0/rels/rel_tp_join_var_0.cvc.smt2
@@ -0,0 +1,23 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun w () (Set (Tuple Int Int)))
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun t () Int)
+(declare-fun u () Int)
+(assert (and (< 4 t) (< t 6)))
+(assert (and (< 4 u) (< u 6)))
+(assert (member (mkTuple 1 t) x))
+(assert (member (mkTuple u 3) y))
+(declare-fun a () (Tuple Int Int))
+(assert (= a (mkTuple 1 3)))
+(assert (not (member a (join x y))))
+(declare-fun st () (Set Int))
+(declare-fun su () (Set Int))
+(assert (member t st))
+(assert (member u su))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_0.cvc b/test/regress/regress0/rels/rel_transpose_0.cvc
deleted file mode 100644
index 4687bd47c..000000000
--- a/test/regress/regress0/rels/rel_transpose_0.cvc
+++ /dev/null
@@ -1,18 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-
-a: INT;
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-
-ASSERT z IS_IN x;
-ASSERT NOT (zt IS_IN TRANSPOSE(x));
-
-ASSERT y = TRANSPOSE(x);
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_0.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_0.cvc.smt2
new file mode 100644
index 000000000..9996209b8
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_0.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun a () Int)
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(assert (member z x))
+(assert (not (member zt (transpose x))))
+(assert (= y (transpose x)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_1.cvc b/test/regress/regress0/rels/rel_transpose_1.cvc
deleted file mode 100644
index c205edabc..000000000
--- a/test/regress/regress0/rels/rel_transpose_1.cvc
+++ /dev/null
@@ -1,12 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntTup: TYPE = [INT, INT, INT];
-x : SET OF IntTup;
-y : SET OF IntTup;
-z : IntTup;
-ASSERT z = (1,2,3);
-zt : IntTup;
-ASSERT zt = (3,2,1);
-ASSERT z IS_IN x;
-ASSERT NOT (zt IS_IN TRANSPOSE(x));
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_1.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_1.cvc.smt2
new file mode 100644
index 000000000..3d21e17a9
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_1.cvc.smt2
@@ -0,0 +1,13 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int Int)))
+(declare-fun y () (Set (Tuple Int Int Int)))
+(declare-fun z () (Tuple Int Int Int))
+(assert (= z (mkTuple 1 2 3)))
+(declare-fun zt () (Tuple Int Int Int))
+(assert (= zt (mkTuple 3 2 1)))
+(assert (member z x))
+(assert (not (member zt (transpose x))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_1_1.cvc b/test/regress/regress0/rels/rel_transpose_1_1.cvc
deleted file mode 100644
index 62afa7a93..000000000
--- a/test/regress/regress0/rels/rel_transpose_1_1.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntTup: TYPE = [INT, INT, INT];
-x : SET OF IntTup;
-y : SET OF IntTup;
-z : IntTup;
-a: INT;
-ASSERT z = (1,2,a);
-zt : IntTup;
-ASSERT zt = (3,2,2);
-ASSERT z IS_IN x;
-ASSERT zt IS_IN TRANSPOSE(x);
-ASSERT y = TRANSPOSE(x);
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_1_1.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_1_1.cvc.smt2
new file mode 100644
index 000000000..d54b8c608
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_1_1.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int Int)))
+(declare-fun y () (Set (Tuple Int Int Int)))
+(declare-fun z () (Tuple Int Int Int))
+(declare-fun a () Int)
+(assert (= z (mkTuple 1 2 a)))
+(declare-fun zt () (Tuple Int Int Int))
+(assert (= zt (mkTuple 3 2 2)))
+(assert (member z x))
+(assert (member zt (transpose x)))
+(assert (= y (transpose x)))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_3.cvc b/test/regress/regress0/rels/rel_transpose_3.cvc
deleted file mode 100644
index 7208b4ce6..000000000
--- a/test/regress/regress0/rels/rel_transpose_3.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-ASSERT (x = y);
-ASSERT z IS_IN x;
-ASSERT NOT (zt IS_IN TRANSPOSE(y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_3.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_3.cvc.smt2
new file mode 100644
index 000000000..3109186f1
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_3.cvc.smt2
@@ -0,0 +1,14 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(assert (= x y))
+(assert (member z x))
+(assert (not (member zt (transpose y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_4.cvc b/test/regress/regress0/rels/rel_transpose_4.cvc
deleted file mode 100644
index 0cf2c3b63..000000000
--- a/test/regress/regress0/rels/rel_transpose_4.cvc
+++ /dev/null
@@ -1,13 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-
-ASSERT z IS_IN x;
-ASSERT NOT ((2, 1) IS_IN TRANSPOSE(x));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_4.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_4.cvc.smt2
new file mode 100644
index 000000000..d75d64b64
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_4.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(assert (member z x))
+(assert (not (member (mkTuple 2 1) (transpose x))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_5.cvc b/test/regress/regress0/rels/rel_transpose_5.cvc
deleted file mode 100644
index 8f6d48e35..000000000
--- a/test/regress/regress0/rels/rel_transpose_5.cvc
+++ /dev/null
@@ -1,22 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-
-r : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-ASSERT zt IS_IN y;
-
-w : IntPair;
-ASSERT w = (2, 2);
-ASSERT w IS_IN y;
-ASSERT z IS_IN x;
-
-ASSERT NOT (zt IS_IN (TRANSPOSE (x JOIN y)));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_5.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_5.cvc.smt2
new file mode 100644
index 000000000..927a5f07f
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_5.cvc.smt2
@@ -0,0 +1,18 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun r () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(assert (member zt y))
+(declare-fun w () (Tuple Int Int))
+(assert (= w (mkTuple 2 2)))
+(assert (member w y))
+(assert (member z x))
+(assert (not (member zt (transpose (join x y)))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_6.cvc b/test/regress/regress0/rels/rel_transpose_6.cvc
deleted file mode 100644
index c7b8ebbae..000000000
--- a/test/regress/regress0/rels/rel_transpose_6.cvc
+++ /dev/null
@@ -1,24 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-
-z : IntPair;
-ASSERT z = (1,2);
-zt : IntPair;
-ASSERT zt = (2,1);
-
-ASSERT z IS_IN x;
-ASSERT (3, 4) IS_IN x;
-ASSERT (3, 5) IS_IN x;
-ASSERT (3, 3) IS_IN x;
-
-ASSERT x = TRANSPOSE(y);
-
-ASSERT NOT (zt IS_IN y);
-
-ASSERT z IS_IN y;
-ASSERT NOT (zt IS_IN TRANSPOSE(y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_6.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_6.cvc.smt2
new file mode 100644
index 000000000..7c097fc46
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_6.cvc.smt2
@@ -0,0 +1,19 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(declare-fun z () (Tuple Int Int))
+(assert (= z (mkTuple 1 2)))
+(declare-fun zt () (Tuple Int Int))
+(assert (= zt (mkTuple 2 1)))
+(assert (member z x))
+(assert (member (mkTuple 3 4) x))
+(assert (member (mkTuple 3 5) x))
+(assert (member (mkTuple 3 3) x))
+(assert (= x (transpose y)))
+(assert (not (member zt y)))
+(assert (member z y))
+(assert (not (member zt (transpose y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rel_transpose_7.cvc b/test/regress/regress0/rels/rel_transpose_7.cvc
deleted file mode 100644
index 4d1426990..000000000
--- a/test/regress/regress0/rels/rel_transpose_7.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: unsat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-x : SET OF IntPair;
-y : SET OF IntPair;
-
-ASSERT x = y;
-ASSERT NOT (TRANSPOSE(x) = TRANSPOSE(y));
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rel_transpose_7.cvc.smt2 b/test/regress/regress0/rels/rel_transpose_7.cvc.smt2
new file mode 100644
index 000000000..7debeaa87
--- /dev/null
+++ b/test/regress/regress0/rels/rel_transpose_7.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun x () (Set (Tuple Int Int)))
+(declare-fun y () (Set (Tuple Int Int)))
+(assert (= x y))
+(assert (not (= (transpose x) (transpose y))))
+(check-sat)
diff --git a/test/regress/regress0/rels/rels-sharing-simp.cvc b/test/regress/regress0/rels/rels-sharing-simp.cvc
deleted file mode 100644
index 641d71d5a..000000000
--- a/test/regress/regress0/rels/rels-sharing-simp.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-IntPair: TYPE = [INT, INT];
-w : SET OF IntPair;
-z : SET OF IntPair;
-x : INT;
-y : INT;
-
-ASSERT (1,x) IS_IN w;
-ASSERT (y,2) IS_IN z;
-
-ASSERT NOT (1, 2) IS_IN ( w JOIN z );
-
-CHECKSAT;
diff --git a/test/regress/regress0/rels/rels-sharing-simp.cvc.smt2 b/test/regress/regress0/rels/rels-sharing-simp.cvc.smt2
new file mode 100644
index 000000000..dff78fbd8
--- /dev/null
+++ b/test/regress/regress0/rels/rels-sharing-simp.cvc.smt2
@@ -0,0 +1,12 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+
+(declare-fun w () (Set (Tuple Int Int)))
+(declare-fun z () (Set (Tuple Int Int)))
+(declare-fun x () Int)
+(declare-fun y () Int)
+(assert (member (mkTuple 1 x) w))
+(assert (member (mkTuple y 2) z))
+(assert (not (member (mkTuple 1 2) (join w z))))
+(check-sat)
diff --git a/test/regress/regress0/sets/card-3sets.cvc b/test/regress/regress0/sets/card-3sets.cvc
deleted file mode 100644
index 7422df91c..000000000
--- a/test/regress/regress0/sets/card-3sets.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: sat
-OPTION "logic" "ALL";
-x : SET OF INT;
-y : SET OF INT;
-z : SET OF INT;
-
-ASSERT CARD( x ) > CARD( y ) AND CARD( y ) > CARD( z );
-
-CHECKSAT;
diff --git a/test/regress/regress0/sets/card-3sets.cvc.smt2 b/test/regress/regress0/sets/card-3sets.cvc.smt2
new file mode 100644
index 000000000..6c4bdd8ca
--- /dev/null
+++ b/test/regress/regress0/sets/card-3sets.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-logic ALL)
+(declare-fun x () (Set Int))
+(declare-fun y () (Set Int))
+(declare-fun z () (Set Int))
+(assert (let ((_let_1 (card y))) (and (> (card x) _let_1) (> _let_1 (card z)))))
+(check-sat)
diff --git a/test/regress/regress0/sets/complement.cvc b/test/regress/regress0/sets/complement.cvc
deleted file mode 100644
index 64df0790a..000000000
--- a/test/regress/regress0/sets/complement.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-OPTION "sets-ext";
-OPTION "logic" "ALL";
-Atom: TYPE;
-a : SET OF [Atom];
-b : SET OF [Atom];
-
-ASSERT a = (~ b);
-
-CHECKSAT;
diff --git a/test/regress/regress0/sets/complement.cvc.smt2 b/test/regress/regress0/sets/complement.cvc.smt2
new file mode 100644
index 000000000..e86dcf107
--- /dev/null
+++ b/test/regress/regress0/sets/complement.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-option :sets-ext true)
+(set-logic ALL)
+(declare-sort Atom 0)
+(declare-fun a () (Set (Tuple Atom)))
+(declare-fun b () (Set (Tuple Atom)))
+(assert (= a (complement b)))
+(check-sat)
diff --git a/test/regress/regress0/sets/complement2.cvc b/test/regress/regress0/sets/complement2.cvc
deleted file mode 100644
index a3dd25477..000000000
--- a/test/regress/regress0/sets/complement2.cvc
+++ /dev/null
@@ -1,12 +0,0 @@
-% EXPECT: unsat
-OPTION "sets-ext";
-OPTION "logic" "ALL";
-Atom: TYPE;
-a : SET OF Atom;
-b : SET OF Atom;
-c : Atom;
-
-ASSERT a = ~(a);
-ASSERT c IS_IN a;
-
-CHECKSAT;
diff --git a/test/regress/regress0/sets/complement2.cvc.smt2 b/test/regress/regress0/sets/complement2.cvc.smt2
new file mode 100644
index 000000000..582156067
--- /dev/null
+++ b/test/regress/regress0/sets/complement2.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: unsat
+(set-option :incremental false)
+(set-option :sets-ext true)
+(set-logic ALL)
+(declare-sort Atom 0)
+(declare-fun a () (Set Atom))
+(declare-fun b () (Set Atom))
+(declare-fun c () Atom)
+(assert (= a (complement a)))
+(assert (member c a))
+(check-sat)
diff --git a/test/regress/regress0/sets/complement3.cvc b/test/regress/regress0/sets/complement3.cvc
deleted file mode 100644
index 762d186ed..000000000
--- a/test/regress/regress0/sets/complement3.cvc
+++ /dev/null
@@ -1,15 +0,0 @@
-% EXPECT: sat
-OPTION "sets-ext";
-OPTION "logic" "ALL";
-Atom : TYPE;
-C32 : SET OF [Atom];
-C2 : SET OF [Atom];
-C4 : SET OF [Atom];
-ATOM_UNIV : SET OF [Atom];
-V1 : Atom;
-ASSERT C32 = (~C2) & (~C4);
-ASSERT TUPLE(V1) IS_IN ~(C32);
-ASSERT ATOM_UNIV = UNIVERSE :: SET OF [Atom];
-ASSERT TUPLE(V1) IS_IN ATOM_UNIV;
-ASSERT TUPLE(V1) IS_IN ~(C2);
-CHECKSAT;
diff --git a/test/regress/regress0/sets/complement3.cvc.smt2 b/test/regress/regress0/sets/complement3.cvc.smt2
new file mode 100644
index 000000000..3e7239774
--- /dev/null
+++ b/test/regress/regress0/sets/complement3.cvc.smt2
@@ -0,0 +1,16 @@
+; EXPECT: sat
+(set-option :incremental false)
+(set-option :sets-ext true)
+(set-logic ALL)
+(declare-sort Atom 0)
+(declare-fun C32 () (Set (Tuple Atom)))
+(declare-fun C2 () (Set (Tuple Atom)))
+(declare-fun C4 () (Set (Tuple Atom)))
+(declare-fun ATOM_UNIV () (Set (Tuple Atom)))
+(declare-fun V1 () Atom)
+(assert (= C32 (intersection (complement C2) (complement C4))))
+(assert (member (mkTuple V1) (complement C32)))
+(assert (= ATOM_UNIV (as univset (Set (Tuple Atom)))))
+(assert (member (mkTuple V1) ATOM_UNIV))
+(assert (member (mkTuple V1) (complement C2)))
+(check-sat)
diff --git a/test/regress/regress0/sets/cvc-sample.cvc b/test/regress/regress0/sets/cvc-sample.cvc
deleted file mode 100644
index 11f9428c3..000000000
--- a/test/regress/regress0/sets/cvc-sample.cvc
+++ /dev/null
@@ -1,55 +0,0 @@
-% COMMAND-LINE: --incremental
-% EXPECT: unsat
-% EXPECT: unsat
-% EXPECT: unsat
-% EXPECT: unsat
-% EXPECT: unsat
-% EXPECT: not_entailed
-OPTION "incremental" true;
-OPTION "logic" "ALL";
-SetInt : TYPE = SET OF INT;
-x : SET OF INT;
-y : SET OF INT;
-z : SET OF INT;
-e1 : INT;
-e2 : INT;
-PUSH;
-a : SET OF INT;
-b : SET OF INT;
-c : SET OF INT;
-e : INT;
-ASSERT a = {5};
-ASSERT c = (a | b);
-ASSERT NOT(c = (a & b));
-ASSERT c = (a - b);
-ASSERT a <= b;
-ASSERT e IS_IN c;
-ASSERT e IS_IN a;
-ASSERT e IS_IN (a & b);
-CHECKSAT TRUE;
-POP;
-PUSH;
-ASSERT x = y;
-ASSERT NOT((x | z) = (y | z));
-CHECKSAT TRUE;
-POP;
-PUSH;
-ASSERT x = y;
-ASSERT e1 = e2;
-ASSERT e1 IS_IN x;
-ASSERT NOT(e2 IS_IN y);
-CHECKSAT TRUE;
-POP;
-PUSH;
-ASSERT x = y;
-ASSERT e1 = e2;
-ASSERT e1 IS_IN (x | z);
-ASSERT NOT(e2 IS_IN (y | z));
-CHECKSAT TRUE;
-POP;
-PUSH;
-ASSERT 5 IS_IN ({1, 2, 3, 4} | {5});
-ASSERT 5 IS_IN ({1, 2, 3, 4} | {} :: SET OF INT);
-CHECKSAT TRUE;
-POP;
-QUERY LET v_0 = e1 IS_IN z IN v_0 AND NOT v_0;
diff --git a/test/regress/regress0/sets/cvc-sample.cvc.smt2 b/test/regress/regress0/sets/cvc-sample.cvc.smt2
new file mode 100644
index 000000000..e0ea07a78
--- /dev/null
+++ b/test/regress/regress0/sets/cvc-sample.cvc.smt2
@@ -0,0 +1,90 @@
+; COMMAND-LINE: --incremental
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: unsat
+; EXPECT: sat
+(set-option :incremental true)
+(set-logic ALL)
+
+(declare-fun x () (Set Int))
+(declare-fun y () (Set Int))
+(declare-fun z () (Set Int))
+(declare-fun e1 () Int)
+(declare-fun e2 () Int)
+(push 1)
+(declare-fun a () (Set Int))
+(declare-fun b () (Set Int))
+(declare-fun c () (Set Int))
+(declare-fun e () Int)
+(assert (= a (singleton 5)))
+(assert (= c (union a b)))
+(assert (not (= c (intersection a b))))
+(assert (= c (setminus a b)))
+(assert (subset a b))
+(assert (member e c))
+(assert (member e a))
+(assert (member e (intersection a b)))
+(push 1)
+
+(assert true)
+
+(check-sat)
+
+(pop 1)
+
+(pop 1)
+(push 1)
+(assert (= x y))
+(assert (not (= (union x z) (union y z))))
+(push 1)
+
+(assert true)
+
+(check-sat)
+
+(pop 1)
+
+(pop 1)
+(push 1)
+(assert (= x y))
+(assert (= e1 e2))
+(assert (member e1 x))
+(assert (not (member e2 y)))
+(push 1)
+
+(assert true)
+
+(check-sat)
+
+(pop 1)
+
+(pop 1)
+(push 1)
+(assert (= x y))
+(assert (= e1 e2))
+(assert (member e1 (union x z)))
+(assert (not (member e2 (union y z))))
+(push 1)
+
+(assert true)
+
+(check-sat)
+
+(pop 1)
+
+(pop 1)
+(push 1)
+(assert (member 5 (union (union (union (union (singleton 1) (singleton 2)) (singleton 3)) (singleton 4)) (singleton 5))))
+(assert (member 5 (union (union (union (union (singleton 1) (singleton 2)) (singleton 3)) (singleton 4)) (as emptyset (Set Int)))))
+(push 1)
+
+(assert true)
+
+(check-sat)
+
+(pop 1)
+
+(pop 1)
+(check-sat-assuming ( (not (let ((_let_1 (member e1 z))) (and _let_1 (not _let_1)))) ))
diff --git a/test/regress/regress0/simple.cvc b/test/regress/regress0/simple.cvc
deleted file mode 100644
index def48254e..000000000
--- a/test/regress/regress0/simple.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-x0, x1, x2, x3 : BOOLEAN;
-ASSERT x1 OR NOT x0;
-ASSERT x0 OR NOT x3;
-ASSERT x3 OR x2;
-ASSERT x1 AND NOT x1;
-% EXPECT: entailed
-QUERY x2;
diff --git a/test/regress/regress0/simple.cvc.smt2 b/test/regress/regress0/simple.cvc.smt2
new file mode 100644
index 000000000..5f75b8944
--- /dev/null
+++ b/test/regress/regress0/simple.cvc.smt2
@@ -0,0 +1,12 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x0 () Bool)
+(declare-fun x1 () Bool)
+(declare-fun x2 () Bool)
+(declare-fun x3 () Bool)
+(assert (or x1 (not x0)))
+(assert (or x0 (not x3)))
+(assert (or x3 x2))
+(assert (and x1 (not x1)))
+(check-sat-assuming ( x2 ))
diff --git a/test/regress/regress0/smallcnf.cvc b/test/regress/regress0/smallcnf.cvc
deleted file mode 100644
index dcb7c6f0d..000000000
--- a/test/regress/regress0/smallcnf.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-a, b, c : BOOLEAN;
-
-ASSERT NOT a OR NOT b;
-ASSERT c OR b OR a;
-ASSERT b OR NOT a;
-ASSERT a OR NOT b OR c;
-% EXPECT: not_entailed
-QUERY FALSE;
-
diff --git a/test/regress/regress0/smallcnf.cvc.smt2 b/test/regress/regress0/smallcnf.cvc.smt2
new file mode 100644
index 000000000..a16bbe798
--- /dev/null
+++ b/test/regress/regress0/smallcnf.cvc.smt2
@@ -0,0 +1,11 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(assert (or (not a) (not b)))
+(assert (or (or c b) a))
+(assert (or b (not a)))
+(assert (or (or a (not b)) c))
+(check-sat)
diff --git a/test/regress/regress0/strings/parser-syms.cvc b/test/regress/regress0/strings/parser-syms.cvc
deleted file mode 100644
index 20c37cf52..000000000
--- a/test/regress/regress0/strings/parser-syms.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: sat
-
-x : STRING;
-y : STRING;
-
-ASSERT CONCAT( REVERSE("abc"), "d") = x;
-ASSERT CONCAT( TOLOWER("ABC"), TOUPPER("abc")) = y;
-
-CHECKSAT;
diff --git a/test/regress/regress0/strings/parser-syms.cvc.smt2 b/test/regress/regress0/strings/parser-syms.cvc.smt2
new file mode 100644
index 000000000..b71360c2c
--- /dev/null
+++ b/test/regress/regress0/strings/parser-syms.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () String)
+(declare-fun y () String)
+(assert (= (str.++ (str.rev "abc") "d") x))
+(assert (= (str.++ (str.tolower "ABC") (str.toupper "abc")) y))
+(check-sat)
diff --git a/test/regress/regress0/strings/regexp-native-simple.cvc b/test/regress/regress0/strings/regexp-native-simple.cvc
deleted file mode 100644
index 49d6f3d64..000000000
--- a/test/regress/regress0/strings/regexp-native-simple.cvc
+++ /dev/null
@@ -1,13 +0,0 @@
-% EXPECT: sat
-
-x : STRING;
-
-ASSERT x IS_IN RE_CONCAT(RE_OPT(RE_STAR(RE_UNION(RE_RANGE("i", "j"), RE_RANGE("k", "l")))),
- RE_PLUS(STRING_TO_REGEXP("abc")),
- RE_LOOP(STRING_TO_REGEXP("def"), 1, 2),
- RE_SIGMA);
-ASSERT NOT(x IS_IN RE_INTER(RE_STAR(RE_SIGMA), RE_EMPTY));
-
-ASSERT x = "ikljabcabcdefe";
-
-CHECKSAT;
diff --git a/test/regress/regress0/strings/regexp-native-simple.cvc.smt2 b/test/regress/regress0/strings/regexp-native-simple.cvc.smt2
new file mode 100644
index 000000000..c1c0087af
--- /dev/null
+++ b/test/regress/regress0/strings/regexp-native-simple.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () String)
+(assert (str.in_re x (re.++ (re.opt (re.* (re.union (re.range "i" "j") (re.range "k" "l")))) (re.+ (str.to_re "abc")) ((_ re.loop 1 2) (str.to_re "def")) re.allchar )))
+(assert (not (str.in_re x (re.inter (re.* re.allchar ) re.none ))))
+(assert (= x "ikljabcabcdefe"))
+(check-sat)
diff --git a/test/regress/regress0/strings/strings-charat.cvc b/test/regress/regress0/strings/strings-charat.cvc
deleted file mode 100644
index 76c686dbf..000000000
--- a/test/regress/regress0/strings/strings-charat.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% COMMAND-LINE: --strings-exp
-% EXPECT: unsat
-
-x : STRING;
-y : STRING;
-
-ASSERT x = CONCAT( "abcd", y );
-ASSERT CHARAT(x,0) = CHARAT(x,2);
-
-CHECKSAT;
diff --git a/test/regress/regress0/strings/strings-charat.cvc.smt2 b/test/regress/regress0/strings/strings-charat.cvc.smt2
new file mode 100644
index 000000000..440172172
--- /dev/null
+++ b/test/regress/regress0/strings/strings-charat.cvc.smt2
@@ -0,0 +1,9 @@
+; COMMAND-LINE: --strings-exp
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () String)
+(declare-fun y () String)
+(assert (= x (str.++ "abcd" y)))
+(assert (= (str.at x 0) (str.at x 2)))
+(check-sat)
diff --git a/test/regress/regress0/strings/strings-native-simple.cvc b/test/regress/regress0/strings/strings-native-simple.cvc
deleted file mode 100644
index 568452e12..000000000
--- a/test/regress/regress0/strings/strings-native-simple.cvc
+++ /dev/null
@@ -1,10 +0,0 @@
-% EXPECT: sat
-
-x : STRING;
-y : STRING;
-
-ASSERT x = CONCAT( "abcd", y );
-ASSERT LENGTH( x ) >= 6;
-ASSERT LENGTH( y ) < 5;
-
-CHECKSAT;
diff --git a/test/regress/regress0/strings/strings-native-simple.cvc.smt2 b/test/regress/regress0/strings/strings-native-simple.cvc.smt2
new file mode 100644
index 000000000..d40e9db7e
--- /dev/null
+++ b/test/regress/regress0/strings/strings-native-simple.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () String)
+(declare-fun y () String)
+(assert (= x (str.++ "abcd" y)))
+(assert (>= (str.len x) 6))
+(assert (< (str.len y) 5))
+(check-sat)
diff --git a/test/regress/regress0/test11.cvc b/test/regress/regress0/test11.cvc
deleted file mode 100644
index 26dda442e..000000000
--- a/test/regress/regress0/test11.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-x, y : BOOLEAN;
-
-ASSERT (x OR y);
-ASSERT NOT (x OR y);
-
-% EXPECT: entailed
-QUERY FALSE;
diff --git a/test/regress/regress0/test11.cvc.smt2 b/test/regress/regress0/test11.cvc.smt2
new file mode 100644
index 000000000..469e5a4a7
--- /dev/null
+++ b/test/regress/regress0/test11.cvc.smt2
@@ -0,0 +1,8 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Bool)
+(declare-fun y () Bool)
+(assert (or x y))
+(assert (not (or x y)))
+(check-sat)
diff --git a/test/regress/regress0/test9.cvc b/test/regress/regress0/test9.cvc
deleted file mode 100644
index 7872f5a1a..000000000
--- a/test/regress/regress0/test9.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-% EXPECT: entailed
-P,Q:BOOLEAN;
-ASSERT (P OR Q);
-QUERY (P OR Q);
diff --git a/test/regress/regress0/test9.cvc.smt2 b/test/regress/regress0/test9.cvc.smt2
new file mode 100644
index 000000000..0c52fc36e
--- /dev/null
+++ b/test/regress/regress0/test9.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun P () Bool)
+(declare-fun Q () Bool)
+(assert (or P Q))
+(check-sat-assuming ( (not (or P Q)) ))
diff --git a/test/regress/regress0/uf/simple.01.cvc b/test/regress/regress0/uf/simple.01.cvc
deleted file mode 100644
index 6b0f93324..000000000
--- a/test/regress/regress0/uf/simple.01.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: entailed
-A: TYPE;
-B: TYPE;
-x, y: A;
-f: A -> B;
-QUERY (x = y => f(x) = f(y));
-
diff --git a/test/regress/regress0/uf/simple.01.cvc.smt2 b/test/regress/regress0/uf/simple.01.cvc.smt2
new file mode 100644
index 000000000..8cb117f64
--- /dev/null
+++ b/test/regress/regress0/uf/simple.01.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-sort A 0)
+(declare-sort B 0)
+(declare-fun x () A)
+(declare-fun y () A)
+(declare-fun f (A) B)
+(check-sat-assuming ( (not (=> (= x y) (= (f x) (f y)))) ))
diff --git a/test/regress/regress0/uf/simple.02.cvc b/test/regress/regress0/uf/simple.02.cvc
deleted file mode 100644
index 2bd0b1e1e..000000000
--- a/test/regress/regress0/uf/simple.02.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: not_entailed
-A: TYPE;
-B: TYPE;
-x, y: A;
-f: A -> B;
-QUERY (f(x) = f(y));
-
diff --git a/test/regress/regress0/uf/simple.02.cvc.smt2 b/test/regress/regress0/uf/simple.02.cvc.smt2
new file mode 100644
index 000000000..8d638ec84
--- /dev/null
+++ b/test/regress/regress0/uf/simple.02.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-sort A 0)
+(declare-sort B 0)
+(declare-fun x () A)
+(declare-fun y () A)
+(declare-fun f (A) B)
+(check-sat-assuming ( (= (f x) (f y)) ))
diff --git a/test/regress/regress0/uf/simple.03.cvc b/test/regress/regress0/uf/simple.03.cvc
deleted file mode 100644
index 15fe5907c..000000000
--- a/test/regress/regress0/uf/simple.03.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: entailed
-A: TYPE;
-B: TYPE;
-x, y: A;
-a, b: A;
-
-f: A -> B;
-
-ASSERT (x = a AND y = a) OR (x = b AND y = b);
-QUERY (f(x) = f(y));
-
diff --git a/test/regress/regress0/uf/simple.03.cvc.smt2 b/test/regress/regress0/uf/simple.03.cvc.smt2
new file mode 100644
index 000000000..b3822c389
--- /dev/null
+++ b/test/regress/regress0/uf/simple.03.cvc.smt2
@@ -0,0 +1,12 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-sort A 0)
+(declare-sort B 0)
+(declare-fun x () A)
+(declare-fun y () A)
+(declare-fun a () A)
+(declare-fun b () A)
+(declare-fun f (A) B)
+(assert (or (and (= x a) (= y a)) (and (= x b) (= y b))))
+(check-sat-assuming ( (not (= (f x) (f y))) ))
diff --git a/test/regress/regress0/uf/simple.04.cvc b/test/regress/regress0/uf/simple.04.cvc
deleted file mode 100644
index 0fc52bcca..000000000
--- a/test/regress/regress0/uf/simple.04.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: not_entailed
-A: TYPE;
-B: TYPE;
-x, y: A;
-a, b: A;
-
-f: A -> B;
-
-ASSERT (x = a OR x = b) AND (y = b OR y = a);
-QUERY (f(x) = f(y));
-
diff --git a/test/regress/regress0/uf/simple.04.cvc.smt2 b/test/regress/regress0/uf/simple.04.cvc.smt2
new file mode 100644
index 000000000..726c2bc04
--- /dev/null
+++ b/test/regress/regress0/uf/simple.04.cvc.smt2
@@ -0,0 +1,12 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-sort A 0)
+(declare-sort B 0)
+(declare-fun x () A)
+(declare-fun y () A)
+(declare-fun a () A)
+(declare-fun b () A)
+(declare-fun f (A) B)
+(assert (and (or (= x a) (= x b)) (or (= y b) (= y a))))
+(check-sat-assuming ( (= (f x) (f y)) ))
diff --git a/test/regress/regress0/uf20-03.cvc b/test/regress/regress0/uf20-03.cvc
deleted file mode 100644
index b25d8a471..000000000
--- a/test/regress/regress0/uf20-03.cvc
+++ /dev/null
@@ -1,115 +0,0 @@
-% EXPECT: not_entailed
-x_1 : BOOLEAN;
-x_2 : BOOLEAN;
-x_3 : BOOLEAN;
-x_4 : BOOLEAN;
-x_5 : BOOLEAN;
-x_6 : BOOLEAN;
-x_7 : BOOLEAN;
-x_8 : BOOLEAN;
-x_9 : BOOLEAN;
-x_10 : BOOLEAN;
-x_11 : BOOLEAN;
-x_12 : BOOLEAN;
-x_13 : BOOLEAN;
-x_14 : BOOLEAN;
-x_15 : BOOLEAN;
-x_16 : BOOLEAN;
-x_17 : BOOLEAN;
-x_18 : BOOLEAN;
-x_19 : BOOLEAN;
-x_20 : BOOLEAN;
-ASSERT NOT x_9 OR x_3 OR NOT x_15;
-ASSERT NOT x_12 OR NOT x_4 OR NOT x_15;
-ASSERT x_6 OR x_14 OR NOT x_17;
-ASSERT x_10 OR x_16 OR x_11;
-ASSERT NOT x_15 OR x_20 OR NOT x_7;
-ASSERT NOT x_1 OR x_10 OR x_16;
-ASSERT x_13 OR x_17 OR NOT x_7;
-ASSERT NOT x_2 OR NOT x_14 OR NOT x_13;
-ASSERT x_13 OR NOT x_6 OR x_15;
-ASSERT NOT x_9 OR x_3 OR x_16;
-ASSERT NOT x_20 OR NOT x_13 OR x_4;
-ASSERT NOT x_7 OR x_15 OR NOT x_14;
-ASSERT NOT x_15 OR NOT x_16 OR x_6;
-ASSERT x_5 OR NOT x_18 OR x_20;
-ASSERT NOT x_16 OR NOT x_19 OR x_7;
-ASSERT x_20 OR NOT x_18 OR NOT x_2;
-ASSERT x_10 OR NOT x_19 OR NOT x_14;
-ASSERT x_16 OR NOT x_7 OR x_12;
-ASSERT x_6 OR NOT x_5 OR NOT x_1;
-ASSERT NOT x_9 OR x_11 OR x_15;
-ASSERT x_19 OR NOT x_6 OR x_7;
-ASSERT NOT x_11 OR x_17 OR NOT x_19;
-ASSERT x_9 OR NOT x_16 OR x_6;
-ASSERT x_15 OR NOT x_20 OR x_10;
-ASSERT x_9 OR NOT x_1 OR NOT x_11;
-ASSERT NOT x_8 OR NOT x_19 OR x_5;
-ASSERT NOT x_19 OR x_11 OR x_20;
-ASSERT NOT x_12 OR x_13 OR NOT x_3;
-ASSERT NOT x_7 OR NOT x_17 OR NOT x_19;
-ASSERT x_17 OR x_6 OR NOT x_11;
-ASSERT NOT x_7 OR NOT x_17 OR x_10;
-ASSERT NOT x_14 OR x_9 OR x_20;
-ASSERT x_1 OR NOT x_18 OR NOT x_16;
-ASSERT NOT x_2 OR NOT x_15 OR x_20;
-ASSERT x_14 OR x_18 OR NOT x_1;
-ASSERT NOT x_8 OR NOT x_4 OR x_1;
-ASSERT x_13 OR x_3 OR NOT x_9;
-ASSERT x_5 OR x_7 OR x_8;
-ASSERT x_9 OR x_4 OR NOT x_20;
-ASSERT NOT x_18 OR NOT x_15 OR NOT x_10;
-ASSERT x_10 OR x_3 OR NOT x_20;
-ASSERT x_20 OR NOT x_14 OR x_16;
-ASSERT x_20 OR NOT x_3 OR NOT x_11;
-ASSERT NOT x_12 OR x_19 OR NOT x_16;
-ASSERT NOT x_3 OR x_5 OR x_10;
-ASSERT x_8 OR x_13 OR NOT x_7;
-ASSERT NOT x_2 OR NOT x_15 OR x_10;
-ASSERT NOT x_3 OR x_9 OR x_16;
-ASSERT NOT x_12 OR NOT x_16 OR NOT x_18;
-ASSERT x_3 OR x_1 OR NOT x_12;
-ASSERT NOT x_18 OR x_13 OR x_5;
-ASSERT x_1 OR x_3 OR NOT x_19;
-ASSERT NOT x_19 OR NOT x_5 OR x_6;
-ASSERT NOT x_20 OR x_8 OR NOT x_2;
-ASSERT x_17 OR NOT x_8 OR NOT x_13;
-ASSERT x_7 OR NOT x_11 OR NOT x_12;
-ASSERT NOT x_10 OR NOT x_14 OR NOT x_20;
-ASSERT NOT x_1 OR x_16 OR NOT x_12;
-ASSERT x_5 OR NOT x_3 OR x_9;
-ASSERT NOT x_18 OR x_8 OR x_14;
-ASSERT x_1 OR x_16 OR x_12;
-ASSERT x_20 OR NOT x_1 OR NOT x_16;
-ASSERT x_5 OR x_10 OR NOT x_13;
-ASSERT x_9 OR NOT x_10 OR x_6;
-ASSERT NOT x_12 OR x_10 OR NOT x_14;
-ASSERT NOT x_13 OR x_1 OR x_4;
-ASSERT NOT x_20 OR NOT x_7 OR x_3;
-ASSERT x_12 OR x_1 OR NOT x_10;
-ASSERT NOT x_1 OR NOT x_16 OR x_7;
-ASSERT x_11 OR NOT x_6 OR NOT x_4;
-ASSERT x_1 OR x_16 OR NOT x_20;
-ASSERT x_9 OR x_7 OR x_15;
-ASSERT NOT x_6 OR x_17 OR x_10;
-ASSERT x_8 OR x_9 OR x_17;
-ASSERT x_18 OR x_11 OR x_10;
-ASSERT x_7 OR x_1 OR NOT x_8;
-ASSERT NOT x_5 OR NOT x_12 OR x_18;
-ASSERT NOT x_6 OR x_2 OR x_15;
-ASSERT x_2 OR x_18 OR x_1;
-ASSERT NOT x_7 OR NOT x_13 OR x_16;
-ASSERT x_18 OR x_19 OR x_9;
-ASSERT x_9 OR NOT x_14 OR x_18;
-ASSERT x_14 OR x_12 OR NOT x_5;
-ASSERT NOT x_13 OR NOT x_7 OR NOT x_14;
-ASSERT NOT x_1 OR x_8 OR NOT x_16;
-ASSERT NOT x_11 OR x_4 OR x_7;
-ASSERT NOT x_4 OR x_20 OR x_5;
-ASSERT NOT x_5 OR x_2 OR x_12;
-ASSERT NOT x_5 OR x_13 OR NOT x_18;
-ASSERT NOT x_18 OR x_9 OR x_1;
-ASSERT x_10 OR NOT x_11 OR x_16;
-
-
-QUERY FALSE;
diff --git a/test/regress/regress0/uf20-03.cvc.smt2 b/test/regress/regress0/uf20-03.cvc.smt2
new file mode 100644
index 000000000..02a6e0376
--- /dev/null
+++ b/test/regress/regress0/uf20-03.cvc.smt2
@@ -0,0 +1,115 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x_1 () Bool)
+(declare-fun x_2 () Bool)
+(declare-fun x_3 () Bool)
+(declare-fun x_4 () Bool)
+(declare-fun x_5 () Bool)
+(declare-fun x_6 () Bool)
+(declare-fun x_7 () Bool)
+(declare-fun x_8 () Bool)
+(declare-fun x_9 () Bool)
+(declare-fun x_10 () Bool)
+(declare-fun x_11 () Bool)
+(declare-fun x_12 () Bool)
+(declare-fun x_13 () Bool)
+(declare-fun x_14 () Bool)
+(declare-fun x_15 () Bool)
+(declare-fun x_16 () Bool)
+(declare-fun x_17 () Bool)
+(declare-fun x_18 () Bool)
+(declare-fun x_19 () Bool)
+(declare-fun x_20 () Bool)
+(assert (or (or (not x_9) x_3) (not x_15)))
+(assert (or (or (not x_12) (not x_4)) (not x_15)))
+(assert (or (or x_6 x_14) (not x_17)))
+(assert (or (or x_10 x_16) x_11))
+(assert (or (or (not x_15) x_20) (not x_7)))
+(assert (or (or (not x_1) x_10) x_16))
+(assert (or (or x_13 x_17) (not x_7)))
+(assert (or (or (not x_2) (not x_14)) (not x_13)))
+(assert (or (or x_13 (not x_6)) x_15))
+(assert (or (or (not x_9) x_3) x_16))
+(assert (or (or (not x_20) (not x_13)) x_4))
+(assert (or (or (not x_7) x_15) (not x_14)))
+(assert (or (or (not x_15) (not x_16)) x_6))
+(assert (or (or x_5 (not x_18)) x_20))
+(assert (or (or (not x_16) (not x_19)) x_7))
+(assert (or (or x_20 (not x_18)) (not x_2)))
+(assert (or (or x_10 (not x_19)) (not x_14)))
+(assert (or (or x_16 (not x_7)) x_12))
+(assert (or (or x_6 (not x_5)) (not x_1)))
+(assert (or (or (not x_9) x_11) x_15))
+(assert (or (or x_19 (not x_6)) x_7))
+(assert (or (or (not x_11) x_17) (not x_19)))
+(assert (or (or x_9 (not x_16)) x_6))
+(assert (or (or x_15 (not x_20)) x_10))
+(assert (or (or x_9 (not x_1)) (not x_11)))
+(assert (or (or (not x_8) (not x_19)) x_5))
+(assert (or (or (not x_19) x_11) x_20))
+(assert (or (or (not x_12) x_13) (not x_3)))
+(assert (or (or (not x_7) (not x_17)) (not x_19)))
+(assert (or (or x_17 x_6) (not x_11)))
+(assert (or (or (not x_7) (not x_17)) x_10))
+(assert (or (or (not x_14) x_9) x_20))
+(assert (or (or x_1 (not x_18)) (not x_16)))
+(assert (or (or (not x_2) (not x_15)) x_20))
+(assert (or (or x_14 x_18) (not x_1)))
+(assert (or (or (not x_8) (not x_4)) x_1))
+(assert (or (or x_13 x_3) (not x_9)))
+(assert (or (or x_5 x_7) x_8))
+(assert (or (or x_9 x_4) (not x_20)))
+(assert (or (or (not x_18) (not x_15)) (not x_10)))
+(assert (or (or x_10 x_3) (not x_20)))
+(assert (or (or x_20 (not x_14)) x_16))
+(assert (or (or x_20 (not x_3)) (not x_11)))
+(assert (or (or (not x_12) x_19) (not x_16)))
+(assert (or (or (not x_3) x_5) x_10))
+(assert (or (or x_8 x_13) (not x_7)))
+(assert (or (or (not x_2) (not x_15)) x_10))
+(assert (or (or (not x_3) x_9) x_16))
+(assert (or (or (not x_12) (not x_16)) (not x_18)))
+(assert (or (or x_3 x_1) (not x_12)))
+(assert (or (or (not x_18) x_13) x_5))
+(assert (or (or x_1 x_3) (not x_19)))
+(assert (or (or (not x_19) (not x_5)) x_6))
+(assert (or (or (not x_20) x_8) (not x_2)))
+(assert (or (or x_17 (not x_8)) (not x_13)))
+(assert (or (or x_7 (not x_11)) (not x_12)))
+(assert (or (or (not x_10) (not x_14)) (not x_20)))
+(assert (or (or (not x_1) x_16) (not x_12)))
+(assert (or (or x_5 (not x_3)) x_9))
+(assert (or (or (not x_18) x_8) x_14))
+(assert (or (or x_1 x_16) x_12))
+(assert (or (or x_20 (not x_1)) (not x_16)))
+(assert (or (or x_5 x_10) (not x_13)))
+(assert (or (or x_9 (not x_10)) x_6))
+(assert (or (or (not x_12) x_10) (not x_14)))
+(assert (or (or (not x_13) x_1) x_4))
+(assert (or (or (not x_20) (not x_7)) x_3))
+(assert (or (or x_12 x_1) (not x_10)))
+(assert (or (or (not x_1) (not x_16)) x_7))
+(assert (or (or x_11 (not x_6)) (not x_4)))
+(assert (or (or x_1 x_16) (not x_20)))
+(assert (or (or x_9 x_7) x_15))
+(assert (or (or (not x_6) x_17) x_10))
+(assert (or (or x_8 x_9) x_17))
+(assert (or (or x_18 x_11) x_10))
+(assert (or (or x_7 x_1) (not x_8)))
+(assert (or (or (not x_5) (not x_12)) x_18))
+(assert (or (or (not x_6) x_2) x_15))
+(assert (or (or x_2 x_18) x_1))
+(assert (or (or (not x_7) (not x_13)) x_16))
+(assert (or (or x_18 x_19) x_9))
+(assert (or (or x_9 (not x_14)) x_18))
+(assert (or (or x_14 x_12) (not x_5)))
+(assert (or (or (not x_13) (not x_7)) (not x_14)))
+(assert (or (or (not x_1) x_8) (not x_16)))
+(assert (or (or (not x_11) x_4) x_7))
+(assert (or (or (not x_4) x_20) x_5))
+(assert (or (or (not x_5) x_2) x_12))
+(assert (or (or (not x_5) x_13) (not x_18)))
+(assert (or (or (not x_18) x_9) x_1))
+(assert (or (or x_10 (not x_11)) x_16))
+(check-sat)
diff --git a/test/regress/regress0/uflra/bug293.cvc b/test/regress/regress0/uflra/bug293.cvc
deleted file mode 100644
index 6da025fbd..000000000
--- a/test/regress/regress0/uflra/bug293.cvc
+++ /dev/null
@@ -1,7 +0,0 @@
-% EXPECT: unsat
-x: REAL;
-f: REAL -> REAL;
-ASSERT NOT (f(1) = f(x));
-ASSERT NOT (f(0) = f(x));
-ASSERT (x = 0) XOR (x = 1);
-CHECKSAT; \ No newline at end of file
diff --git a/test/regress/regress0/uflra/bug293.cvc.smt2 b/test/regress/regress0/uflra/bug293.cvc.smt2
new file mode 100644
index 000000000..c3070ed06
--- /dev/null
+++ b/test/regress/regress0/uflra/bug293.cvc.smt2
@@ -0,0 +1,9 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun f (Real) Real)
+(assert (not (= (f 1) (f x))))
+(assert (not (= (f 0) (f x))))
+(assert (xor (= x 0) (= x 1)))
+(check-sat)
diff --git a/test/regress/regress0/uflra/simple.01.cvc b/test/regress/regress0/uflra/simple.01.cvc
deleted file mode 100644
index 62e48290e..000000000
--- a/test/regress/regress0/uflra/simple.01.cvc
+++ /dev/null
@@ -1,5 +0,0 @@
-% EXPECT: sat
-x, y: REAL;
-f: REAL -> REAL;
-
-CHECKSAT NOT (f(x) = f(y)); \ No newline at end of file
diff --git a/test/regress/regress0/uflra/simple.01.cvc.smt2 b/test/regress/regress0/uflra/simple.01.cvc.smt2
new file mode 100644
index 000000000..44c1944c0
--- /dev/null
+++ b/test/regress/regress0/uflra/simple.01.cvc.smt2
@@ -0,0 +1,14 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental true)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(declare-fun f (Real) Real)
+(push 1)
+
+(assert (not (= (f x) (f y))))
+
+(check-sat)
+
+(pop 1)
+
diff --git a/test/regress/regress0/uflra/simple.02.cvc b/test/regress/regress0/uflra/simple.02.cvc
deleted file mode 100644
index 8bc20f36a..000000000
--- a/test/regress/regress0/uflra/simple.02.cvc
+++ /dev/null
@@ -1,9 +0,0 @@
-% EXPECT: unsat
-x, y: REAL;
-f: REAL -> REAL;
-
-ASSERT (x <= y);
-ASSERT (y <= x);
-ASSERT NOT (f(x) = f(y));
-
-CHECKSAT; \ No newline at end of file
diff --git a/test/regress/regress0/uflra/simple.02.cvc.smt2 b/test/regress/regress0/uflra/simple.02.cvc.smt2
new file mode 100644
index 000000000..a71b7f634
--- /dev/null
+++ b/test/regress/regress0/uflra/simple.02.cvc.smt2
@@ -0,0 +1,10 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x () Real)
+(declare-fun y () Real)
+(declare-fun f (Real) Real)
+(assert (<= x y))
+(assert (<= y x))
+(assert (not (= (f x) (f y))))
+(check-sat)
diff --git a/test/regress/regress0/uflra/simple.03.cvc b/test/regress/regress0/uflra/simple.03.cvc
deleted file mode 100644
index 2ecf9b0a8..000000000
--- a/test/regress/regress0/uflra/simple.03.cvc
+++ /dev/null
@@ -1,11 +0,0 @@
-% EXPECT: sat
-x1, y1, z1: REAL;
-x2, y2, z2: REAL;
-f: REAL -> REAL;
-g: (REAL, REAL) -> REAL;
-
-ASSERT (z1 = f(x1));
-ASSERT (z2 = f(y1));
-ASSERT NOT (g(z1, z2) = g(z2, y2));
-
-CHECKSAT; \ No newline at end of file
diff --git a/test/regress/regress0/uflra/simple.03.cvc.smt2 b/test/regress/regress0/uflra/simple.03.cvc.smt2
new file mode 100644
index 000000000..1a61a1dc5
--- /dev/null
+++ b/test/regress/regress0/uflra/simple.03.cvc.smt2
@@ -0,0 +1,15 @@
+; EXPECT: sat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x1 () Real)
+(declare-fun y1 () Real)
+(declare-fun z1 () Real)
+(declare-fun x2 () Real)
+(declare-fun y2 () Real)
+(declare-fun z2 () Real)
+(declare-fun f (Real) Real)
+(declare-fun g (Real Real) Real)
+(assert (= z1 (f x1)))
+(assert (= z2 (f y1)))
+(assert (not (= (g z1 z2) (g z2 y2))))
+(check-sat)
diff --git a/test/regress/regress0/uflra/simple.04.cvc b/test/regress/regress0/uflra/simple.04.cvc
deleted file mode 100644
index e363a9606..000000000
--- a/test/regress/regress0/uflra/simple.04.cvc
+++ /dev/null
@@ -1,14 +0,0 @@
-% EXPECT: unsat
-x1, x2: REAL;
-y1, y2: REAL;
-f: REAL -> REAL;
-g: (REAL, REAL) -> REAL;
-
-ASSERT (x1 <= x2) AND (x2 <= x1);
-
-ASSERT NOT (g(x1, y1) = g(x2, y2));
-
-ASSERT (y1 <= f(x1)) AND (f(x1) <= y1);
-ASSERT (y2 <= f(x2)) AND (f(x2) <= y2);
-
-CHECKSAT; \ No newline at end of file
diff --git a/test/regress/regress0/uflra/simple.04.cvc.smt2 b/test/regress/regress0/uflra/simple.04.cvc.smt2
new file mode 100644
index 000000000..527746881
--- /dev/null
+++ b/test/regress/regress0/uflra/simple.04.cvc.smt2
@@ -0,0 +1,14 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun x1 () Real)
+(declare-fun x2 () Real)
+(declare-fun y1 () Real)
+(declare-fun y2 () Real)
+(declare-fun f (Real) Real)
+(declare-fun g (Real Real) Real)
+(assert (and (<= x1 x2) (<= x2 x1)))
+(assert (not (= (g x1 y1) (g x2 y2))))
+(assert (let ((_let_1 (f x1))) (and (<= y1 _let_1) (<= _let_1 y1))))
+(assert (let ((_let_1 (f x2))) (and (<= y2 _let_1) (<= _let_1 y2))))
+(check-sat)
diff --git a/test/regress/regress0/wiki.01.cvc b/test/regress/regress0/wiki.01.cvc
deleted file mode 100644
index 1516503ff..000000000
--- a/test/regress/regress0/wiki.01.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR (b OR c) <=> (a OR b) OR c;
diff --git a/test/regress/regress0/wiki.01.cvc.smt2 b/test/regress/regress0/wiki.01.cvc.smt2
new file mode 100644
index 000000000..0779ee157
--- /dev/null
+++ b/test/regress/regress0/wiki.01.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (or a (or b c)) (or (or a b) c))) ))
diff --git a/test/regress/regress0/wiki.02.cvc b/test/regress/regress0/wiki.02.cvc
deleted file mode 100644
index ebeadee14..000000000
--- a/test/regress/regress0/wiki.02.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND (b AND c) <=> (a AND b) AND c;
diff --git a/test/regress/regress0/wiki.02.cvc.smt2 b/test/regress/regress0/wiki.02.cvc.smt2
new file mode 100644
index 000000000..8f1da7149
--- /dev/null
+++ b/test/regress/regress0/wiki.02.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a (and b c)) (and (and a b) c))) ))
diff --git a/test/regress/regress0/wiki.03.cvc b/test/regress/regress0/wiki.03.cvc
deleted file mode 100644
index ca0e6a8d1..000000000
--- a/test/regress/regress0/wiki.03.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR b <=> b OR a;
diff --git a/test/regress/regress0/wiki.03.cvc.smt2 b/test/regress/regress0/wiki.03.cvc.smt2
new file mode 100644
index 000000000..32246fd53
--- /dev/null
+++ b/test/regress/regress0/wiki.03.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (or a b) (or b a))) ))
diff --git a/test/regress/regress0/wiki.04.cvc b/test/regress/regress0/wiki.04.cvc
deleted file mode 100644
index 75fe17238..000000000
--- a/test/regress/regress0/wiki.04.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND b <=> b AND a;
diff --git a/test/regress/regress0/wiki.04.cvc.smt2 b/test/regress/regress0/wiki.04.cvc.smt2
new file mode 100644
index 000000000..05932da95
--- /dev/null
+++ b/test/regress/regress0/wiki.04.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a b) (and b a))) ))
diff --git a/test/regress/regress0/wiki.05.cvc b/test/regress/regress0/wiki.05.cvc
deleted file mode 100644
index 2f87e4ca0..000000000
--- a/test/regress/regress0/wiki.05.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR (a AND b) <=> a;
diff --git a/test/regress/regress0/wiki.05.cvc.smt2 b/test/regress/regress0/wiki.05.cvc.smt2
new file mode 100644
index 000000000..cff467739
--- /dev/null
+++ b/test/regress/regress0/wiki.05.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (or a (and a b)) a)) ))
diff --git a/test/regress/regress0/wiki.06.cvc b/test/regress/regress0/wiki.06.cvc
deleted file mode 100644
index a4075bda3..000000000
--- a/test/regress/regress0/wiki.06.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND (a OR b) <=> a;
diff --git a/test/regress/regress0/wiki.06.cvc.smt2 b/test/regress/regress0/wiki.06.cvc.smt2
new file mode 100644
index 000000000..00754c96d
--- /dev/null
+++ b/test/regress/regress0/wiki.06.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a (or a b)) a)) ))
diff --git a/test/regress/regress0/wiki.07.cvc b/test/regress/regress0/wiki.07.cvc
deleted file mode 100644
index 3b4527bdc..000000000
--- a/test/regress/regress0/wiki.07.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR (b AND c) <=> (a OR b) AND (a OR c);
diff --git a/test/regress/regress0/wiki.07.cvc.smt2 b/test/regress/regress0/wiki.07.cvc.smt2
new file mode 100644
index 000000000..b3f0d6903
--- /dev/null
+++ b/test/regress/regress0/wiki.07.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (or a (and b c)) (and (or a b) (or a c)))) ))
diff --git a/test/regress/regress0/wiki.08.cvc b/test/regress/regress0/wiki.08.cvc
deleted file mode 100644
index e15a21412..000000000
--- a/test/regress/regress0/wiki.08.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND (b OR c) <=> (a AND b) OR (a AND c);
diff --git a/test/regress/regress0/wiki.08.cvc.smt2 b/test/regress/regress0/wiki.08.cvc.smt2
new file mode 100644
index 000000000..bc1aa547a
--- /dev/null
+++ b/test/regress/regress0/wiki.08.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a (or b c)) (or (and a b) (and a c)))) ))
diff --git a/test/regress/regress0/wiki.09.cvc b/test/regress/regress0/wiki.09.cvc
deleted file mode 100644
index 5bc5faca5..000000000
--- a/test/regress/regress0/wiki.09.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR NOT a;
diff --git a/test/regress/regress0/wiki.09.cvc.smt2 b/test/regress/regress0/wiki.09.cvc.smt2
new file mode 100644
index 000000000..5eefff2a2
--- /dev/null
+++ b/test/regress/regress0/wiki.09.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (or a (not a))) ))
diff --git a/test/regress/regress0/wiki.10.cvc b/test/regress/regress0/wiki.10.cvc
deleted file mode 100644
index 613022e84..000000000
--- a/test/regress/regress0/wiki.10.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND NOT a <=> FALSE;
diff --git a/test/regress/regress0/wiki.10.cvc.smt2 b/test/regress/regress0/wiki.10.cvc.smt2
new file mode 100644
index 000000000..09d1d23eb
--- /dev/null
+++ b/test/regress/regress0/wiki.10.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a (not a)) false)) ))
diff --git a/test/regress/regress0/wiki.11.cvc b/test/regress/regress0/wiki.11.cvc
deleted file mode 100644
index 8debef9cd..000000000
--- a/test/regress/regress0/wiki.11.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR a <=> a;
diff --git a/test/regress/regress0/wiki.11.cvc.smt2 b/test/regress/regress0/wiki.11.cvc.smt2
new file mode 100644
index 000000000..5014d3302
--- /dev/null
+++ b/test/regress/regress0/wiki.11.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (or a a) a)) ))
diff --git a/test/regress/regress0/wiki.12.cvc b/test/regress/regress0/wiki.12.cvc
deleted file mode 100644
index 2274fc78e..000000000
--- a/test/regress/regress0/wiki.12.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND a <=> a;
diff --git a/test/regress/regress0/wiki.12.cvc.smt2 b/test/regress/regress0/wiki.12.cvc.smt2
new file mode 100644
index 000000000..e7dce70a7
--- /dev/null
+++ b/test/regress/regress0/wiki.12.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a a) a)) ))
diff --git a/test/regress/regress0/wiki.13.cvc b/test/regress/regress0/wiki.13.cvc
deleted file mode 100644
index 80b95802d..000000000
--- a/test/regress/regress0/wiki.13.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR FALSE <=> a;
diff --git a/test/regress/regress0/wiki.13.cvc.smt2 b/test/regress/regress0/wiki.13.cvc.smt2
new file mode 100644
index 000000000..ffde69fa9
--- /dev/null
+++ b/test/regress/regress0/wiki.13.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (or a false) a)) ))
diff --git a/test/regress/regress0/wiki.14.cvc b/test/regress/regress0/wiki.14.cvc
deleted file mode 100644
index 7b8a14edb..000000000
--- a/test/regress/regress0/wiki.14.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND TRUE <=> a;
diff --git a/test/regress/regress0/wiki.14.cvc.smt2 b/test/regress/regress0/wiki.14.cvc.smt2
new file mode 100644
index 000000000..6eaf67527
--- /dev/null
+++ b/test/regress/regress0/wiki.14.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a true) a)) ))
diff --git a/test/regress/regress0/wiki.15.cvc b/test/regress/regress0/wiki.15.cvc
deleted file mode 100644
index dfb4f13fc..000000000
--- a/test/regress/regress0/wiki.15.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a OR TRUE <=> TRUE;
diff --git a/test/regress/regress0/wiki.15.cvc.smt2 b/test/regress/regress0/wiki.15.cvc.smt2
new file mode 100644
index 000000000..1b67373a9
--- /dev/null
+++ b/test/regress/regress0/wiki.15.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (or a true) true)) ))
diff --git a/test/regress/regress0/wiki.16.cvc b/test/regress/regress0/wiki.16.cvc
deleted file mode 100644
index 9c69baa52..000000000
--- a/test/regress/regress0/wiki.16.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY a AND FALSE <=> FALSE;
diff --git a/test/regress/regress0/wiki.16.cvc.smt2 b/test/regress/regress0/wiki.16.cvc.smt2
new file mode 100644
index 000000000..df55e5183
--- /dev/null
+++ b/test/regress/regress0/wiki.16.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (and a false) false)) ))
diff --git a/test/regress/regress0/wiki.17.cvc b/test/regress/regress0/wiki.17.cvc
deleted file mode 100644
index c58160bb9..000000000
--- a/test/regress/regress0/wiki.17.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY NOT FALSE <=> TRUE;
diff --git a/test/regress/regress0/wiki.17.cvc.smt2 b/test/regress/regress0/wiki.17.cvc.smt2
new file mode 100644
index 000000000..1495f8de4
--- /dev/null
+++ b/test/regress/regress0/wiki.17.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (not false) true)) ))
diff --git a/test/regress/regress0/wiki.18.cvc b/test/regress/regress0/wiki.18.cvc
deleted file mode 100644
index 17773b899..000000000
--- a/test/regress/regress0/wiki.18.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY NOT TRUE <=> FALSE;
diff --git a/test/regress/regress0/wiki.18.cvc.smt2 b/test/regress/regress0/wiki.18.cvc.smt2
new file mode 100644
index 000000000..751d82e66
--- /dev/null
+++ b/test/regress/regress0/wiki.18.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (not true) false)) ))
diff --git a/test/regress/regress0/wiki.19.cvc b/test/regress/regress0/wiki.19.cvc
deleted file mode 100644
index 46b6fc02e..000000000
--- a/test/regress/regress0/wiki.19.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY NOT (a OR b) <=> NOT a AND NOT b;
diff --git a/test/regress/regress0/wiki.19.cvc.smt2 b/test/regress/regress0/wiki.19.cvc.smt2
new file mode 100644
index 000000000..9fdd70b11
--- /dev/null
+++ b/test/regress/regress0/wiki.19.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (not (or a b)) (and (not a) (not b)))) ))
diff --git a/test/regress/regress0/wiki.20.cvc b/test/regress/regress0/wiki.20.cvc
deleted file mode 100644
index 42e114010..000000000
--- a/test/regress/regress0/wiki.20.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY NOT (a AND b) <=> NOT a OR NOT b;
diff --git a/test/regress/regress0/wiki.20.cvc.smt2 b/test/regress/regress0/wiki.20.cvc.smt2
new file mode 100644
index 000000000..f4c9eec23
--- /dev/null
+++ b/test/regress/regress0/wiki.20.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (not (and a b)) (or (not a) (not b)))) ))
diff --git a/test/regress/regress0/wiki.21.cvc b/test/regress/regress0/wiki.21.cvc
deleted file mode 100644
index bcc69beea..000000000
--- a/test/regress/regress0/wiki.21.cvc
+++ /dev/null
@@ -1,4 +0,0 @@
-a, b, c : BOOLEAN;
-
-% EXPECT: entailed
-QUERY NOT NOT a <=> a;
diff --git a/test/regress/regress0/wiki.21.cvc.smt2 b/test/regress/regress0/wiki.21.cvc.smt2
new file mode 100644
index 000000000..2465b6c52
--- /dev/null
+++ b/test/regress/regress0/wiki.21.cvc.smt2
@@ -0,0 +1,7 @@
+; EXPECT: unsat
+(set-logic ALL)
+(set-option :incremental false)
+(declare-fun a () Bool)
+(declare-fun b () Bool)
+(declare-fun c () Bool)
+(check-sat-assuming ( (not (= (not (not a)) a)) ))
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback