1 files changed, 11 insertions, 11 deletions

diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
index 0cda22df..a61e2b65 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
@@ -1,8 +1,8 @@
 package tools.refinery.store.query.tests;
 
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.Dnf;
-import tools.refinery.store.query.Variable;
+import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.KeyOnlyRelationView;
 import tools.refinery.store.representation.Symbol;
 
@@ -14,8 +14,8 @@ import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo
 class StructurallyEqualToTest {
         @Test
         void flatEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -27,8 +27,8 @@ class StructurallyEqualToTest {
 
         @Test
         void flatNotEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -41,8 +41,8 @@ class StructurallyEqualToTest {
 
         @Test
         void deepEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -58,8 +58,8 @@ class StructurallyEqualToTest {
 
         @Test
         void deepNotEqualsTest() {
-                var p = new Variable("p");
-                var q = new Variable("q");
+                var p = Variable.of("p");
+                var q = Variable.of("q");
                 var person = new Symbol<>("Person", 1, Boolean.class, false);
                 var personView = new KeyOnlyRelationView<>(person);
 
@@ -72,6 +72,6 @@ class StructurallyEqualToTest {
 
                 var assertion = structurallyEqualTo(expected);
                 var error = assertThrows(AssertionError.class, () -> assertThat(actual, assertion));
-                assertThat(error.getMessage(), containsString(" called from Expected "));
+                assertThat(error.getMessage(), containsString(" called from Expected/1 "));
         }
 }