diff --git a/test/facts_test_open_file.1.expected.facts b/test/facts_test_open_file.1.expected.facts
index 86d47e7..ef473be 100644
--- a/test/facts_test_open_file.1.expected.facts
+++ b/test/facts_test_open_file.1.expected.facts
@@ -1,28 +1,28 @@
%{module: KC3.Facts.Dump,
version: 1}
-add {a, a, a}
-add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
-add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
-add {(S32) -65536, (S32) -65536, (S32) -65536}
add {(S16) -256, (S16) -256, (S16) -256}
+add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
add {(S8) -10, (S8) -10, (S8) -10}
add {(S8) -1, (S8) -1, (S8) -1}
-add {(U8) 0, (U8) 0, (U8) 0}
-add {(U8) 1, (U8) 1, (U8) 1}
-add {(U8) 10, (U8) 10, (U8) 10}
add {(U16) 256, (U16) 256, (U16) 256}
add {(U32) 65536, (U32) 65536, (U32) 65536}
add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
+add {(U8) 0, (U8) 0, (U8) 0}
+add {(U8) 1, (U8) 1, (U8) 1}
+add {(U8) 10, (U8) 10, (U8) 10}
+add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
+add {18446744073709551616, 18446744073709551616, 18446744073709551616}
add {[], [], []}
add {[[], []], [[], []], [[], []]}
add {"a", "a", "a"}
add {A, A, A}
add {:a, :a, :a}
-add {{a, b}, {a, b}, {a, b}}
add {{:a, :b}, {:a, :b}, {:a, :b}}
-add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
+add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
+add {{a, b}, {a, b}, {a, b}}
+add {a, a, a}
remove {"a", "a", "a"}
remove {:a, :a, :a}
remove {A, A, A}
diff --git a/test/facts_test_open_file.2.expected.facts b/test/facts_test_open_file.2.expected.facts
index 33ba6c6..8d8f348 100644
--- a/test/facts_test_open_file.2.expected.facts
+++ b/test/facts_test_open_file.2.expected.facts
@@ -1,48 +1,48 @@
%{module: KC3.Facts.Dump,
version: 1}
-add {a, a, a}
-add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
-add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
-add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S16) -257, (S16) -257, (S16) -257}
add {(S16) -256, (S16) -256, (S16) -256}
+add {(S32) -65537, (S32) -65537, (S32) -65537}
+add {(S32) -65536, (S32) -65536, (S32) -65536}
+add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
+add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
+add {(S8) -11, (S8) -11, (S8) -11}
add {(S8) -10, (S8) -10, (S8) -10}
+add {(S8) -2, (S8) -2, (S8) -2}
add {(S8) -1, (S8) -1, (S8) -1}
-add {(U8) 0, (U8) 0, (U8) 0}
-add {(U8) 1, (U8) 1, (U8) 1}
-add {(U8) 10, (U8) 10, (U8) 10}
add {(U16) 256, (U16) 256, (U16) 256}
+add {(U16) 257, (U16) 257, (U16) 257}
add {(U32) 65536, (U32) 65536, (U32) 65536}
+add {(U32) 65537, (U32) 65537, (U32) 65537}
add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
-add {[], [], []}
-add {[[], []], [[], []], [[], []]}
-add {"a", "a", "a"}
-add {A, A, A}
-add {:a, :a, :a}
-add {{a, b}, {a, b}, {a, b}}
-add {{:a, :b}, {:a, :b}, {:a, :b}}
-add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
-add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
-add {b, b, b}
-add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
-add {18446744073709551617, 18446744073709551617, 18446744073709551617}
-add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
-add {(S32) -65537, (S32) -65537, (S32) -65537}
-add {(S16) -257, (S16) -257, (S16) -257}
-add {(S8) -11, (S8) -11, (S8) -11}
-add {(S8) -2, (S8) -2, (S8) -2}
+add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
+add {(U8) 0, (U8) 0, (U8) 0}
+add {(U8) 1, (U8) 1, (U8) 1}
add {(U8) 2, (U8) 2, (U8) 2}
add {(U8) 3, (U8) 3, (U8) 3}
+add {(U8) 10, (U8) 10, (U8) 10}
add {(U8) 11, (U8) 11, (U8) 11}
-add {(U16) 257, (U16) 257, (U16) 257}
-add {(U32) 65537, (U32) 65537, (U32) 65537}
-add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
-add {[[] | []], [[] | []], [[] | []]}
-add {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
+add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
+add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
+add {18446744073709551616, 18446744073709551616, 18446744073709551616}
+add {18446744073709551617, 18446744073709551617, 18446744073709551617}
+add {[], [], []}
+add {[[]], [[]], [[]]}
+add {[[], []], [[], []], [[], []]}
+add {[[[]], []], [[[]], []], [[[]], []]}
+add {"a", "a", "a"}
add {"b", "b", "b"}
+add {A, A, A}
add {B, B, B}
+add {:a, :a, :a}
add {:b, :b, :b}
-add {{b, b}, {b, b}, {b, b}}
+add {{:a, :b}, {:a, :b}, {:a, :b}}
add {{:b, :b}, {:b, :b}, {:b, :b}}
-add {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
+add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
add {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
+add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
+add {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
+add {{a, b}, {a, b}, {a, b}}
+add {{b, b}, {b, b}, {b, b}}
+add {a, a, a}
+add {b, b, b}
diff --git a/test/facts_test_open_file.3.expected.facts b/test/facts_test_open_file.3.expected.facts
index fe6374a..9d99c50 100644
--- a/test/facts_test_open_file.3.expected.facts
+++ b/test/facts_test_open_file.3.expected.facts
@@ -1,97 +1,5 @@
%{module: KC3.Facts.Dump,
version: 1}
-add {a, a, a}
-add {-18446744073709551616, -18446744073709551616, -18446744073709551616}
-add {18446744073709551616, 18446744073709551616, 18446744073709551616}
-add {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
-add {(S32) -65536, (S32) -65536, (S32) -65536}
-add {(S16) -256, (S16) -256, (S16) -256}
-add {(S8) -10, (S8) -10, (S8) -10}
-add {(S8) -1, (S8) -1, (S8) -1}
-add {(U8) 0, (U8) 0, (U8) 0}
-add {(U8) 1, (U8) 1, (U8) 1}
-add {(U8) 10, (U8) 10, (U8) 10}
-add {(U16) 256, (U16) 256, (U16) 256}
-add {(U32) 65536, (U32) 65536, (U32) 65536}
-add {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
-add {[], [], []}
-add {[[], []], [[], []], [[], []]}
-add {"a", "a", "a"}
-add {A, A, A}
-add {:a, :a, :a}
-add {{a, b}, {a, b}, {a, b}}
-add {{:a, :b}, {:a, :b}, {:a, :b}}
-add {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
-add {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
-add {b, b, b}
-add {-18446744073709551617, -18446744073709551617, -18446744073709551617}
-add {18446744073709551617, 18446744073709551617, 18446744073709551617}
-add {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
-add {(S32) -65537, (S32) -65537, (S32) -65537}
-add {(S16) -257, (S16) -257, (S16) -257}
-add {(S8) -11, (S8) -11, (S8) -11}
-add {(S8) -2, (S8) -2, (S8) -2}
-add {(U8) 2, (U8) 2, (U8) 2}
-add {(U8) 3, (U8) 3, (U8) 3}
-add {(U8) 11, (U8) 11, (U8) 11}
-add {(U16) 257, (U16) 257, (U16) 257}
-add {(U32) 65537, (U32) 65537, (U32) 65537}
-add {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
-add {[[] | []], [[] | []], [[] | []]}
-add {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
-add {"b", "b", "b"}
-add {B, B, B}
-add {:b, :b, :b}
-add {{b, b}, {b, b}, {b, b}}
-add {{:b, :b}, {:b, :b}, {:b, :b}}
-add {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
-add {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
-remove {a, a, a}
-remove {-18446744073709551616, -18446744073709551616, -18446744073709551616}
-remove {18446744073709551616, 18446744073709551616, 18446744073709551616}
-remove {(S64) -4294967296, (S64) -4294967296, (S64) -4294967296}
-remove {(S32) -65536, (S32) -65536, (S32) -65536}
-remove {(S16) -256, (S16) -256, (S16) -256}
-remove {(S8) -10, (S8) -10, (S8) -10}
-remove {(S8) -1, (S8) -1, (S8) -1}
-remove {(U8) 0, (U8) 0, (U8) 0}
-remove {(U8) 1, (U8) 1, (U8) 1}
-remove {(U8) 10, (U8) 10, (U8) 10}
-remove {(U16) 256, (U16) 256, (U16) 256}
-remove {(U32) 65536, (U32) 65536, (U32) 65536}
-remove {(U64) 4294967296, (U64) 4294967296, (U64) 4294967296}
-remove {[], [], []}
-remove {[[], []], [[], []], [[], []]}
-remove {"a", "a", "a"}
-remove {A, A, A}
-remove {:a, :a, :a}
-remove {{a, b}, {a, b}, {a, b}}
-remove {{:a, :b}, {:a, :b}, {:a, :b}}
-remove {{{a, b}, {c, d}}, {{a, b}, {c, d}}, {{a, b}, {c, d}}}
-remove {{{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}, {{:a, :b}, {:c, :d}}}
-remove {b, b, b}
-remove {-18446744073709551617, -18446744073709551617, -18446744073709551617}
-remove {18446744073709551617, 18446744073709551617, 18446744073709551617}
-remove {(S64) -4294967297, (S64) -4294967297, (S64) -4294967297}
-remove {(S32) -65537, (S32) -65537, (S32) -65537}
-remove {(S16) -257, (S16) -257, (S16) -257}
-remove {(S8) -11, (S8) -11, (S8) -11}
-remove {(S8) -2, (S8) -2, (S8) -2}
-remove {(U8) 2, (U8) 2, (U8) 2}
-remove {(U8) 3, (U8) 3, (U8) 3}
-remove {(U8) 11, (U8) 11, (U8) 11}
-remove {(U16) 257, (U16) 257, (U16) 257}
-remove {(U32) 65537, (U32) 65537, (U32) 65537}
-remove {(U64) 4294967297, (U64) 4294967297, (U64) 4294967297}
-remove {[[] | []], [[] | []], [[] | []]}
-remove {[[[] | []], []], [[[] | []], []], [[[] | []], []]}
-remove {"b", "b", "b"}
-remove {B, B, B}
-remove {:b, :b, :b}
-remove {{b, b}, {b, b}, {b, b}}
-remove {{:b, :b}, {:b, :b}, {:b, :b}}
-remove {{{b, b}, {c, d}}, {{b, b}, {c, d}}, {{b, b}, {c, d}}}
-remove {{{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}, {{:b, :b}, {:c, :d}}}
add {"a", "a", "a"}
add {:a, :a, :a}
add {A, A, A}