2 files changed, 29 insertions, 59 deletions
diff --git a/test/golden/russell/parsing.golden b/test/golden/russell/parsing.golden
index 8e680cd..3ab466f 100644
--- a/test/golden/russell/parsing.golden
+++ b/test/golden/russell/parsing.golden
@@ -266,62 +266,37 @@
                     ( Location
                         { locFile = "test/examples/russell.tex"
                         , locLine = 14
-                        , locColumn = 5
+                        , locColumn = 6
                         }
                     ) Nothing
-                    ( StmtConnected
-                        { conn = Equivalence
-                        , mloc = Nothing
-                        , stmt1 = StmtFormula
-                            { formula = FormulaChain
-                                ( ChainBase
-                                    ( ExprVar
-                                        ( NamedVar "R" ) :| []
-                                    ) Positive
-                                    ( Relation
-                                        ( Location
-                                            { locFile = "test/examples/russell.tex"
-                                            , locLine = 14
-                                            , locColumn = 12
-                                            }
-                                        )
-                                        ( RelationSymbol
-                                            ( Command "in" )
-                                            ( ParameterArity 0 )
-                                            ( Marker "elem" )
-                                        ) []
-                                    )
-                                    ( ExprVar
-                                        ( NamedVar "R" ) :| []
+                    ( StmtFormula
+                        { formula = FormulaChain
+                            ( ChainBase
+                                ( ExprVar
+                                    ( NamedVar "R" ) :| []
+                                ) Positive
+                                ( Relation
+                                    ( Location
+                                        { locFile = "test/examples/russell.tex"
+                                        , locLine = 14
+                                        , locColumn = 7
+                                        }
                                     )
+                                    ( RelationSymbol
+                                        ( Command "in" )
+                                        ( ParameterArity 0 )
+                                        ( Marker "elem" )
+                                    ) []
                                 )
-                            }
-                        , stmt2 = StmtFormula
-                            { formula = FormulaChain
-                                ( ChainBase
-                                    ( ExprVar
-                                        ( NamedVar "R" ) :| []
-                                    ) Negative
-                                    ( Relation
-                                        ( Location
-                                            { locFile = "test/examples/russell.tex"
-                                            , locLine = 14
-                                            , locColumn = 29
-                                            }
-                                        )
-                                        ( RelationSymbol
-                                            ( Command "in" )
-                                            ( ParameterArity 0 )
-                                            ( Marker "elem" )
-                                        ) []
-                                    )
-                                    ( ExprVar
-                                        ( NamedVar "R" ) :| []
-                                    )
+                                ( ExprVar
+                                    ( NamedVar "V" ) :| []
                                 )
-                            }
+                            )
                         }
-                    ) JustificationEmpty
+                    )
+                    ( JustificationRef
+                        ( Marker "universal_set" :| [] )
+                    )
                     ( Contradiction
                         ( Location
                             { locFile = "test/examples/russell.tex"
diff --git a/test/golden/russell/tokenizing.golden b/test/golden/russell/tokenizing.golden
index beba3ee..9a739f8 100644
--- a/test/golden/russell/tokenizing.golden
+++ b/test/golden/russell/tokenizing.golden
@@ -65,19 +65,14 @@
     , VisibleBraceR
     , EndEnv "math"
     , Symbol "."
-    , Word "then"
     , BeginEnv "math"
     , Variable "R"
     , Command "in"
-    , Variable "R"
-    , EndEnv "math"
-    , Word "iff"
-    , BeginEnv "math"
-    , Variable "R"
-    , Command "not"
-    , Command "in"
-    , Variable "R"
+    , Variable "V"
     , EndEnv "math"
+    , Word "by"
+    , Ref
+        ( "universal_set" :| [] )
     , Symbol "."
     , Word "contradiction"
     , Symbol "."