diff --git a/src/test/java/org/studiorailgun/AnswerTests.java b/src/test/java/org/studiorailgun/AnswerTests.java
new file mode 100644
index 0000000..886720b
--- /dev/null
+++ b/src/test/java/org/studiorailgun/AnswerTests.java
@@ -0,0 +1,21 @@
+package org.studiorailgun;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.studiorailgun.conversation.evaluators.transfer.AnswerSynthesis;
+import org.studiorailgun.conversation.tracking.Quote;
+
+/**
+ * Answer queries
+ */
+public class AnswerTests {
+    
+    @Test
+    public void testAnswerQuery(){
+        Globals.init("./data/webs/test/web.json");
+        Quote result = AnswerSynthesis.evaluate(Globals.conversation, new Quote("What color is your hat?"));
+        assertEquals(result.getRaw().contains("Blue"), true);
+    }
+
+}
diff --git a/src/test/java/org/studiorailgun/QueryTests.java b/src/test/java/org/studiorailgun/QueryTests.java
index 6065ee1..8e9a8fd 100644
--- a/src/test/java/org/studiorailgun/QueryTests.java
+++ b/src/test/java/org/studiorailgun/QueryTests.java
@@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
 import org.studiorailgun.conversation.ConvAI;
+import org.studiorailgun.conversation.evaluators.query.QueryData;
+import org.studiorailgun.conversation.evaluators.query.QueryEval;
 import org.studiorailgun.conversation.tracking.Quote;
 
 /**
@@ -21,4 +23,13 @@ public class QueryTests {
         assertEquals(responseContainsBlue, true);
     }
 
+
+    @Test
+    public void testQueryEval(){
+        Globals.init("./data/webs/test/web.json");
+        QueryEval.evaluate(Globals.conversation, new Quote("What color is your hat?"));
+        QueryData queryData = Globals.conversation.getGoalData().getQueryData();
+        assertEquals(queryData.getRecentQueries().size(), 1);
+    }
+
 }