From 396ea03ff9b47cfff23c199cb0caa3ff42ab371f Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Fri, 3 May 2024 15:12:52 +0200
Subject: [PATCH] Message formatting: some more space for results

---
 compiler/catala_utils/message.ml              |  2 +-
 tests/arithmetic/good/priorities.catala_en    | 12 +--
 tests/arithmetic/good/rounding.catala_en      |  2 +-
 tests/arithmetic/good/trivial.catala_en       |  6 +-
 tests/array/good/aggregation.catala_en        | 14 ++--
 tests/array/good/aggregation_2.catala_en      | 18 ++---
 tests/array/good/aggregation_3.catala_en      |  6 +-
 tests/array/good/concatenation.catala_en      |  8 +-
 tests/array/good/filter.catala_en             |  8 +-
 tests/array/good/filter_map.catala_en         | 10 +--
 tests/array/good/fold.catala_en               | 18 ++---
 tests/array/good/map.catala_en                |  8 +-
 tests/array/good/simple.catala_en             | 14 ++--
 tests/array/good/simpler.catala_en            |  8 +-
 tests/array/good/simplest.catala_en           |  6 +-
 tests/bool/good/test_bool.catala_en           |  8 +-
 tests/bool/good/test_precedence.catala_en     |  6 +-
 tests/bool/good/test_xor.catala_en            | 12 +--
 tests/date/good/durations.catala_en           | 18 ++---
 tests/date/good/rounding_option_en.catala_en  |  6 +-
 tests/date/good/rounding_option_fr.catala_fr  |  6 +-
 tests/date/good/simple.catala_en              | 10 +--
 tests/dec/good/infinite_precision.catala_en   | 14 ++--
 tests/dec/good/rounding.catala_en             | 12 +--
 tests/dec/good/simple.catala_en               | 12 +--
 tests/dec/good/zero_after_comma.catala_en     |  8 +-
 .../good/mutliple_definitions.catala_en       |  6 +-
 tests/enum/bad/useless_wildcard.catala_en     |  4 +-
 tests/enum/good/disambiguated_cases.catala_en | 10 +--
 tests/enum/good/quick_pattern_check.catala_en | 10 +--
 tests/enum/good/simple.catala_en              |  8 +-
 tests/enum/good/wildcard.catala_en            | 12 +--
 .../good/context_with_default.catala_en       |  6 +-
 .../good/double_definition.catala_en          |  4 +-
 .../exception/good/duplicate_labels.catala_en |  8 +-
 tests/exception/good/exception.catala_en      |  6 +-
 .../good/exceptions_squared.catala_en         |  6 +-
 .../good/grouped_exceptions.catala_en         |  8 +-
 .../good/groups_of_exceptions.catala_en       | 20 ++---
 .../good/same_label_two_variables.catala_en   | 10 +--
 .../good/split_unlabeled_exception.catala_en  |  6 +-
 .../two_exceptions_same_outcome.catala_en     |  6 +-
 .../good/two_unlabeled_exceptions.catala_en   |  8 +-
 .../good/unlabeled_exception.catala_en        |  6 +-
 .../unsorted_unlabeled_exceptions.catala_en   |  8 +-
 tests/func/bad/bad_func.catala_en             |  2 +-
 tests/func/good/closure_conversion.catala_en  |  4 +-
 .../good/closure_conversion_reduce.catala_en  |  4 +-
 tests/func/good/closure_return.catala_en      |  4 +-
 .../func/good/closure_through_scope.catala_en |  6 +-
 tests/func/good/context_func.catala_en        |  4 +-
 tests/func/good/func.catala_en                |  6 +-
 tests/func/good/param_consistency.catala_en   | 12 +--
 .../scope_call_func_struct_closure.catala_en  |  6 +-
 tests/io/good/all_io.catala_en                |  6 +-
 tests/io/good/condition_only_input.catala_en  |  6 +-
 tests/io/good/subscope.catala_en              |  6 +-
 .../good/test_grave_char_en.catala_en         | 16 ++--
 .../good/test_grave_char_fr.catala_fr         |  6 +-
 .../good/test_grave_char_pl.catala_pl         |  2 +-
 .../good/test_markup_refactoring.catala_en    |  8 +-
 tests/modules/good/external_use.catala_en     |  4 +-
 tests/modules/good/mod_def.catala_en          |  6 +-
 tests/modules/good/mod_def_context.catala_en  | 32 ++++----
 tests/modules/good/mod_middle.catala_en       |  6 +-
 tests/modules/good/mod_use.catala_en          | 12 +--
 tests/modules/good/mod_use2.catala_en         | 18 ++---
 tests/modules/good/mod_use3.catala_en         | 10 +--
 tests/modules/good/mod_use_context.catala_en  | 56 +++++++-------
 tests/modules/good/prorata_syntax.catala_en   | 40 +++++-----
 tests/money/good/literal_parsing.catala_en    |  8 +-
 tests/money/good/simple.catala_en             | 10 +--
 tests/name_resolution/good/let_in.catala_en   | 10 +--
 tests/name_resolution/good/let_in2.catala_en  |  6 +-
 .../good/out_of_order.catala_en               |  8 +-
 .../good/toplevel_defs.catala_en              | 14 ++--
 .../good/toplevel_defs_simple.catala_en       |  6 +-
 tests/proof/good/array_length.catala_en       |  6 +-
 tests/proof/good/assert.catala_en             |  6 +-
 tests/proof/good/dates_get_year.catala_en     |  6 +-
 tests/proof/good/dates_simple.catala_en       |  6 +-
 tests/proof/good/direct_scope_call.catala_en  |  6 +-
 .../direct_scope_call_with_context.catala_en  |  6 +-
 tests/proof/good/duration.catala_en           |  6 +-
 tests/proof/good/enums-arith.catala_en        |  6 +-
 tests/proof/good/enums-nonbool.catala_en      |  6 +-
 tests/proof/good/enums.catala_en              |  6 +-
 tests/proof/good/enums_inj.catala_en          |  6 +-
 tests/proof/good/enums_unit.catala_en         |  6 +-
 tests/proof/good/functions.catala_en          |  6 +-
 tests/proof/good/let_in_condition.catala_en   |  6 +-
 tests/proof/good/money.catala_en              |  6 +-
 tests/proof/good/no_vars.catala_en            |  6 +-
 tests/proof/good/rationals.catala_en          |  6 +-
 tests/proof/good/simple_vars.catala_en        |  6 +-
 tests/proof/good/structs.catala_en            |  6 +-
 .../191_fix_record_name_confusion.catala_en   |  4 +-
 .../scope/good/grand_parent_caller.catala_en  | 14 ++--
 .../good/local-capture-subscope.catala_en     |  2 +-
 tests/scope/good/nothing.catala_en            |  4 +-
 tests/scope/good/out_sub_scope.catala_en      |  4 +-
 tests/scope/good/scope_call.catala_en         |  6 +-
 tests/scope/good/scope_call2.catala_en        |  8 +-
 tests/scope/good/scope_call3.catala_en        | 52 ++++++-------
 tests/scope/good/scope_call4.catala_en        | 36 ++++-----
 tests/scope/good/scope_struct.catala_en       |  6 +-
 tests/scope/good/simple.catala_en             |  4 +-
 tests/scope/good/sub_scope.catala_en          | 14 ++--
 tests/scope/good/sub_sub_scope.catala_en      | 12 +--
 ...ubscope_function_arg_not_defined.catala_en |  6 +-
 ...bscope_function_arg_not_defined2.catala_en |  6 +-
 tests/struct/good/ambiguous_fields.catala_en  |  6 +-
 tests/struct/good/nested3.catala_en           | 10 +--
 tests/struct/good/same_name_fields.catala_en  |  8 +-
 tests/struct/good/simple.catala_en            |  8 +-
 tests/struct/good/struct_update.catala_en     | 10 +--
 tests/tuples/good/tuples.catala_en            |  6 +-
 tests/tuples/good/tuplists.catala_en          | 74 +++++++++----------
 tests/typing/good/common.catala_en            |  6 +-
 tests/typing/good/overload.catala_en          | 16 ++--
 tests/variable_state/good/simple.catala_en    |  6 +-
 .../good/state_access.catala_en               |  4 +-
 tests/variable_state/good/subscope.catala_en  |  8 +-
 123 files changed, 601 insertions(+), 601 deletions(-)

diff --git a/compiler/catala_utils/message.ml b/compiler/catala_utils/message.ml
index fa6d1b12b..3dfd400aa 100644
--- a/compiler/catala_utils/message.ml
+++ b/compiler/catala_utils/message.ml
@@ -244,7 +244,7 @@ module Content = struct
           Format.pp_close_box ppf ();
           not islast)
       | Outcome msg ->
-        Format.fprintf ppf "@,@[<hov 2>%t@]" msg;
+        Format.fprintf ppf "@;<0 1>@[<v 1>@[<hov 2>%t@]@]" msg;
         true
       | Suggestion suggestions_list ->
         Format.fprintf ppf "@,@[<v 1>@,@[<hov 2>%a@]@]" Suggestions.format
diff --git a/tests/arithmetic/good/priorities.catala_en b/tests/arithmetic/good/priorities.catala_en
index 9e0014a9f..3a1e352d7 100644
--- a/tests/arithmetic/good/priorities.catala_en
+++ b/tests/arithmetic/good/priorities.catala_en
@@ -17,19 +17,19 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│w = 0
-│x = 4
-│y = 4
-│z = 390.0
+│ w = 0
+│ x = 4
+│ y = 4
+│ z = 390.0
 └─
 ```
diff --git a/tests/arithmetic/good/rounding.catala_en b/tests/arithmetic/good/rounding.catala_en
index a0ff83840..5f1c9c0a3 100644
--- a/tests/arithmetic/good/rounding.catala_en
+++ b/tests/arithmetic/good/rounding.catala_en
@@ -47,6 +47,6 @@ scope A:
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│o = false
+│ o = false
 └─
 ```
diff --git a/tests/arithmetic/good/trivial.catala_en b/tests/arithmetic/good/trivial.catala_en
index 291349965..cf2d0948a 100644
--- a/tests/arithmetic/good/trivial.catala_en
+++ b/tests/arithmetic/good/trivial.catala_en
@@ -11,16 +11,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│w = 6
+│ w = 6
 └─
 ```
diff --git a/tests/array/good/aggregation.catala_en b/tests/array/good/aggregation.catala_en
index ac27e18e7..62bbc2895 100644
--- a/tests/array/good/aggregation.catala_en
+++ b/tests/array/good/aggregation.catala_en
@@ -28,26 +28,26 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = [$0.00; $9.00; $5.20]
+│ x = [$0.00; $9.00; $5.20]
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│max = $18.00
-│min = $5.00
-│y = $17.20
-│z = 1
+│ max = $18.00
+│ min = $5.00
+│ y = $17.20
+│ z = 1
 └─
 ```
diff --git a/tests/array/good/aggregation_2.catala_en b/tests/array/good/aggregation_2.catala_en
index 384a4d9e9..54e7572af 100644
--- a/tests/array/good/aggregation_2.catala_en
+++ b/tests/array/good/aggregation_2.catala_en
@@ -34,28 +34,28 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x =
-│  [
-│    S { -- id: 0 -- income: $0.00 }; S { -- id: 1 -- income: $9.00 };
-│    S { -- id: 2 -- income: $5.20 }
-│  ]
+│ x =
+│   [
+│     S { -- id: 0 -- income: $0.00 }; S { -- id: 1 -- income: $9.00 };
+│     S { -- id: 2 -- income: $5.20 }
+│   ]
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│argmax = S { -- id: 1 -- income: $9.00 }
-│argmin = S { -- id: 0 -- income: $0.00 }
+│ argmax = S { -- id: 1 -- income: $9.00 }
+│ argmin = S { -- id: 0 -- income: $0.00 }
 └─
 ```
diff --git a/tests/array/good/aggregation_3.catala_en b/tests/array/good/aggregation_3.catala_en
index 34d4309fa..2ab58e85e 100644
--- a/tests/array/good/aggregation_3.catala_en
+++ b/tests/array/good/aggregation_3.catala_en
@@ -36,10 +36,10 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -95,6 +95,6 @@ let scope S (x: integer|internal|output) =
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│x = 0
+│ x = 0
 └─
 ```
diff --git a/tests/array/good/concatenation.catala_en b/tests/array/good/concatenation.catala_en
index d3c0c7c50..9c7e95ccd 100644
--- a/tests/array/good/concatenation.catala_en
+++ b/tests/array/good/concatenation.catala_en
@@ -15,17 +15,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = [0; 1; 2; 3; 4; 5; 6]
-│y = [0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10]
+│ x = [0; 1; 2; 3; 4; 5; 6]
+│ y = [0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10]
 └─
 ```
diff --git a/tests/array/good/filter.catala_en b/tests/array/good/filter.catala_en
index 363084c1e..112abe9a5 100644
--- a/tests/array/good/filter.catala_en
+++ b/tests/array/good/filter.catala_en
@@ -21,23 +21,23 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = [$0.00; $9.00; $5.20]
+│ x = [$0.00; $9.00; $5.20]
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│y = [$9.00; $5.20]
+│ y = [$9.00; $5.20]
 └─
 ```
diff --git a/tests/array/good/filter_map.catala_en b/tests/array/good/filter_map.catala_en
index 3b4ef0dfd..29e3485fd 100644
--- a/tests/array/good/filter_map.catala_en
+++ b/tests/array/good/filter_map.catala_en
@@ -22,24 +22,24 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = [$0.00; $9.00; $5.20]
+│ x = [$0.00; $9.00; $5.20]
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│y = [$9.00; $5.20]
-│z = [false; true; true]
+│ y = [$9.00; $5.20]
+│ z = [false; true; true]
 └─
 ```
diff --git a/tests/array/good/fold.catala_en b/tests/array/good/fold.catala_en
index 384a4d9e9..54e7572af 100644
--- a/tests/array/good/fold.catala_en
+++ b/tests/array/good/fold.catala_en
@@ -34,28 +34,28 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x =
-│  [
-│    S { -- id: 0 -- income: $0.00 }; S { -- id: 1 -- income: $9.00 };
-│    S { -- id: 2 -- income: $5.20 }
-│  ]
+│ x =
+│   [
+│     S { -- id: 0 -- income: $0.00 }; S { -- id: 1 -- income: $9.00 };
+│     S { -- id: 2 -- income: $5.20 }
+│   ]
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│argmax = S { -- id: 1 -- income: $9.00 }
-│argmin = S { -- id: 0 -- income: $0.00 }
+│ argmax = S { -- id: 1 -- income: $9.00 }
+│ argmin = S { -- id: 0 -- income: $0.00 }
 └─
 ```
diff --git a/tests/array/good/map.catala_en b/tests/array/good/map.catala_en
index cc2b628ec..24e936914 100644
--- a/tests/array/good/map.catala_en
+++ b/tests/array/good/map.catala_en
@@ -15,17 +15,17 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│x = [$4.00; $8.00]
-│z = [false; true]
+│ x = [$4.00; $8.00]
+│ z = [false; true]
 └─
 ```
diff --git a/tests/array/good/simple.catala_en b/tests/array/good/simple.catala_en
index d22714608..a13bfbafb 100644
--- a/tests/array/good/simple.catala_en
+++ b/tests/array/good/simple.catala_en
@@ -26,26 +26,26 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = [0; 9; 64]
+│ x = [0; 9; 64]
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│v = 3
-│w = true
-│y = true
-│z = false
+│ v = 3
+│ w = true
+│ y = true
+│ z = false
 └─
 ```
diff --git a/tests/array/good/simpler.catala_en b/tests/array/good/simpler.catala_en
index fcbbc138a..7396fbb36 100644
--- a/tests/array/good/simpler.catala_en
+++ b/tests/array/good/simpler.catala_en
@@ -15,17 +15,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│w = false
-│x = [0; 9; 64]
+│ w = false
+│ x = [0; 9; 64]
 └─
 ```
diff --git a/tests/array/good/simplest.catala_en b/tests/array/good/simplest.catala_en
index ae6b45985..b173b1f13 100644
--- a/tests/array/good/simplest.catala_en
+++ b/tests/array/good/simplest.catala_en
@@ -13,16 +13,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = [0; 4; 8]
+│ x = [0; 4; 8]
 └─
 ```
diff --git a/tests/bool/good/test_bool.catala_en b/tests/bool/good/test_bool.catala_en
index ce1d1fe57..577f84464 100644
--- a/tests/bool/good/test_bool.catala_en
+++ b/tests/bool/good/test_bool.catala_en
@@ -16,10 +16,10 @@ scope TestBool:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -48,8 +48,8 @@ TestBool
 ```catala-test-inline
 $ catala test-scope TestBool
 ┌─[RESULT]─
-│bar = 1
-│foo = true
+│ bar = 1
+│ foo = true
 └─
 ```
 
diff --git a/tests/bool/good/test_precedence.catala_en b/tests/bool/good/test_precedence.catala_en
index d2f760374..fc5dc6ca5 100644
--- a/tests/bool/good/test_precedence.catala_en
+++ b/tests/bool/good/test_precedence.catala_en
@@ -13,16 +13,16 @@ scope TestBool:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope TestBool
 ┌─[RESULT]─
-│foo = true
+│ foo = true
 └─
 ```
diff --git a/tests/bool/good/test_xor.catala_en b/tests/bool/good/test_xor.catala_en
index 291ca07d3..03f9359d3 100644
--- a/tests/bool/good/test_xor.catala_en
+++ b/tests/bool/good/test_xor.catala_en
@@ -19,19 +19,19 @@ scope TestXor:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope TestXor
 ┌─[RESULT]─
-│f_xor_f = false
-│f_xor_t = true
-│t_xor_f = true
-│t_xor_t = false
+│ f_xor_f = false
+│ f_xor_t = true
+│ t_xor_f = true
+│ t_xor_t = false
 └─
 ```
diff --git a/tests/date/good/durations.catala_en b/tests/date/good/durations.catala_en
index 00dae0f5c..8adc6db1e 100644
--- a/tests/date/good/durations.catala_en
+++ b/tests/date/good/durations.catala_en
@@ -28,22 +28,22 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│m = [11874 days]
-│m2 = [6 months]
-│x = 2019-01-01
-│y = 2002-09-30
-│z = true
-│z2 = true
-│z3 = [5937 days]
+│ m = [11874 days]
+│ m2 = [6 months]
+│ x = 2019-01-01
+│ y = 2002-09-30
+│ z = true
+│ z2 = true
+│ z3 = [5937 days]
 └─
 ```
diff --git a/tests/date/good/rounding_option_en.catala_en b/tests/date/good/rounding_option_en.catala_en
index 26762202b..040be03ef 100644
--- a/tests/date/good/rounding_option_en.catala_en
+++ b/tests/date/good/rounding_option_en.catala_en
@@ -27,16 +27,16 @@ scope Test:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Test
 ┌─[RESULT]─
-│r = true
+│ r = true
 └─
 ```
diff --git a/tests/date/good/rounding_option_fr.catala_fr b/tests/date/good/rounding_option_fr.catala_fr
index ac0e9656d..9c129a43b 100644
--- a/tests/date/good/rounding_option_fr.catala_fr
+++ b/tests/date/good/rounding_option_fr.catala_fr
@@ -27,16 +27,16 @@ champ d'application Test:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Test
 ┌─[RESULT]─
-│r = vrai
+│ r = vrai
 └─
 ```
diff --git a/tests/date/good/simple.catala_en b/tests/date/good/simple.catala_en
index bbd4efd5e..388c23fee 100644
--- a/tests/date/good/simple.catala_en
+++ b/tests/date/good/simple.catala_en
@@ -17,18 +17,18 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 2019-01-01
-│y = 2002-09-30
-│z = [5937 days]
+│ x = 2019-01-01
+│ y = 2002-09-30
+│ z = [5937 days]
 └─
 ```
diff --git a/tests/dec/good/infinite_precision.catala_en b/tests/dec/good/infinite_precision.catala_en
index 2f82c0566..f7da19658 100644
--- a/tests/dec/good/infinite_precision.catala_en
+++ b/tests/dec/good/infinite_precision.catala_en
@@ -19,20 +19,20 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│a =
-│  -0.000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,078,695,580,959,228,473,468…
-│x = 84.648,665,652,656,896,23
-│y = -4.368,297,787,053,206,549,8
-│z = 654,265,429,805,103,220,650,980,650.5…
+│ a =
+│   -0.000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,078,695,580,959,228,473,468…
+│ x = 84.648,665,652,656,896,23
+│ y = -4.368,297,787,053,206,549,8
+│ z = 654,265,429,805,103,220,650,980,650.5…
 └─
 ```
diff --git a/tests/dec/good/rounding.catala_en b/tests/dec/good/rounding.catala_en
index 0f2fd4996..da82f7d6b 100644
--- a/tests/dec/good/rounding.catala_en
+++ b/tests/dec/good/rounding.catala_en
@@ -19,19 +19,19 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 84.648,665
-│x1 = 85.0
-│y = 4.368,297
-│y1 = 4.0
+│ x = 84.648,665
+│ x1 = 85.0
+│ y = 4.368,297
+│ y1 = 4.0
 └─
 ```
diff --git a/tests/dec/good/simple.catala_en b/tests/dec/good/simple.catala_en
index a1e1f271a..c122f9477 100644
--- a/tests/dec/good/simple.catala_en
+++ b/tests/dec/good/simple.catala_en
@@ -19,19 +19,19 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│k = 0.333,333,333,333,333,333,33…
-│x = 84.648,665
-│y = 4.368,297
-│z = 19.377,955,528,206,987,757…
+│ k = 0.333,333,333,333,333,333,33…
+│ x = 84.648,665
+│ y = 4.368,297
+│ z = 19.377,955,528,206,987,757…
 └─
 ```
diff --git a/tests/dec/good/zero_after_comma.catala_en b/tests/dec/good/zero_after_comma.catala_en
index 5bc7fdb2a..72f1b628f 100644
--- a/tests/dec/good/zero_after_comma.catala_en
+++ b/tests/dec/good/zero_after_comma.catala_en
@@ -16,17 +16,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 4.0
-│y = 1.04
+│ x = 4.0
+│ y = 1.04
 └─
 ```
diff --git a/tests/default/good/mutliple_definitions.catala_en b/tests/default/good/mutliple_definitions.catala_en
index fd3c8fc9f..9b10ad105 100644
--- a/tests/default/good/mutliple_definitions.catala_en
+++ b/tests/default/good/mutliple_definitions.catala_en
@@ -29,10 +29,10 @@ $ catala Typecheck --check-invariants
 │   │   ‾‾‾‾‾‾‾‾‾‾‾‾
 └─
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -54,6 +54,6 @@ $ catala test-scope A
 │   │   ‾‾‾‾‾‾‾‾‾‾‾‾
 └─
 ┌─[RESULT]─
-│w = 3
+│ w = 3
 └─
 ```
diff --git a/tests/enum/bad/useless_wildcard.catala_en b/tests/enum/bad/useless_wildcard.catala_en
index b2491d156..2720fcf71 100644
--- a/tests/enum/bad/useless_wildcard.catala_en
+++ b/tests/enum/bad/useless_wildcard.catala_en
@@ -30,7 +30,7 @@ $ catala test-scope A
 │    │     ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 └─ Useless wildcard
 ┌─[RESULT]─
-│x = Case1 ()
-│y = 42
+│ x = Case1 ()
+│ y = 42
 └─
 ```
diff --git a/tests/enum/good/disambiguated_cases.catala_en b/tests/enum/good/disambiguated_cases.catala_en
index 3ec42e41d..752ba1c4a 100644
--- a/tests/enum/good/disambiguated_cases.catala_en
+++ b/tests/enum/good/disambiguated_cases.catala_en
@@ -26,18 +26,18 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│e = Case1 ()
-│f = Case1 2
-│x = 2
+│ e = Case1 ()
+│ f = Case1 2
+│ x = 2
 └─
 ```
diff --git a/tests/enum/good/quick_pattern_check.catala_en b/tests/enum/good/quick_pattern_check.catala_en
index 888d23ce7..572a070b8 100644
--- a/tests/enum/good/quick_pattern_check.catala_en
+++ b/tests/enum/good/quick_pattern_check.catala_en
@@ -21,18 +21,18 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = Case1 2
-│y = true
-│z = false
+│ x = Case1 2
+│ y = true
+│ z = false
 └─
 ```
diff --git a/tests/enum/good/simple.catala_en b/tests/enum/good/simple.catala_en
index 85c06dcd6..a9ce5a065 100644
--- a/tests/enum/good/simple.catala_en
+++ b/tests/enum/good/simple.catala_en
@@ -21,17 +21,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = Case1 2
-│y = 42
+│ x = Case1 2
+│ y = 42
 └─
 ```
diff --git a/tests/enum/good/wildcard.catala_en b/tests/enum/good/wildcard.catala_en
index b706ddc52..65b66c42d 100644
--- a/tests/enum/good/wildcard.catala_en
+++ b/tests/enum/good/wildcard.catala_en
@@ -41,25 +41,25 @@ scope Simple_case_2:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Simple_case_2
 ┌─[RESULT]─
-│x = Case3 ()
-│y = 31
+│ x = Case3 ()
+│ y = 31
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Simple_case
 ┌─[RESULT]─
-│x = Case1 2
-│y = 31
+│ x = Case1 2
+│ y = 31
 └─
 ```
diff --git a/tests/exception/good/context_with_default.catala_en b/tests/exception/good/context_with_default.catala_en
index de477b6d8..65f5af60c 100644
--- a/tests/exception/good/context_with_default.catala_en
+++ b/tests/exception/good/context_with_default.catala_en
@@ -20,16 +20,16 @@ scope Bar:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Bar
 ┌─[RESULT]─
-│Computation successful!
+│ Computation successful!
 └─
 ```
diff --git a/tests/exception/good/double_definition.catala_en b/tests/exception/good/double_definition.catala_en
index 0e0099a6c..5f4a95ed6 100644
--- a/tests/exception/good/double_definition.catala_en
+++ b/tests/exception/good/double_definition.catala_en
@@ -31,10 +31,10 @@ $ catala Typecheck --check-invariants
 │   │   ‾‾‾‾‾‾‾‾‾‾‾‾
 └─ Foo
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/exception/good/duplicate_labels.catala_en b/tests/exception/good/duplicate_labels.catala_en
index 265166073..44e6caf28 100644
--- a/tests/exception/good/duplicate_labels.catala_en
+++ b/tests/exception/good/duplicate_labels.catala_en
@@ -23,17 +23,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 0
-│y = 0
+│ x = 0
+│ y = 0
 └─
 ```
diff --git a/tests/exception/good/exception.catala_en b/tests/exception/good/exception.catala_en
index 06192e071..e834e455b 100644
--- a/tests/exception/good/exception.catala_en
+++ b/tests/exception/good/exception.catala_en
@@ -17,16 +17,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 1
+│ x = 1
 └─
 ```
diff --git a/tests/exception/good/exceptions_squared.catala_en b/tests/exception/good/exceptions_squared.catala_en
index a031bfe00..76ba6aa7e 100644
--- a/tests/exception/good/exceptions_squared.catala_en
+++ b/tests/exception/good/exceptions_squared.catala_en
@@ -21,16 +21,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 2
+│ x = 2
 └─
 ```
diff --git a/tests/exception/good/grouped_exceptions.catala_en b/tests/exception/good/grouped_exceptions.catala_en
index 55a1b8221..0b3152df9 100644
--- a/tests/exception/good/grouped_exceptions.catala_en
+++ b/tests/exception/good/grouped_exceptions.catala_en
@@ -51,17 +51,17 @@ scope Benefit:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Benefit
 ┌─[RESULT]─
-│benefit = $2,000.00
-│person = Person { -- age: 26 -- disabled: true }
+│ benefit = $2,000.00
+│ person = Person { -- age: 26 -- disabled: true }
 └─
 ```
diff --git a/tests/exception/good/groups_of_exceptions.catala_en b/tests/exception/good/groups_of_exceptions.catala_en
index 44ac667d2..bbfea442b 100644
--- a/tests/exception/good/groups_of_exceptions.catala_en
+++ b/tests/exception/good/groups_of_exceptions.catala_en
@@ -45,17 +45,17 @@ scope Test:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Test
 ┌─[RESULT]─
-│x = 2
+│ x = 2
 └─
 ```
 
@@ -86,10 +86,10 @@ let scope Test (x: integer|internal|output) (f: Foo {x: integer}|internal) =
 ```catala-test-inline
 $ catala Exceptions -s Foo -v x
 ┌─[RESULT]─
-│Printing the tree of exceptions for the definitions of variable "x" of scope "Foo".
+│ Printing the tree of exceptions for the definitions of variable "x" of scope "Foo".
 └─
 ┌─[RESULT]─
-│Definitions with label "base":
+│ Definitions with label "base":
 │
 ├─➤ tests/exception/good/groups_of_exceptions.catala_en:9.3-9.26:
 │   │
@@ -103,7 +103,7 @@ $ catala Exceptions -s Foo -v x
 │    │   ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 └─ Test
 ┌─[RESULT]─
-│Definitions with label "intermediate":
+│ Definitions with label "intermediate":
 │
 ├─➤ tests/exception/good/groups_of_exceptions.catala_en:17.3-17.49:
 │    │
@@ -117,7 +117,7 @@ $ catala Exceptions -s Foo -v x
 │    │   ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 └─ Test
 ┌─[RESULT]─
-│Definitions with label "exception_to_intermediate":
+│ Definitions with label "exception_to_intermediate":
 │
 ├─➤ tests/exception/good/groups_of_exceptions.catala_en:25.3-25.38:
 │    │
@@ -131,8 +131,8 @@ $ catala Exceptions -s Foo -v x
 │    │   ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 └─ Test
 ┌─[RESULT]─
-│The exception tree structure is as follows:
-│
-│"base"───"intermediate"───"exception_to_intermediate"
+│ The exception tree structure is as follows:
+│ 
+│ "base"───"intermediate"───"exception_to_intermediate"
 └─
 ```
diff --git a/tests/exception/good/same_label_two_variables.catala_en b/tests/exception/good/same_label_two_variables.catala_en
index 27e28761d..f032d4aa1 100644
--- a/tests/exception/good/same_label_two_variables.catala_en
+++ b/tests/exception/good/same_label_two_variables.catala_en
@@ -24,18 +24,18 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 0
-│y = 1
-│z = 0
+│ x = 0
+│ y = 1
+│ z = 0
 └─
 ```
diff --git a/tests/exception/good/split_unlabeled_exception.catala_en b/tests/exception/good/split_unlabeled_exception.catala_en
index c2f054d75..d02d206a1 100644
--- a/tests/exception/good/split_unlabeled_exception.catala_en
+++ b/tests/exception/good/split_unlabeled_exception.catala_en
@@ -19,16 +19,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 1
+│ x = 1
 └─
 ```
diff --git a/tests/exception/good/two_exceptions_same_outcome.catala_en b/tests/exception/good/two_exceptions_same_outcome.catala_en
index 18c6c6e03..cf024f5db 100644
--- a/tests/exception/good/two_exceptions_same_outcome.catala_en
+++ b/tests/exception/good/two_exceptions_same_outcome.catala_en
@@ -25,16 +25,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 0
+│ x = 0
 └─
 ```
diff --git a/tests/exception/good/two_unlabeled_exceptions.catala_en b/tests/exception/good/two_unlabeled_exceptions.catala_en
index f9268e094..ed97482f1 100644
--- a/tests/exception/good/two_unlabeled_exceptions.catala_en
+++ b/tests/exception/good/two_unlabeled_exceptions.catala_en
@@ -22,17 +22,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 1
-│y = 3
+│ x = 1
+│ y = 3
 └─
 ```
diff --git a/tests/exception/good/unlabeled_exception.catala_en b/tests/exception/good/unlabeled_exception.catala_en
index 142d15deb..8c9021cb0 100644
--- a/tests/exception/good/unlabeled_exception.catala_en
+++ b/tests/exception/good/unlabeled_exception.catala_en
@@ -16,16 +16,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 1
+│ x = 1
 └─
 ```
diff --git a/tests/exception/good/unsorted_unlabeled_exceptions.catala_en b/tests/exception/good/unsorted_unlabeled_exceptions.catala_en
index 0bd0ca9fd..dacafc9a5 100644
--- a/tests/exception/good/unsorted_unlabeled_exceptions.catala_en
+++ b/tests/exception/good/unsorted_unlabeled_exceptions.catala_en
@@ -22,17 +22,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 1
-│y = 2
+│ x = 1
+│ y = 2
 └─
 ```
diff --git a/tests/func/bad/bad_func.catala_en b/tests/func/bad/bad_func.catala_en
index 1c59d85a1..c7faf8f3e 100644
--- a/tests/func/bad/bad_func.catala_en
+++ b/tests/func/bad/bad_func.catala_en
@@ -24,7 +24,7 @@ scope R:
 ```catala-test-inline
 $ catala test-scope R
 ┌─[RESULT]─
-│r = 30
+│ r = 30
 └─
 ```
 
diff --git a/tests/func/good/closure_conversion.catala_en b/tests/func/good/closure_conversion.catala_en
index 7918fb8f1..63c85e56b 100644
--- a/tests/func/good/closure_conversion.catala_en
+++ b/tests/func/good/closure_conversion.catala_en
@@ -16,10 +16,10 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/func/good/closure_conversion_reduce.catala_en b/tests/func/good/closure_conversion_reduce.catala_en
index 6dce1568c..707457625 100644
--- a/tests/func/good/closure_conversion_reduce.catala_en
+++ b/tests/func/good/closure_conversion_reduce.catala_en
@@ -16,10 +16,10 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/func/good/closure_return.catala_en b/tests/func/good/closure_return.catala_en
index 7dd339cd2..a43d86ffa 100644
--- a/tests/func/good/closure_return.catala_en
+++ b/tests/func/good/closure_return.catala_en
@@ -14,10 +14,10 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/func/good/closure_through_scope.catala_en b/tests/func/good/closure_through_scope.catala_en
index 1cafb3de6..b38c69bd6 100644
--- a/tests/func/good/closure_through_scope.catala_en
+++ b/tests/func/good/closure_through_scope.catala_en
@@ -22,10 +22,10 @@ scope T:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -47,6 +47,6 @@ let scope T (T_in: T_in): T {y: integer} =
 ```catala-test-inline
 $ catala Interpret --lcalc -s T --avoid-exceptions -O --closure-conversion
 ┌─[RESULT]─
-│y = -2
+│ y = -2
 └─
 ```
diff --git a/tests/func/good/context_func.catala_en b/tests/func/good/context_func.catala_en
index 0b537fd5f..22c5911b4 100644
--- a/tests/func/good/context_func.catala_en
+++ b/tests/func/good/context_func.catala_en
@@ -30,10 +30,10 @@ $ catala Typecheck --check-invariants
 │   │   ‾
 └─ Test
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/func/good/func.catala_en b/tests/func/good/func.catala_en
index 7d78dae01..2e2721b28 100644
--- a/tests/func/good/func.catala_en
+++ b/tests/func/good/func.catala_en
@@ -26,16 +26,16 @@ scope R:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope R
 ┌─[RESULT]─
-│r = 30
+│ r = 30
 └─
 ```
diff --git a/tests/func/good/param_consistency.catala_en b/tests/func/good/param_consistency.catala_en
index d2a9bc03a..81df0ab06 100644
--- a/tests/func/good/param_consistency.catala_en
+++ b/tests/func/good/param_consistency.catala_en
@@ -17,17 +17,17 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala typecheck
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -48,8 +48,8 @@ scope T1:
 ```catala-test-inline
 $ catala test-scope T1
 ┌─[RESULT]─
-│o1 = 20.0
-│o2 = 5.0
+│ o1 = 20.0
+│ o2 = 5.0
 └─
 ```
 
@@ -75,6 +75,6 @@ scope T2:
 ```catala-test-inline
 $ catala test-scope T2
 ┌─[RESULT]─
-│o = 40.0
+│ o = 40.0
 └─
 ```
diff --git a/tests/func/good/scope_call_func_struct_closure.catala_en b/tests/func/good/scope_call_func_struct_closure.catala_en
index 906c25537..83399305c 100644
--- a/tests/func/good/scope_call_func_struct_closure.catala_en
+++ b/tests/func/good/scope_call_func_struct_closure.catala_en
@@ -45,10 +45,10 @@ two closures in Foo.r are different even with optimizations enabled.
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -164,6 +164,6 @@ let scope Foo
 ```catala-test-inline
 $ catala Interpret --lcalc -s Foo --avoid-exceptions -O --closure-conversion
 ┌─[RESULT]─
-│z = 11
+│ z = 11
 └─
 ```
diff --git a/tests/io/good/all_io.catala_en b/tests/io/good/all_io.catala_en
index 16bdc23cc..b519447dc 100644
--- a/tests/io/good/all_io.catala_en
+++ b/tests/io/good/all_io.catala_en
@@ -22,10 +22,10 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -62,6 +62,6 @@ let scope A
 ```catala-test-inline
 $ catala Typecheck
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
diff --git a/tests/io/good/condition_only_input.catala_en b/tests/io/good/condition_only_input.catala_en
index 968ecc436..40c30631a 100644
--- a/tests/io/good/condition_only_input.catala_en
+++ b/tests/io/good/condition_only_input.catala_en
@@ -19,10 +19,10 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -43,6 +43,6 @@ let scope B (B_in: B_in): B =
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│Computation successful!
+│ Computation successful!
 └─
 ```
diff --git a/tests/io/good/subscope.catala_en b/tests/io/good/subscope.catala_en
index 6f7b60bc5..4f50ca9b8 100644
--- a/tests/io/good/subscope.catala_en
+++ b/tests/io/good/subscope.catala_en
@@ -25,10 +25,10 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -53,6 +53,6 @@ let scope B (B_in: B_in): B =
 ```catala-test-inline
 $ catala Typecheck
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
diff --git a/tests/literate/good/test_grave_char_en.catala_en b/tests/literate/good/test_grave_char_en.catala_en
index 100b1c464..4da62f828 100644
--- a/tests/literate/good/test_grave_char_en.catala_en
+++ b/tests/literate/good/test_grave_char_en.catala_en
@@ -34,24 +34,24 @@ int main(void) { return 0; }
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│literate_parsing_is_ok = true
+│ literate_parsing_is_ok = true
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│literate_parsing_is_ok = true
+│ literate_parsing_is_ok = true
 └─
 ```
 
@@ -98,24 +98,24 @@ int main(void) { return 0; }
 \begin{verbatim}
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 \end{verbatim}
 
 \begin{verbatim}
 $ catala test-scope A
 ┌─[RESULT]─
-│literate_parsing_is_ok = true
+│ literate_parsing_is_ok = true
 └─
 \end{verbatim}
 
 \begin{verbatim}
 $ catala test-scope A
 ┌─[RESULT]─
-│literate_parsing_is_ok = true
+│ literate_parsing_is_ok = true
 └─
 \end{verbatim}
 ```
diff --git a/tests/literate/good/test_grave_char_fr.catala_fr b/tests/literate/good/test_grave_char_fr.catala_fr
index ad29196e9..df5930787 100644
--- a/tests/literate/good/test_grave_char_fr.catala_fr
+++ b/tests/literate/good/test_grave_char_fr.catala_fr
@@ -32,16 +32,16 @@ int main(void) { return 0; }
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│literate_parsing_is_ok = vrai
+│ literate_parsing_is_ok = vrai
 └─
 ```
diff --git a/tests/literate/good/test_grave_char_pl.catala_pl b/tests/literate/good/test_grave_char_pl.catala_pl
index e77729c00..3f02c39e4 100644
--- a/tests/literate/good/test_grave_char_pl.catala_pl
+++ b/tests/literate/good/test_grave_char_pl.catala_pl
@@ -30,6 +30,6 @@ int main(void) { return 0; }
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│literate_parsing_is_ok = prawda
+│ literate_parsing_is_ok = prawda
 └─
 ```
diff --git a/tests/metadata/good/test_markup_refactoring.catala_en b/tests/metadata/good/test_markup_refactoring.catala_en
index a5ef91b22..65421e930 100644
--- a/tests/metadata/good/test_markup_refactoring.catala_en
+++ b/tests/metadata/good/test_markup_refactoring.catala_en
@@ -33,23 +33,23 @@ scope S2:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S2
 ┌─[RESULT]─
-│b = B ()
+│ b = B ()
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│a = A ()
+│ a = A ()
 └─
 ```
diff --git a/tests/modules/good/external_use.catala_en b/tests/modules/good/external_use.catala_en
index 8efb8d07d..71d6bb07d 100644
--- a/tests/modules/good/external_use.catala_en
+++ b/tests/modules/good/external_use.catala_en
@@ -19,7 +19,7 @@ scope S:
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│result1 = [$3.33; $0.83; $0.83; $3.33; $0.83; $0.85]
-│result2 = [$3.33; $0.83; $0.83; $3.34; $0.84; $0.83]
+│ result1 = [$3.33; $0.83; $0.83; $3.33; $0.83; $0.85]
+│ result2 = [$3.33; $0.83; $0.83; $3.34; $0.84; $0.83]
 └─
 ```
diff --git a/tests/modules/good/mod_def.catala_en b/tests/modules/good/mod_def.catala_en
index d9661eac4..4b0b1e84f 100644
--- a/tests/modules/good/mod_def.catala_en
+++ b/tests/modules/good/mod_def.catala_en
@@ -32,17 +32,17 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala typecheck --disable-warnings
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/modules/good/mod_def_context.catala_en b/tests/modules/good/mod_def_context.catala_en
index c060020d4..d2ed55237 100644
--- a/tests/modules/good/mod_def_context.catala_en
+++ b/tests/modules/good/mod_def_context.catala_en
@@ -61,22 +61,22 @@ scope Stest:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Stest
 ┌─[RESULT]─
-│o1 = S { -- ci: 0 -- cm: $0.00 -- cfun1: <function> -- cfun2: <function> }
-│o2 = S { -- ci: 1 -- cm: $1.00 -- cfun1: <function> -- cfun2: <function> }
-│x11 = 12.0
-│x12 = 6.0
-│x21 = 8.0
-│x22 = 6.0
+│ o1 = S { -- ci: 0 -- cm: $0.00 -- cfun1: <function> -- cfun2: <function> }
+│ o2 = S { -- ci: 1 -- cm: $1.00 -- cfun1: <function> -- cfun2: <function> }
+│ x11 = 12.0
+│ x12 = 6.0
+│ x21 = 8.0
+│ x22 = 6.0
 └─
 ```
 
@@ -101,10 +101,10 @@ scope TestSubDefault:
 ```catala-test-inline
 $ catala test-scope TestSubDefault
 ┌─[RESULT]─
-│ci = 0
-│cm = $0.00
-│x11 = 12.0
-│x12 = 6.0
+│ ci = 0
+│ cm = $0.00
+│ x11 = 12.0
+│ x12 = 6.0
 └─
 ```
 
@@ -130,9 +130,9 @@ scope TestSubOverride:
 ```catala-test-inline
 $ catala test-scope TestSubOverride
 ┌─[RESULT]─
-│ci = 1
-│cm = $1.00
-│x21 = 8.0
-│x22 = 6.0
+│ ci = 1
+│ cm = $1.00
+│ x21 = 8.0
+│ x22 = 6.0
 └─
 ```
diff --git a/tests/modules/good/mod_middle.catala_en b/tests/modules/good/mod_middle.catala_en
index 9a70c1e29..ebf36ec5f 100644
--- a/tests/modules/good/mod_middle.catala_en
+++ b/tests/modules/good/mod_middle.catala_en
@@ -22,16 +22,16 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala typecheck
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
diff --git a/tests/modules/good/mod_use.catala_en b/tests/modules/good/mod_use.catala_en
index c273a374b..1c7796843 100644
--- a/tests/modules/good/mod_use.catala_en
+++ b/tests/modules/good/mod_use.catala_en
@@ -28,19 +28,19 @@ scope T2:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope T2
 ┌─[RESULT]─
-│o1 = No ()
-│o2 = Maybe ()
-│o3 = $1,000.00
-│o4 = 5.0
+│ o1 = No ()
+│ o2 = Maybe ()
+│ o3 = $1,000.00
+│ o4 = 5.0
 └─
 ```
diff --git a/tests/modules/good/mod_use2.catala_en b/tests/modules/good/mod_use2.catala_en
index fdc80716f..6dd799295 100644
--- a/tests/modules/good/mod_use2.catala_en
+++ b/tests/modules/good/mod_use2.catala_en
@@ -20,19 +20,19 @@ scope T:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope T
 ┌─[RESULT]─
-│o1 = Mod_def.S { -- sr: $1,000.00 -- e1: Maybe () }
-│o2 = $2,500.00
-│o3 = $132.00
+│ o1 = Mod_def.S { -- sr: $1,000.00 -- e1: Maybe () }
+│ o2 = $2,500.00
+│ o3 = $132.00
 └─
 ```
 
@@ -43,9 +43,9 @@ The following tests multiple inclusion of the same module (Mod_def is used throu
 ```catala-test-inline
 $ catala test-scope T2
 ┌─[RESULT]─
-│o1 = No ()
-│o2 = Maybe ()
-│o3 = $1,000.00
-│o4 = 5.0
+│ o1 = No ()
+│ o2 = Maybe ()
+│ o3 = $1,000.00
+│ o4 = 5.0
 └─
 ```
diff --git a/tests/modules/good/mod_use3.catala_en b/tests/modules/good/mod_use3.catala_en
index 0c521ea71..640b23a24 100644
--- a/tests/modules/good/mod_use3.catala_en
+++ b/tests/modules/good/mod_use3.catala_en
@@ -24,18 +24,18 @@ scope T:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope T
 ┌─[RESULT]─
-│o1 = Mod_def.S { -- sr: $1,000.00 -- e1: Maybe () }
-│o2 = $2,500.00
-│o3 = $132.00
+│ o1 = Mod_def.S { -- sr: $1,000.00 -- e1: Maybe () }
+│ o2 = $2,500.00
+│ o3 = $132.00
 └─
 ```
diff --git a/tests/modules/good/mod_use_context.catala_en b/tests/modules/good/mod_use_context.catala_en
index abb5a230b..a7255ebcf 100644
--- a/tests/modules/good/mod_use_context.catala_en
+++ b/tests/modules/good/mod_use_context.catala_en
@@ -45,34 +45,34 @@ scope TestCall:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope TestCall
 ┌─[RESULT]─
-│o_default =
-│  Mod_def_context.S {
-│    -- ci: 0
-│    -- cm: $0.00
-│    -- cfun1: <function>
-│    -- cfun2: <function>
-│  }
-│o_override =
-│  Mod_def_context.S {
-│    -- ci: 1
-│    -- cm: $1.00
-│    -- cfun1: <function>
-│    -- cfun2: <function>
-│  }
-│x11 = 12.0
-│x12 = 6.0
-│x21 = 8.0
-│x22 = 6.0
+│ o_default =
+│   Mod_def_context.S {
+│     -- ci: 0
+│     -- cm: $0.00
+│     -- cfun1: <function>
+│     -- cfun2: <function>
+│   }
+│ o_override =
+│   Mod_def_context.S {
+│     -- ci: 1
+│     -- cm: $1.00
+│     -- cfun1: <function>
+│     -- cfun2: <function>
+│   }
+│ x11 = 12.0
+│ x12 = 6.0
+│ x21 = 8.0
+│ x22 = 6.0
 └─
 ```
 
@@ -98,10 +98,10 @@ scope TestSubDefault:
 ```catala-test-inline
 $ catala test-scope TestSubDefault
 ┌─[RESULT]─
-│ci = 0
-│cm = $0.00
-│x11 = 12.0
-│x12 = 6.0
+│ ci = 0
+│ cm = $0.00
+│ x11 = 12.0
+│ x12 = 6.0
 └─
 ```
 
@@ -127,9 +127,9 @@ scope TestSubOverride:
 ```catala-test-inline
 $ catala test-scope TestSubOverride
 ┌─[RESULT]─
-│ci = 1
-│cm = $1.00
-│x21 = 8.0
-│x22 = 6.0
+│ ci = 1
+│ cm = $1.00
+│ x21 = 8.0
+│ x22 = 6.0
 └─
 ```
diff --git a/tests/modules/good/prorata_syntax.catala_en b/tests/modules/good/prorata_syntax.catala_en
index 074a71c71..528e6a863 100644
--- a/tests/modules/good/prorata_syntax.catala_en
+++ b/tests/modules/good/prorata_syntax.catala_en
@@ -37,33 +37,33 @@ scope S:
 ```catala-test-inline
 $ catala typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│result =
-│  [
-│    HouseholdMemberTaxed {
-│      -- member:
-│        HouseholdMember { -- birthdate: 2000-01-01 -- revenue: $10,000.00 }
-│      -- tax: $270.27
-│    };
-│    HouseholdMemberTaxed {
-│      -- member:
-│        HouseholdMember { -- birthdate: 2000-01-02 -- revenue: $1,000.00 }
-│      -- tax: $27.03
-│    };
-│    HouseholdMemberTaxed {
-│      -- member:
-│        HouseholdMember { -- birthdate: 2000-01-02 -- revenue: $100.00 }
-│      -- tax: $2.70
-│    }
-│  ]
+│ result =
+│   [
+│     HouseholdMemberTaxed {
+│       -- member:
+│         HouseholdMember { -- birthdate: 2000-01-01 -- revenue: $10,000.00 }
+│       -- tax: $270.27
+│     };
+│     HouseholdMemberTaxed {
+│       -- member:
+│         HouseholdMember { -- birthdate: 2000-01-02 -- revenue: $1,000.00 }
+│       -- tax: $27.03
+│     };
+│     HouseholdMemberTaxed {
+│       -- member:
+│         HouseholdMember { -- birthdate: 2000-01-02 -- revenue: $100.00 }
+│       -- tax: $2.70
+│     }
+│   ]
 └─
 ```
diff --git a/tests/money/good/literal_parsing.catala_en b/tests/money/good/literal_parsing.catala_en
index 5d20f6431..0d1be5e7f 100644
--- a/tests/money/good/literal_parsing.catala_en
+++ b/tests/money/good/literal_parsing.catala_en
@@ -16,17 +16,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = $0.30
-│y = -$0.30
+│ x = $0.30
+│ y = -$0.30
 └─
 ```
diff --git a/tests/money/good/simple.catala_en b/tests/money/good/simple.catala_en
index f6b8d11ab..b45400b4f 100644
--- a/tests/money/good/simple.catala_en
+++ b/tests/money/good/simple.catala_en
@@ -17,18 +17,18 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = $123.54
-│y = $8,548,650.96
-│z = $7.23
+│ x = $123.54
+│ y = $8,548,650.96
+│ z = $7.23
 └─
 ```
diff --git a/tests/name_resolution/good/let_in.catala_en b/tests/name_resolution/good/let_in.catala_en
index f4817d2a1..6628b96e1 100644
--- a/tests/name_resolution/good/let_in.catala_en
+++ b/tests/name_resolution/good/let_in.catala_en
@@ -30,18 +30,18 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│a = A { -- x: -2.0 -- y: B { -- y: false -- z: -1.0 } }
-│b = B { -- y: true -- z: 42.0 }
+│ a = A { -- x: -2.0 -- y: B { -- y: false -- z: -1.0 } }
+│ b = B { -- y: true -- z: 42.0 }
 └─
 ```
 
@@ -71,6 +71,6 @@ $ catala test-scope S2
 │    │    ‾
 └─ Check scope of let-in vs scope variable
 ┌─[RESULT]─
-│y = 1
+│ y = 1
 └─
 ```
diff --git a/tests/name_resolution/good/let_in2.catala_en b/tests/name_resolution/good/let_in2.catala_en
index 6b41d0630..2253a9ff7 100644
--- a/tests/name_resolution/good/let_in2.catala_en
+++ b/tests/name_resolution/good/let_in2.catala_en
@@ -18,17 +18,17 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│a = true
+│ a = true
 └─
 ```
 
diff --git a/tests/name_resolution/good/out_of_order.catala_en b/tests/name_resolution/good/out_of_order.catala_en
index 791b1e1dd..ef71bccde 100644
--- a/tests/name_resolution/good/out_of_order.catala_en
+++ b/tests/name_resolution/good/out_of_order.catala_en
@@ -23,17 +23,17 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│a = A { -- x: 0 -- y: B { -- y: true -- z: 0.0 } }
-│b = B { -- y: true -- z: 0.0 }
+│ a = A { -- x: 0 -- y: B { -- y: true -- z: 0.0 } }
+│ b = B { -- y: true -- z: 0.0 }
 └─
 ```
diff --git a/tests/name_resolution/good/toplevel_defs.catala_en b/tests/name_resolution/good/toplevel_defs.catala_en
index 41c49889d..022b4421e 100644
--- a/tests/name_resolution/good/toplevel_defs.catala_en
+++ b/tests/name_resolution/good/toplevel_defs.catala_en
@@ -24,18 +24,18 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│a = 1,946.574,4
-│b = A { -- y: true -- z: 2,091.0 }
+│ a = 1,946.574,4
+│ b = A { -- y: true -- z: 2,091.0 }
 └─
 ```
 
@@ -56,7 +56,7 @@ scope S2:
 ```catala-test-inline
 $ catala test-scope S2
 ┌─[RESULT]─
-│a = 154.0
+│ a = 154.0
 └─
 ```
 
@@ -77,7 +77,7 @@ scope S3:
 ```catala-test-inline
 $ catala test-scope S3
 ┌─[RESULT]─
-│a = 2,480.0
+│ a = 2,480.0
 └─
 ```
 
@@ -101,7 +101,7 @@ scope S4:
 ```catala-test-inline
 $ catala test-scope S4
 ┌─[RESULT]─
-│a = 6,001.0
+│ a = 6,001.0
 └─
 ```
 
diff --git a/tests/name_resolution/good/toplevel_defs_simple.catala_en b/tests/name_resolution/good/toplevel_defs_simple.catala_en
index 36fb02785..2563b02e1 100644
--- a/tests/name_resolution/good/toplevel_defs_simple.catala_en
+++ b/tests/name_resolution/good/toplevel_defs_simple.catala_en
@@ -15,16 +15,16 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│a = true
+│ a = true
 └─
 ```
diff --git a/tests/proof/good/array_length.catala_en b/tests/proof/good/array_length.catala_en
index 4e0eb0d7d..e4317f7ac 100644
--- a/tests/proof/good/array_length.catala_en
+++ b/tests/proof/good/array_length.catala_en
@@ -16,16 +16,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/assert.catala_en b/tests/proof/good/assert.catala_en
index 7aeb8a72d..2281dcd02 100644
--- a/tests/proof/good/assert.catala_en
+++ b/tests/proof/good/assert.catala_en
@@ -27,16 +27,16 @@ scope Foo:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/dates_get_year.catala_en b/tests/proof/good/dates_get_year.catala_en
index 1b0310e7b..164187c25 100644
--- a/tests/proof/good/dates_get_year.catala_en
+++ b/tests/proof/good/dates_get_year.catala_en
@@ -18,16 +18,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/dates_simple.catala_en b/tests/proof/good/dates_simple.catala_en
index 33dcdcba5..f875071f9 100644
--- a/tests/proof/good/dates_simple.catala_en
+++ b/tests/proof/good/dates_simple.catala_en
@@ -18,16 +18,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/direct_scope_call.catala_en b/tests/proof/good/direct_scope_call.catala_en
index c80f1d4ea..17599d20f 100644
--- a/tests/proof/good/direct_scope_call.catala_en
+++ b/tests/proof/good/direct_scope_call.catala_en
@@ -19,16 +19,16 @@ scope Foo:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof -s Foo
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/direct_scope_call_with_context.catala_en b/tests/proof/good/direct_scope_call_with_context.catala_en
index 75f95616f..bc06c295e 100644
--- a/tests/proof/good/direct_scope_call_with_context.catala_en
+++ b/tests/proof/good/direct_scope_call_with_context.catala_en
@@ -20,16 +20,16 @@ scope Foo:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof -s Foo
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/duration.catala_en b/tests/proof/good/duration.catala_en
index a9a1a3542..65b6cfe76 100644
--- a/tests/proof/good/duration.catala_en
+++ b/tests/proof/good/duration.catala_en
@@ -16,16 +16,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/enums-arith.catala_en b/tests/proof/good/enums-arith.catala_en
index 5e0b3a06f..bf7ea0acf 100644
--- a/tests/proof/good/enums-arith.catala_en
+++ b/tests/proof/good/enums-arith.catala_en
@@ -34,10 +34,10 @@ $ catala Typecheck --check-invariants
 │   │       ‾
 └─ Test
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -54,6 +54,6 @@ $ catala Proof --disable-counterexamples
 │   │       ‾
 └─ Test
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/enums-nonbool.catala_en b/tests/proof/good/enums-nonbool.catala_en
index f7ec358c6..9b830e69c 100644
--- a/tests/proof/good/enums-nonbool.catala_en
+++ b/tests/proof/good/enums-nonbool.catala_en
@@ -34,10 +34,10 @@ $ catala Typecheck --check-invariants
 │   │       ‾
 └─ Test
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -54,6 +54,6 @@ $ catala Proof --disable-counterexamples
 │   │       ‾
 └─ Test
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/enums.catala_en b/tests/proof/good/enums.catala_en
index d1a9699a3..05bca9c0c 100644
--- a/tests/proof/good/enums.catala_en
+++ b/tests/proof/good/enums.catala_en
@@ -33,10 +33,10 @@ $ catala Typecheck --check-invariants
 │   │       ‾
 └─ Test
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -53,6 +53,6 @@ $ catala Proof --disable-counterexamples
 │   │       ‾
 └─ Test
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/enums_inj.catala_en b/tests/proof/good/enums_inj.catala_en
index 02b627cca..3166fb699 100644
--- a/tests/proof/good/enums_inj.catala_en
+++ b/tests/proof/good/enums_inj.catala_en
@@ -20,16 +20,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/enums_unit.catala_en b/tests/proof/good/enums_unit.catala_en
index fc794d4a2..7f4a2ffa0 100644
--- a/tests/proof/good/enums_unit.catala_en
+++ b/tests/proof/good/enums_unit.catala_en
@@ -24,16 +24,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/functions.catala_en b/tests/proof/good/functions.catala_en
index e82a25305..29f9444a9 100644
--- a/tests/proof/good/functions.catala_en
+++ b/tests/proof/good/functions.catala_en
@@ -17,16 +17,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/let_in_condition.catala_en b/tests/proof/good/let_in_condition.catala_en
index 018e9be62..54a3ee1c8 100644
--- a/tests/proof/good/let_in_condition.catala_en
+++ b/tests/proof/good/let_in_condition.catala_en
@@ -16,16 +16,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/money.catala_en b/tests/proof/good/money.catala_en
index 1df8e1961..b08992ff5 100644
--- a/tests/proof/good/money.catala_en
+++ b/tests/proof/good/money.catala_en
@@ -18,16 +18,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/no_vars.catala_en b/tests/proof/good/no_vars.catala_en
index 8b359dbf3..4e491be27 100644
--- a/tests/proof/good/no_vars.catala_en
+++ b/tests/proof/good/no_vars.catala_en
@@ -13,16 +13,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/rationals.catala_en b/tests/proof/good/rationals.catala_en
index 6c9926856..fad466211 100644
--- a/tests/proof/good/rationals.catala_en
+++ b/tests/proof/good/rationals.catala_en
@@ -16,16 +16,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/simple_vars.catala_en b/tests/proof/good/simple_vars.catala_en
index 071cf652b..b7e8eac1f 100644
--- a/tests/proof/good/simple_vars.catala_en
+++ b/tests/proof/good/simple_vars.catala_en
@@ -19,16 +19,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/proof/good/structs.catala_en b/tests/proof/good/structs.catala_en
index 75bcc3158..3fc9915c1 100644
--- a/tests/proof/good/structs.catala_en
+++ b/tests/proof/good/structs.catala_en
@@ -23,16 +23,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Proof --disable-counterexamples 
 ┌─[RESULT]─
-│No errors found during the proof mode run.
+│ No errors found during the proof mode run.
 └─
 ```
diff --git a/tests/scope/good/191_fix_record_name_confusion.catala_en b/tests/scope/good/191_fix_record_name_confusion.catala_en
index 144f82180..7a4a8450c 100644
--- a/tests/scope/good/191_fix_record_name_confusion.catala_en
+++ b/tests/scope/good/191_fix_record_name_confusion.catala_en
@@ -20,10 +20,10 @@ scope ScopeB:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/scope/good/grand_parent_caller.catala_en b/tests/scope/good/grand_parent_caller.catala_en
index 794e1da3b..42d1eb9bd 100644
--- a/tests/scope/good/grand_parent_caller.catala_en
+++ b/tests/scope/good/grand_parent_caller.catala_en
@@ -34,32 +34,32 @@ scope C:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│x = 0
+│ x = 0
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│y1 = 1
-│y2 = 1
+│ y1 = 1
+│ y2 = 1
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope C
 ┌─[RESULT]─
-│z1 = 2
-│z2 = 2
+│ z1 = 2
+│ z2 = 2
 └─
 ```
diff --git a/tests/scope/good/local-capture-subscope.catala_en b/tests/scope/good/local-capture-subscope.catala_en
index e6e6dd92d..fb18172ba 100644
--- a/tests/scope/good/local-capture-subscope.catala_en
+++ b/tests/scope/good/local-capture-subscope.catala_en
@@ -31,7 +31,7 @@ $ catala test-scope S
 │   │   ‾
 └─
 ┌─[RESULT]─
-│so = 42
+│ so = 42
 └─
 ```
 
diff --git a/tests/scope/good/nothing.catala_en b/tests/scope/good/nothing.catala_en
index 2984aad66..21a0916d1 100644
--- a/tests/scope/good/nothing.catala_en
+++ b/tests/scope/good/nothing.catala_en
@@ -20,10 +20,10 @@ $ catala Typecheck --check-invariants
 │   │          ‾‾‾
 └─ Test
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/scope/good/out_sub_scope.catala_en b/tests/scope/good/out_sub_scope.catala_en
index f91f20673..3c075d3d1 100644
--- a/tests/scope/good/out_sub_scope.catala_en
+++ b/tests/scope/good/out_sub_scope.catala_en
@@ -22,7 +22,7 @@ scope B:
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│a = A { -- o: 99 -- io: 100 }
-│b = 99
+│ a = A { -- o: 99 -- io: 100 }
+│ b = 99
 └─
 ```
diff --git a/tests/scope/good/scope_call.catala_en b/tests/scope/good/scope_call.catala_en
index da8ee52f8..5532ae527 100644
--- a/tests/scope/good/scope_call.catala_en
+++ b/tests/scope/good/scope_call.catala_en
@@ -25,16 +25,16 @@ scope Foo:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Foo
 ┌─[RESULT]─
-│example = -7
+│ example = -7
 └─
 ```
diff --git a/tests/scope/good/scope_call2.catala_en b/tests/scope/good/scope_call2.catala_en
index c5bb58265..30d4e1572 100644
--- a/tests/scope/good/scope_call2.catala_en
+++ b/tests/scope/good/scope_call2.catala_en
@@ -33,10 +33,10 @@ $ catala Typecheck --check-invariants
 │    │   ‾‾‾‾
 └─
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -53,7 +53,7 @@ $ catala test-scope Titi
 │    │   ‾‾‾‾
 └─
 ┌─[RESULT]─
-│fizz = Toto { -- foo: 1,213 }
-│fuzz = Toto { -- foo: 1,323 }
+│ fizz = Toto { -- foo: 1,213 }
+│ fuzz = Toto { -- foo: 1,323 }
 └─
 ```
diff --git a/tests/scope/good/scope_call3.catala_en b/tests/scope/good/scope_call3.catala_en
index 4c5af2099..c43a290c2 100644
--- a/tests/scope/good/scope_call3.catala_en
+++ b/tests/scope/good/scope_call3.catala_en
@@ -21,10 +21,10 @@ scope RentComputation:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -91,29 +91,29 @@ $ catala Interpret -t -s HousingComputation --debug
 [LOG] ≔  HousingComputation.result: 3
 [DEBUG] End of interpretation
 ┌─[RESULT]─
-│f = λ (x: integer) →
-│  error_empty
-│    ⟨ ⟨true
-│       ⊢ ⟨(let result : RentComputation =
-│             (λ (RentComputation_in: RentComputation_in) →
-│              let g : integer → integer =
-│                λ (x1: integer) →
-│                error_empty ⟨ ⟨true ⊢ ⟨x1 + 1⟩⟩ | false ⊢ ∅ ⟩
-│              in
-│              let f : integer → integer =
-│                λ (x1: integer) →
-│                error_empty ⟨ ⟨true ⊢ ⟨g (x1 + 1)⟩⟩ | false ⊢ ∅ ⟩
-│              in
-│              { RentComputation f = f; })
-│               {RentComputation_in}
-│           in
-│           let result1 : RentComputation =
-│             { RentComputation f = λ (param0: integer) → result.f param0; }
-│           in
-│           if true then result1 else result1).
-│            f
-│            x⟩⟩
-│    | false ⊢ ∅ ⟩
-│result = 3
+│ f = λ (x: integer) →
+│   error_empty
+│     ⟨ ⟨true
+│        ⊢ ⟨(let result : RentComputation =
+│              (λ (RentComputation_in: RentComputation_in) →
+│               let g : integer → integer =
+│                 λ (x1: integer) →
+│                 error_empty ⟨ ⟨true ⊢ ⟨x1 + 1⟩⟩ | false ⊢ ∅ ⟩
+│               in
+│               let f : integer → integer =
+│                 λ (x1: integer) →
+│                 error_empty ⟨ ⟨true ⊢ ⟨g (x1 + 1)⟩⟩ | false ⊢ ∅ ⟩
+│               in
+│               { RentComputation f = f; })
+│                {RentComputation_in}
+│            in
+│            let result1 : RentComputation =
+│              { RentComputation f = λ (param0: integer) → result.f param0; }
+│            in
+│            if true then result1 else result1).
+│             f
+│             x⟩⟩
+│     | false ⊢ ∅ ⟩
+│ result = 3
 └─
 ```
diff --git a/tests/scope/good/scope_call4.catala_en b/tests/scope/good/scope_call4.catala_en
index f59a9081c..e9fb67f05 100644
--- a/tests/scope/good/scope_call4.catala_en
+++ b/tests/scope/good/scope_call4.catala_en
@@ -27,10 +27,10 @@ scope RentComputation:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -52,18 +52,18 @@ $ catala interpret -s RentComputation --debug
 [DEBUG] Starting interpretation...
 [DEBUG] End of interpretation
 ┌─[RESULT]─
-│f1 = λ (x: integer) →
-│  error_empty
-│    ⟨ ⟨true
-│       ⊢ ⟨let x1 : integer = x + 1 in
-│          error_empty ⟨ ⟨true ⊢ ⟨x1 + 1⟩⟩ | false ⊢ ∅ ⟩⟩⟩
-│    | false ⊢ ∅ ⟩
-│f2 = λ (x: integer) →
-│  error_empty
-│    ⟨ ⟨true
-│       ⊢ ⟨let x1 : integer = x + 1 in
-│          error_empty ⟨ ⟨true ⊢ ⟨x1 + 1⟩⟩ | false ⊢ ∅ ⟩⟩⟩
-│    | false ⊢ ∅ ⟩
+│ f1 = λ (x: integer) →
+│   error_empty
+│     ⟨ ⟨true
+│        ⊢ ⟨let x1 : integer = x + 1 in
+│           error_empty ⟨ ⟨true ⊢ ⟨x1 + 1⟩⟩ | false ⊢ ∅ ⟩⟩⟩
+│     | false ⊢ ∅ ⟩
+│ f2 = λ (x: integer) →
+│   error_empty
+│     ⟨ ⟨true
+│        ⊢ ⟨let x1 : integer = x + 1 in
+│           error_empty ⟨ ⟨true ⊢ ⟨x1 + 1⟩⟩ | false ⊢ ∅ ⟩⟩⟩
+│     | false ⊢ ∅ ⟩
 └─
 ```
 
@@ -89,9 +89,9 @@ $ catala Interpret --lcalc -s RentComputation --avoid-exceptions --optimize --de
 [DEBUG] Starting interpretation...
 [DEBUG] End of interpretation
 ┌─[RESULT]─
-│f1 = λ (x: integer) → let x1 : integer = x + 1 in
-│                      ((x1 + 1))
-│f2 = λ (x: integer) → let x1 : integer = x + 1 in
-│                      ((x1 + 1))
+│ f1 = λ (x: integer) → let x1 : integer = x + 1 in
+│                       ((x1 + 1))
+│ f2 = λ (x: integer) → let x1 : integer = x + 1 in
+│                       ((x1 + 1))
 └─
 ```
diff --git a/tests/scope/good/scope_struct.catala_en b/tests/scope/good/scope_struct.catala_en
index c55b62dc8..5bb59630c 100644
--- a/tests/scope/good/scope_struct.catala_en
+++ b/tests/scope/good/scope_struct.catala_en
@@ -26,16 +26,16 @@ scope Foo:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Foo
 ┌─[RESULT]─
-│example = SubFoo { -- z1: 4 -- z2: 0 }
+│ example = SubFoo { -- z1: 4 -- z2: 0 }
 └─
 ```
diff --git a/tests/scope/good/simple.catala_en b/tests/scope/good/simple.catala_en
index 4d35fa9e4..4c841d216 100644
--- a/tests/scope/good/simple.catala_en
+++ b/tests/scope/good/simple.catala_en
@@ -13,10 +13,10 @@ scope Foo:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
diff --git a/tests/scope/good/sub_scope.catala_en b/tests/scope/good/sub_scope.catala_en
index 4902f3a7a..e00ac57ad 100644
--- a/tests/scope/good/sub_scope.catala_en
+++ b/tests/scope/good/sub_scope.catala_en
@@ -28,26 +28,26 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│a = -1
-│a_base = 1
-│b = false
+│ a = -1
+│ a_base = 1
+│ b = false
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│a = 42
-│b = true
+│ a = 42
+│ b = true
 └─
 ```
diff --git a/tests/scope/good/sub_sub_scope.catala_en b/tests/scope/good/sub_sub_scope.catala_en
index 8c678b5cf..93836ce1e 100644
--- a/tests/scope/good/sub_sub_scope.catala_en
+++ b/tests/scope/good/sub_sub_scope.catala_en
@@ -55,10 +55,10 @@ $ catala Typecheck --check-invariants
 │    │   ‾
 └─ Article
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -85,8 +85,8 @@ $ catala test-scope A
 │    │   ‾
 └─ Article
 ┌─[RESULT]─
-│u = true
-│x = 0
+│ u = true
+│ x = 0
 └─
 ```
 
@@ -113,7 +113,7 @@ $ catala test-scope B
 │    │   ‾
 └─ Article
 ┌─[RESULT]─
-│y = 1
+│ y = 1
 └─
 ```
 
@@ -140,6 +140,6 @@ $ catala test-scope C
 │    │   ‾
 └─ Article
 ┌─[RESULT]─
-│z = 2
+│ z = 2
 └─
 ```
diff --git a/tests/scope/good/subscope_function_arg_not_defined.catala_en b/tests/scope/good/subscope_function_arg_not_defined.catala_en
index 07227b53d..8add58236 100644
--- a/tests/scope/good/subscope_function_arg_not_defined.catala_en
+++ b/tests/scope/good/subscope_function_arg_not_defined.catala_en
@@ -22,16 +22,16 @@ scope Caller:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Caller
 ┌─[RESULT]─
-│y = 1
+│ y = 1
 └─
 ```
diff --git a/tests/scope/good/subscope_function_arg_not_defined2.catala_en b/tests/scope/good/subscope_function_arg_not_defined2.catala_en
index 3338e4c95..6324923fd 100644
--- a/tests/scope/good/subscope_function_arg_not_defined2.catala_en
+++ b/tests/scope/good/subscope_function_arg_not_defined2.catala_en
@@ -24,16 +24,16 @@ scope Caller:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Caller
 ┌─[RESULT]─
-│Computation successful!
+│ Computation successful!
 └─
 ```
diff --git a/tests/struct/good/ambiguous_fields.catala_en b/tests/struct/good/ambiguous_fields.catala_en
index 1eb57affc..80f513b7a 100644
--- a/tests/struct/good/ambiguous_fields.catala_en
+++ b/tests/struct/good/ambiguous_fields.catala_en
@@ -30,10 +30,10 @@ $ catala Typecheck --check-invariants
 │   │                       ‾‾‾
 └─ Article
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -49,6 +49,6 @@ $ catala test-scope A
 │   │                       ‾‾‾
 └─ Article
 ┌─[RESULT]─
-│y = 1
+│ y = 1
 └─
 ```
diff --git a/tests/struct/good/nested3.catala_en b/tests/struct/good/nested3.catala_en
index 17436c2db..8f82bf2c4 100644
--- a/tests/struct/good/nested3.catala_en
+++ b/tests/struct/good/nested3.catala_en
@@ -39,24 +39,24 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│t = T { -- a: S { -- x: 0 -- y: false } -- b: S { -- x: 1 -- y: true } }
+│ t = T { -- a: S { -- x: 0 -- y: false } -- b: S { -- x: 1 -- y: true } }
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│out = 1
-│t = T { -- a: S { -- x: 0 -- y: false } -- b: S { -- x: 1 -- y: true } }
+│ out = 1
+│ t = T { -- a: S { -- x: 0 -- y: false } -- b: S { -- x: 1 -- y: true } }
 └─
 ```
diff --git a/tests/struct/good/same_name_fields.catala_en b/tests/struct/good/same_name_fields.catala_en
index 36aa0195f..9b6909d40 100644
--- a/tests/struct/good/same_name_fields.catala_en
+++ b/tests/struct/good/same_name_fields.catala_en
@@ -30,10 +30,10 @@ $ catala Typecheck --check-invariants
 │   │                       ‾‾‾
 └─ Article
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -49,7 +49,7 @@ $ catala test-scope A
 │   │                       ‾‾‾
 └─ Article
 ┌─[RESULT]─
-│x = Foo { -- f: 1 }
-│y = 1
+│ x = Foo { -- f: 1 }
+│ y = 1
 └─
 ```
diff --git a/tests/struct/good/simple.catala_en b/tests/struct/good/simple.catala_en
index 48fad35ef..5695498da 100644
--- a/tests/struct/good/simple.catala_en
+++ b/tests/struct/good/simple.catala_en
@@ -22,17 +22,17 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│s = S { -- x: 1 -- y: 2 }
-│z = 3
+│ s = S { -- x: 1 -- y: 2 }
+│ z = 3
 └─
 ```
diff --git a/tests/struct/good/struct_update.catala_en b/tests/struct/good/struct_update.catala_en
index c4d9a18db..98a79380a 100644
--- a/tests/struct/good/struct_update.catala_en
+++ b/tests/struct/good/struct_update.catala_en
@@ -42,10 +42,10 @@ $ catala test-scope S
 │    │                        ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 └─
 ┌─[RESULT]─
-│s1 = Str { -- fld1: 99 -- fld2: $1.00 -- fld3: 2003-01-01 }
-│s2 = Str { -- fld1: 0 -- fld2: $99.00 -- fld3: 2003-01-01 }
-│s3 = Str { -- fld1: 99 -- fld2: $99.00 -- fld3: 2099-01-01 }
-│s4 = Str { -- fld1: 100 -- fld2: $100.00 -- fld3: 2100-01-01 }
-│s5 = Str { -- fld1: 100 -- fld2: $99.00 -- fld3: 2100-01-01 }
+│ s1 = Str { -- fld1: 99 -- fld2: $1.00 -- fld3: 2003-01-01 }
+│ s2 = Str { -- fld1: 0 -- fld2: $99.00 -- fld3: 2003-01-01 }
+│ s3 = Str { -- fld1: 99 -- fld2: $99.00 -- fld3: 2099-01-01 }
+│ s4 = Str { -- fld1: 100 -- fld2: $100.00 -- fld3: 2100-01-01 }
+│ s5 = Str { -- fld1: 100 -- fld2: $99.00 -- fld3: 2100-01-01 }
 └─
 ```
diff --git a/tests/tuples/good/tuples.catala_en b/tests/tuples/good/tuples.catala_en
index 5576eeb49..f7d094fb1 100644
--- a/tests/tuples/good/tuples.catala_en
+++ b/tests/tuples/good/tuples.catala_en
@@ -34,16 +34,16 @@ scope Test:
 ```catala-test-inline
 $ catala typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope Test
 ┌─[RESULT]─
-│o = (2001-01-03, 6.0)
+│ o = (2001-01-03, 6.0)
 └─
 ```
diff --git a/tests/tuples/good/tuplists.catala_en b/tests/tuples/good/tuplists.catala_en
index 470c8dbf6..1d35971ea 100644
--- a/tests/tuples/good/tuplists.catala_en
+++ b/tests/tuples/good/tuplists.catala_en
@@ -44,49 +44,49 @@ scope S:
 ```catala-test-inline
 $ catala typecheck
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│r1 =
-│  [
-│    ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
-│    ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
-│    ($170.00, 0.833,333,333,333,333,333,33…)
-│  ]
-│r2 =
-│  [
-│    ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
-│    ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
-│    ($170.00, 0.833,333,333,333,333,333,33…)
-│  ]
-│r3 =
-│  [
-│    ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
-│    ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
-│    ($170.00, 0.833,333,333,333,333,333,33…)
-│  ]
-│r4 =
-│  [
-│    ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
-│    ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
-│    ($170.00, 0.833,333,333,333,333,333,33…)
-│  ]
-│r5 =
-│  [
-│    ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
-│    ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
-│    ($170.00, 0.833,333,333,333,333,333,33…)
-│  ]
-│r6 =
-│  [
-│    ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
-│    ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
-│    ($170.00, 0.833,333,333,333,333,333,33…)
-│  ]
+│ r1 =
+│   [
+│     ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
+│     ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
+│     ($170.00, 0.833,333,333,333,333,333,33…)
+│   ]
+│ r2 =
+│   [
+│     ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
+│     ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
+│     ($170.00, 0.833,333,333,333,333,333,33…)
+│   ]
+│ r3 =
+│   [
+│     ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
+│     ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
+│     ($170.00, 0.833,333,333,333,333,333,33…)
+│   ]
+│ r4 =
+│   [
+│     ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
+│     ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
+│     ($170.00, 0.833,333,333,333,333,333,33…)
+│   ]
+│ r5 =
+│   [
+│     ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
+│     ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
+│     ($170.00, 0.833,333,333,333,333,333,33…)
+│   ]
+│ r6 =
+│   [
+│     ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0);
+│     ($630.00, 1.826,086,956,521,739,130,4…); ($272.00, 0.68);
+│     ($170.00, 0.833,333,333,333,333,333,33…)
+│   ]
 └─
 ```
 
diff --git a/tests/typing/good/common.catala_en b/tests/typing/good/common.catala_en
index cb0802e06..ccdf053df 100644
--- a/tests/typing/good/common.catala_en
+++ b/tests/typing/good/common.catala_en
@@ -68,16 +68,16 @@ $ catala Typecheck --check-invariants
 │   │                         ‾‾‾‾
 └─
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala Typecheck --disable-warning
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
diff --git a/tests/typing/good/overload.catala_en b/tests/typing/good/overload.catala_en
index 82852d829..d4910b3a9 100644
--- a/tests/typing/good/overload.catala_en
+++ b/tests/typing/good/overload.catala_en
@@ -62,21 +62,21 @@ scope S:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope S
 ┌─[RESULT]─
-│o_b = true
-│o_d = [-13 days]
-│o_i = -5
-│o_m = -$5.75
-│o_t = 2022-01-24
-│o_x = 0.142,857,142,857,142,857,14…
+│ o_b = true
+│ o_d = [-13 days]
+│ o_i = -5
+│ o_m = -$5.75
+│ o_t = 2022-01-24
+│ o_x = 0.142,857,142,857,142,857,14…
 └─
 ```
diff --git a/tests/variable_state/good/simple.catala_en b/tests/variable_state/good/simple.catala_en
index 511f6557b..ec5d40a47 100644
--- a/tests/variable_state/good/simple.catala_en
+++ b/tests/variable_state/good/simple.catala_en
@@ -20,16 +20,16 @@ scope A:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│foo = 3
+│ foo = 3
 └─
 ```
diff --git a/tests/variable_state/good/state_access.catala_en b/tests/variable_state/good/state_access.catala_en
index f519482bd..b242fd3a8 100644
--- a/tests/variable_state/good/state_access.catala_en
+++ b/tests/variable_state/good/state_access.catala_en
@@ -26,7 +26,7 @@ scope A:
 ```catala-test-inline
 $ catala test-scope A
 ┌─[RESULT]─
-│bar = 5
-│foo = 6
+│ bar = 5
+│ foo = 6
 └─
 ```
diff --git a/tests/variable_state/good/subscope.catala_en b/tests/variable_state/good/subscope.catala_en
index e773ff965..cee51ef15 100644
--- a/tests/variable_state/good/subscope.catala_en
+++ b/tests/variable_state/good/subscope.catala_en
@@ -35,10 +35,10 @@ scope B:
 ```catala-test-inline
 $ catala Typecheck --check-invariants
 ┌─[RESULT]─
-│All invariant checks passed
+│ All invariant checks passed
 └─
 ┌─[RESULT]─
-│Typechecking successful!
+│ Typechecking successful!
 └─
 ```
 
@@ -57,7 +57,7 @@ let scope A (foo_bar: ⟨integer⟩|context) (foo_baz: integer|internal)
 ```catala-test-inline
 $ catala test-scope B
 ┌─[RESULT]─
-│foofoo = 4
-│foofoofoo = 6
+│ foofoo = 4
+│ foofoofoo = 6
 └─
 ```