diff --git a/test/built-in/age.n3s b/test/built-in/age.n3s
index 6337850..46cda98 100644
--- a/test/built-in/age.n3s
+++ b/test/built-in/age.n3s
@@ -23,7 +23,7 @@
 
 # query
 () log:onNegativeSurface {
-    :patH :ageAbove "P75Y"^^xsd:duration.
+    :patH :ageAbove "P80Y"^^xsd:duration.
     () log:onNegativeAnswerSurface {
         :test :is true.
     }.
diff --git a/test/functional/peano.n3s b/test/functional/peano.n3s
deleted file mode 100644
index f6ddb1d..0000000
--- a/test/functional/peano.n3s
+++ /dev/null
@@ -1,76 +0,0 @@
-# ----------------
-# Peano arithmetic
-# ----------------
-#
-# See https://en.wikipedia.org/wiki/Peano_axioms
-
-@prefix log: <http://www.w3.org/2000/10/swap/log#>.
-@prefix : <urn:example:>.
-
-# declare components
-:add a log:Component.
-:multiply a log:Component.
-:factorial a log:Component.
-:fac a log:Component.
-
-# add
-(_:A) log:onNegativeSurface {
-    () log:onNegativeSurface {
-        (_:A 0) :add _:A.
-    }.
-}.
-
-(_:A _:B _:C) log:onNegativeSurface {
-    () log:onNegativeSurface {
-        (_:A (| :s _:B |)) :add (| :s _:C |).
-    }.
-    (_:A _:B) :add _:C.
-}.
-
-# multiply
-(_:A) log:onNegativeSurface {
-    () log:onNegativeSurface {
-        (_:A 0) :multiply 0.
-    }.
-}.
-
-(_:A _:B _:C _:D) log:onNegativeSurface {
-    () log:onNegativeSurface {
-        (_:A (| :s _:B |)) :multiply _:C.
-    }.
-    (_:A _:B) :multiply _:D.
-    (_:A _:D) :add _:C.
-}.
-
-# factorial
-(_:A _:B) log:onNegativeSurface {
-    () log:onNegativeSurface {
-        _:A :factorial _:B.
-    }.
-    (_:A (| :s 0 |)) :fac _:B.
-}.
-
-(_:A) log:onNegativeSurface {
-    () log:onNegativeSurface {
-        (0 _:A) :fac _:A.
-    }.
-}.
-
-(_:A _:B _:C _:D) log:onNegativeSurface {
-    () log:onNegativeSurface {
-        ((| :s _:A |) _:B) :fac _:C.
-    }.
-    (_:B (| :s _:A |)) :multiply _:D.
-    (_:A _:D) :fac _:C.
-}.
-
-# question
-(_:A _:B _:C) log:onNegativeSurface {
-    ((| :s 0 |) (| :s (| :s 0 |) |)) :add _:A.
-    (_:A (| :s (| :s 0 |) |)) :multiply _:B.
-    _:B :factorial _:C.
-    _:C log:equalTo (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s (| :s 0 |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |) |).
-    () log:onNegativeAnswerSurface {
-        :test :is true.
-    }.
-}.
diff --git a/test/functional/cobbler.n3s b/test/pure/cobbler.n3s
similarity index 87%
rename from test/functional/cobbler.n3s
rename to test/pure/cobbler.n3s
index 970544e..99e3826 100644
--- a/test/functional/cobbler.n3s
+++ b/test/pure/cobbler.n3s
@@ -6,11 +6,11 @@
 @prefix : <urn:example:>.
 
 # some x is a good cobbler
-_:x :is (| :good :Cobbler |).
+_:x :is (:good :Cobbler).
 
 # is there some x which is good at some y
 (_:x _:y) log:onNegativeSurface {
-    _:x :is (| :good _:y |).
+    _:x :is (:good _:y).
     () log:onNegativeAnswerSurface {
         :test :is true.
     }.
diff --git a/test/pure/peano.n3s b/test/pure/peano.n3s
new file mode 100644
index 0000000..8997729
--- /dev/null
+++ b/test/pure/peano.n3s
@@ -0,0 +1,76 @@
+# ----------------
+# Peano arithmetic
+# ----------------
+#
+# See https://en.wikipedia.org/wiki/Peano_axioms
+
+@prefix log: <http://www.w3.org/2000/10/swap/log#>.
+@prefix : <urn:example:>.
+
+# declare components
+:add a log:Component.
+:multiply a log:Component.
+:factorial a log:Component.
+:fac a log:Component.
+
+# add
+(_:A) log:onNegativeSurface {
+    () log:onNegativeSurface {
+        (_:A 0) :add _:A.
+    }.
+}.
+
+(_:A _:B _:C) log:onNegativeSurface {
+    () log:onNegativeSurface {
+        (_:A (:s _:B)) :add (:s _:C).
+    }.
+    (_:A _:B) :add _:C.
+}.
+
+# multiply
+(_:A) log:onNegativeSurface {
+    () log:onNegativeSurface {
+        (_:A 0) :multiply 0.
+    }.
+}.
+
+(_:A _:B _:C _:D) log:onNegativeSurface {
+    () log:onNegativeSurface {
+        (_:A (:s _:B)) :multiply _:C.
+    }.
+    (_:A _:B) :multiply _:D.
+    (_:A _:D) :add _:C.
+}.
+
+# factorial
+(_:A _:B) log:onNegativeSurface {
+    () log:onNegativeSurface {
+        _:A :factorial _:B.
+    }.
+    (_:A (:s 0)) :fac _:B.
+}.
+
+(_:A) log:onNegativeSurface {
+    () log:onNegativeSurface {
+        (0 _:A) :fac _:A.
+    }.
+}.
+
+(_:A _:B _:C _:D) log:onNegativeSurface {
+    () log:onNegativeSurface {
+        ((:s _:A) _:B) :fac _:C.
+    }.
+    (_:B (:s _:A)) :multiply _:D.
+    (_:A _:D) :fac _:C.
+}.
+
+# question
+(_:A _:B _:C) log:onNegativeSurface {
+    ((:s 0) (:s (:s 0))) :add _:A.
+    (_:A (:s (:s 0))) :multiply _:B.
+    _:B :factorial _:C.
+    _:C log:equalTo (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s (:s 0)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).
+    () log:onNegativeAnswerSurface {
+        :test :is true.
+    }.
+}.