5 files changed, 24 insertions, 20 deletions

diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java
index ad57a438..9e4c59f5 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedArgument.java
@@ -2,13 +2,13 @@ package tools.refinery.language.model.tests.utils;
 
 import tools.refinery.language.model.problem.*;
 
-public record WrappedArgument(Argument argument) {
-        public Argument get() {
-                return argument;
+public record WrappedArgument(Expr expr) {
+        public Expr get() {
+                return expr;
         }
 
         public VariableOrNode variableOrNode() {
-                return ((VariableOrNodeArgument) argument).getVariableOrNode();
+                return ((VariableOrNodeExpr) expr).getVariableOrNode();
         }
 
         public Variable variable() {
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java
index 2282198d..4aa71b99 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedLiteral.java
@@ -1,20 +1,20 @@
 package tools.refinery.language.model.tests.utils;
 
 import tools.refinery.language.model.problem.Atom;
-import tools.refinery.language.model.problem.Literal;
-import tools.refinery.language.model.problem.NegativeLiteral;
+import tools.refinery.language.model.problem.Expr;
+import tools.refinery.language.model.problem.NegationExpr;
 
-public record WrappedLiteral(Literal literal) {
-        public Literal get() {
-                return literal;
+public record WrappedLiteral(Expr expr) {
+        public Expr get() {
+                return expr;
         }
-        
+
         public WrappedAtom atom() {
-                return new WrappedAtom((Atom) literal);
+                return new WrappedAtom((Atom) expr);
         }
 
         public WrappedAtom negated() {
-                return new WrappedAtom(((NegativeLiteral) literal).getAtom());
+                return new WrappedAtom((Atom) ((NegationExpr) expr).getBody());
         }
 
         public WrappedArgument arg(int i) {
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java
index b390051a..c2f18a60 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedParametricDefinition.java
@@ -4,13 +4,9 @@ import tools.refinery.language.model.problem.Parameter;
 import tools.refinery.language.model.problem.ParametricDefinition;
 
 public interface WrappedParametricDefinition {
-        public ParametricDefinition get();
-        
-        public default Parameter param(int i) {
-                return get().getParameters().get(i);
-        }
+        ParametricDefinition get();
 
-        public default WrappedConjunction conj(int i) {
-                return new WrappedConjunction(get().getBodies().get(i));
+        default Parameter param(int i) {
+                return get().getParameters().get(i);
         }
 }
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java
index 6b07366d..7b95ecc1 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedPredicateDefinition.java
@@ -8,4 +8,8 @@ public record WrappedPredicateDefinition(PredicateDefinition predicateDefinition
         public PredicateDefinition get() {
                 return predicateDefinition;
         }
+
+        public WrappedConjunction conj(int i) {
+                return new WrappedConjunction(predicateDefinition.getBodies().get(i));
+        }
 }
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java
index b9f299f6..a4cf2eaf 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedRuleDefinition.java
@@ -7,7 +7,11 @@ public record WrappedRuleDefinition(RuleDefinition ruleDefinition) implements Wr
         public RuleDefinition get() {
                 return ruleDefinition;
         }
-        
+
+        public WrappedConjunction conj(int i) {
+                return new WrappedConjunction(ruleDefinition.getPreconditions().get(i));
+        }
+
         public WrappedConsequent consequent(int i) {
                 return new WrappedConsequent(ruleDefinition.getConsequents().get(i));
         }