diff --git a/tests/data/agreement/agr1.ccl b/tests/data/agreement/agr1.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..ac652a8ba889462836a74398554e062f0c2f3261
--- /dev/null
+++ b/tests/data/agreement/agr1.ccl
@@ -0,0 +1,43 @@
+tagset=kipi
+sentence=mamut.xml
+---
+position=0
+agr(-1,1,{nmb,gnd,cas})
+
+True
+---
+position=1
+agr(-1,1,{nmb,gnd,cas})
+
+True
+---
+position=2
+agr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=3
+agr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=4
+agr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=5
+agr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=6
+agr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=7
+agr(-1,1,{nmb,gnd,cas})
+
+False
+---
diff --git a/tests/data/agreement/agrflt1.ccl b/tests/data/agreement/agrflt1.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..bdafc20dea0767e99655aaf00e20a6b5f52305aa
--- /dev/null
+++ b/tests/data/agreement/agrflt1.ccl
@@ -0,0 +1,48 @@
+tagset=kipi
+sentence=mamut.xml
+---
+position=0
+agrflt(-1,1,{nmb,gnd,cas},{cas})
+
+{nom,acc,voc}
+---
+position=1
+agrflt(-1,1,{nmb,gnd,cas},{cas})
+
+{nom}
+---
+position=2
+agrflt(-1,1,{nmb,gnd,cas},{cas})
+
+{}
+---
+position=0
+agrflt(-1,1,{nmb,gnd},{nmb})
+
+{sg}
+---
+position=1
+agrflt(-1,1,{nmb,gnd},{nmb})
+
+{sg}
+---
+position=2
+agrflt(-1,1,{nmb,gnd},{nmb})
+
+{sg}
+---
+position=3
+agrflt(-1,1,{nmb,gnd},{nmb})
+
+{}
+---
+position=4
+agrflt(-1,1,{nmb,gnd},{nmb})
+
+{}
+---
+position=5
+agrflt(-1,1,{nmb,gnd},{nmb})
+
+{sg}
+---
diff --git a/tests/data/agreement/agrpp1.ccl b/tests/data/agreement/agrpp1.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..951983d399dd060f206f6846c49857a01ff7c106
--- /dev/null
+++ b/tests/data/agreement/agrpp1.ccl
@@ -0,0 +1,43 @@
+tagset=kipi
+sentence=mamut.xml
+---
+position=0
+agrpp(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=1
+agrpp(-1,1,{nmb,gnd,cas})
+
+True
+---
+position=2
+agrpp(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=3
+agrpp(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=4
+agrpp(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=5
+agrpp(-1,1,{nmb,gnd,cas})
+
+True
+---
+position=6
+agrpp(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=7
+agrpp(-1,1,{nmb,gnd,cas})
+
+False
+---
diff --git a/tests/data/agreement/agrpp2.ccl b/tests/data/agreement/agrpp2.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..aaa07283bfbd103768e2996311bf78d1a27f282f
--- /dev/null
+++ b/tests/data/agreement/agrpp2.ccl
@@ -0,0 +1,43 @@
+tagset=kipi
+sentence=mamut.xml
+---
+position=0
+agrpp(0,1,{nmb,gnd,nom})
+
+True
+---
+position=1
+agrpp(0,1,{nmb,gnd,nom})
+
+True
+---
+position=2
+agrpp(0,1,{nmb,gnd,nom})
+
+False
+---
+position=3
+agrpp(0,1,{nmb,gnd,nom})
+
+False
+---
+position=4
+agrpp(0,1,{nmb,gnd,nom})
+
+False
+---
+position=5
+agrpp(0,1,{nmb,gnd,nom})
+
+False
+---
+position=6
+agrpp(0,1,{nmb,gnd,nom})
+
+False
+---
+position=7
+agrpp(0,1,{nmb,gnd,nom})
+
+False
+---
diff --git a/tests/data/agreement/mamut.xml b/tests/data/agreement/mamut.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04883a30afe990e7a3b1bed6138297d05c185374
--- /dev/null
+++ b/tests/data/agreement/mamut.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE cesAna SYSTEM "xcesAnaIPI.dtd">
+<cesAna xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" type="lex disamb">
+<chunkList>
+ <chunk>
+  <chunk type="s">
+   <tok>
+    <orth>Wielki</orth>
+    <lex><base>wielki</base><ctag>adj:sg:nom:m1:pos</ctag></lex>
+    <lex><base>wielki</base><ctag>adj:sg:voc:m1:pos</ctag></lex>
+    <lex><base>wielki</base><ctag>adj:sg:nom:m2:pos</ctag></lex>
+    <lex><base>wielki</base><ctag>adj:sg:voc:m2:pos</ctag></lex>
+    <lex><base>wielki</base><ctag>adj:sg:nom:m3:pos</ctag></lex>
+    <lex><base>wielki</base><ctag>adj:sg:acc:m3:pos</ctag></lex>
+   </tok>
+   <tok>
+    <orth>włochaty</orth>
+    <lex><base>włochaty</base><ctag>adj:sg:nom:m1:pos</ctag></lex>
+    <lex><base>włochaty</base><ctag>adj:sg:voc:m1:pos</ctag></lex>
+    <lex><base>włochaty</base><ctag>adj:sg:nom:m2:pos</ctag></lex>
+    <lex><base>włochaty</base><ctag>adj:sg:voc:m2:pos</ctag></lex>
+    <lex><base>włochaty</base><ctag>adj:sg:nom:m3:pos</ctag></lex>
+    <lex><base>włochaty</base><ctag>adj:sg:acc:m3:pos</ctag></lex>
+   </tok>
+   <tok>
+    <orth>mamut</orth>
+    <lex><base>mamut</base><ctag>subst:sg:nom:m2</ctag></lex>
+   </tok>
+   <tok>
+    <orth>zjadł</orth>
+    <lex><base>zjeść</base><ctag>praet:sg:m1:perf</ctag></lex>
+    <lex><base>zjeść</base><ctag>praet:sg:m2:perf</ctag></lex>
+    <lex><base>zjeść</base><ctag>praet:sg:m3:perf</ctag></lex>
+   </tok>
+   <tok>
+    <orth>kość</orth>
+    <lex><base>kość</base><ctag>subst:sg:nom:f</ctag></lex>
+    <lex><base>kość</base><ctag>subst:sg:acc:f</ctag></lex>
+   </tok>
+   <tok>
+    <orth>nawet</orth>
+    <lex><base>nawet</base><ctag>qub</ctag></lex>
+   </tok>
+   <tok>
+    <orth>smacznÄ…</orth>
+    <lex><base>smaczny</base><ctag>adj:sg:acc:f:pos</ctag></lex>
+    <lex><base>smaczny</base><ctag>adj:sg:inst:f:pos</ctag></lex>
+   </tok>
+   <ns/>
+   <tok>
+    <orth>.</orth>
+    <lex><base>.</base><ctag>interp</ctag></lex>
+   </tok>
+  </chunk>
+ </chunk>
+</chunkList>
+</cesAna>
diff --git a/tests/data/agreement/wagr1.ccl b/tests/data/agreement/wagr1.ccl
new file mode 100644
index 0000000000000000000000000000000000000000..ec859488c3da2850c33450a537b4e7a55ba713b6
--- /dev/null
+++ b/tests/data/agreement/wagr1.ccl
@@ -0,0 +1,43 @@
+tagset=kipi
+sentence=mamut.xml
+---
+position=0
+wagr(-1,1,{nmb,gnd,cas})
+
+True
+---
+position=1
+wagr(-1,1,{nmb,gnd,cas})
+
+True
+---
+position=2
+wagr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=3
+wagr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=4
+wagr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=5
+wagr(-1,1,{nmb,gnd,cas})
+
+True
+---
+position=6
+wagr(-1,1,{nmb,gnd,cas})
+
+False
+---
+position=7
+wagr(-1,1,{nmb,gnd,cas})
+
+False
+---
diff --git a/tests/data/sentence.ccl b/tests/data/sentence.ccl
index ab8fe6ae3c166eaa2780d6bd14c7964764b474b1..b2533fb7a4a4cd6d6c9d15e05647086d9f3d320a 100644
--- a/tests/data/sentence.ccl
+++ b/tests/data/sentence.ccl
@@ -1,11 +1,37 @@
 sentence=t01.xml
 ---
-orth[0]
+orth[0] // to tylko[0] komentarz orth[1]
 
 ["Uważam"]
 ---
 position=2
+ /* a to też komentarz
+orhth[3]
+*/
 orth[0]
+/* i tu
+orth[4]
+*/
 
 ["że"]
+---
+position=0
+base[0]
 
+["uważać"]
+---
+position=0
+base[7]
+
+["lub", "lubić"]
+---
+position=0
+base[end]
+
+["."]
+---
+position=0
+base[end+1]
+
+[]
+---