diff --git a/naive-nlu/tree_nlu/tests/basic.py b/naive-nlu/tree_nlu/tests/basic.py
index 76f9e07..4038bc6 100644
--- a/naive-nlu/tree_nlu/tests/basic.py
+++ b/naive-nlu/tree_nlu/tests/basic.py
@@ -110,15 +110,15 @@ base_knowledge = {
 }
 
 def test_assumption(expectedResponse, knowledge, query):
-    session().log("Query: {}".format(query['text']))
-    session().annotate("Expected: {}".format(expectedResponse))
+    with session().log(query['text']):
+        session().annotate("Expected: {}".format(expectedResponse))
 
-    result, abstract_tree, diff = knowledge.process(query['text'])
-    end_result = result.getter() if is_modifiable_property(result) else result
+        result, abstract_tree, diff = knowledge.process(query['text'])
+        end_result = result.getter() if is_modifiable_property(result) else result
 
-    session().annotate("Result: {}".format(end_result))
-    if end_result != expectedResponse:
-        raise AssertionError('{} is not {}'.format(end_result, expectedResponse))
+        session().annotate("Result: {}".format(end_result))
+        if end_result != expectedResponse:
+            raise AssertionError('{} is not {}'.format(end_result, expectedResponse))
 
 def main():
     knowledge = KnowledgeBase(
diff --git a/naive-nlu/tree_nlu/tests/gac_extension.py b/naive-nlu/tree_nlu/tests/gac_extension.py
index 8a9e8c0..5aae0a2 100644
--- a/naive-nlu/tree_nlu/tests/gac_extension.py
+++ b/naive-nlu/tree_nlu/tests/gac_extension.py
@@ -1,16 +1,20 @@
 from ..knowledge_base import KnowledgeBase
+from ..session.org_mode import global_session as session
 
 from . import gac_100
 
 
 def ask_then_learn_test(knowledge: KnowledgeBase):
-    ret, _, _ = knowledge.process("is icecream blue?")
-    assert(ret is False)
+    with session().log("is icecream blue?"):
+        ret, _, _ = knowledge.process("is icecream blue?")
+        assert(ret is False)
 
-    ret, _, _ = knowledge.process("icecream is blue")
+    with session().log("icecream is blue"):
+        ret, _, _ = knowledge.process("icecream is blue")
 
-    ret, _, _ = knowledge.process("is icecream blue?")
-    assert(ret is True)
+    with session().log("is icecream blue?"):
+        ret, _, _ = knowledge.process("is icecream blue?")
+        assert(ret is True)
 
     return knowledge