diff --git a/t/sort_tokens.t b/t/sort_tokens.t
index 0db2c59..d3de475 100644
--- a/t/sort_tokens.t
+++ b/t/sort_tokens.t
@@ -11,50 +11,50 @@
 ok(my $mtt = KorAP::XML::Index::MultiTermToken->new, 'New token');
 ok(defined $mtt->set_o_start(0), 'Set start character offset');
 ok($mtt->set_o_end(5), 'Set end character offset');
-ok($mtt->add(term => '@:k=N',
-	     pti => 128,
-	     payload =>'<s>9'), 'Add token');
-ok($mtt->add(term => 'a=N',
-	     pti => 129,
-	     payload =>'<b>144'), 'Add token');
-ok($mtt->add(term => '<>:b=N',
-	     pti => 64,
-	     o_start => 0,
-	     o_end => 5,
-	     p_end => 5), 'Add token');
-ok($mtt->add(term => 'c=N',
-	     pti => 129,
-	     payload => '<b>144'), 'Add token');
-ok($mtt->add(term => '<>:d=N',
-	     pti => 64,
-	     o_start => 0,
-	     o_end => 5,
-	     p_end => 6,
-	     payload => '<b>7'), 'Add token');
-ok($mtt->add(term => '@:j=N',
-	     pti => 16,
-	     payload =>'<s>8'), 'Add token');
-ok($mtt->add(term => '<>:e=ADJ',
-	     pti => 64,
-	     o_start => 0,
-	     o_end => 5,
-	     p_end => 6,
-	     payload => '<b>6'), 'Add token');
-ok($mtt->add(term => '<>:f=N',
-	     pti => 64,
-	     o_start => 0,
-	     o_end => 5,
-	     p_end => 6,
-	     payload => '<b>5<b>122'), 'Add token');
-ok($mtt->add(term => 'g=N',
-	     pti => 129,
-	     payload =>'<b>144'), 'Add token');
-ok($mtt->add(term => '@:h=N',
-	     pti => 16,
-	     payload =>'<s>5'), 'Add token');
-ok($mtt->add(term => '@:i=N',
-	     pti => 16,
-	     payload =>'<s>3'), 'Add token');
+ok(my $mt = $mtt->add_by_term('@:k=N'), 'Add token');
+$mt->set_pti(128);
+$mt->set_payload('<s>9');
+ok($mt = $mtt->add_by_term('a=N'), 'Add token');
+$mt->set_pti(129);
+$mt->set_payload('<b>144');
+ok($mt = $mtt->add_by_term('<>:b=N'), 'Add token');
+$mt->set_pti(64);
+$mt->set_o_start(0);
+$mt->set_o_end(5);
+$mt->set_p_end(5);
+ok($mt = $mtt->add_by_term('c=N'), 'Add token');
+$mt->set_pti(129);
+$mt->set_payload('<b>144');
+ok($mt = $mtt->add_by_term('<>:d=N'), 'Add token');
+$mt->set_pti(64);
+$mt->set_o_start(0);
+$mt->set_o_end(5);
+$mt->set_p_end(6);
+$mt->set_payload('<b>7');
+ok($mt = $mtt->add_by_term('@:j=N'), 'Add token');
+$mt->set_pti(16);
+$mt->set_payload('<s>8');
+ok($mt = $mtt->add_by_term('<>:e=ADJ'), 'Add token');
+$mt->set_pti(64);
+$mt->set_o_start(0);
+$mt->set_o_end(5);
+$mt->set_p_end(6);
+$mt->set_payload('<b>6');
+ok($mt = $mtt->add_by_term('<>:f=N'), 'Add token');
+$mt->set_pti(64);
+$mt->set_o_start(0);
+$mt->set_o_end(5);
+$mt->set_p_end(6);
+$mt->set_payload('<b>5<b>122');
+ok($mt = $mtt->add_by_term('g=N'), 'Add token');
+$mt->set_pti(129);
+$mt->set_payload('<b>144');
+ok($mt = $mtt->add_by_term('@:h=N'), 'Add token');
+$mt->set_pti(16);
+$mt->set_payload('<s>5');
+ok($mt = $mtt->add_by_term('@:i=N'), 'Add token');
+$mt->set_pti(16);
+$mt->set_payload('<s>3');
 
 is($mtt->to_string,
    '[(0-5)<>:b=N$<b>64<i>0<i>5<i>5|' .
@@ -75,60 +75,68 @@
 ok($mtt->set_o_end(5), 'Set end character offset');
 
 # 2-7 to 2-4
-ok($mtt->add(term => '<:child-of',
-	     pti => 35,
-	     payload => '<i>0<i>0<i>0<i>0'. # character os
-	       '<i>7<i>2<i>4<s>5<s>4<s>3'
-	   ), 'New rel');
+ok($mt = $mtt->add_by_term('<:child-of'), 'New rel');
+$mt->set_pti(35);
+$mt->set_payload('<i>0<i>0<i>0<i>0'. # character os
+                   '<i>7<i>2<i>4<s>5<s>4<s>3'
+                 );
 
 # 2-4 to 3
-ok($mtt->add(term => '<:child-of',
-	     pti => 34,
-	     payload => '<i>0<i>0' . # character os
-	       '<i>4<i>3<s>3<s>3<s>1'
-	   ), 'New rel');
+ok($mt = $mtt->add_by_term('<:child-of'), 'New rel');
+$mt->set_pti(34);
+$mt->set_payload(
+  '<i>0<i>0' . # character os
+    '<i>4<i>3<s>3<s>3<s>1'
+  );
 
 # 2 to 2-4
 # <i>startright<i>endright<s>relation-id<s>left-id<s>right-id
-ok($mtt->add(term => '>:child-of',
-	     pti => 33,
-	     payload => '<i>0<i>0'. # character os
-	       '<i>2<i>4<s>2<s>1<s>3'
-	   ), 'New rel');
+ok($mt = $mtt->add_by_term('>:child-of'), 'New rel');
+$mt->set_pti(33);
+$mt->set_payload(
+  '<i>0<i>0'. # character os
+    '<i>2<i>4<s>2<s>1<s>3'
+  );
 
 # 2-4 to 2-7
-ok($mtt->add(term => '>:child-of',
-	     pti => 35,
-	     payload => '<i>0<i>0<i>0<i>0' . # character os
-	       '<i>4<i>2<i>7<s>1<s>3<s>4'
-	   ), 'New rel');
+ok($mt = $mtt->add_by_term('>:child-of'), 'New rel');
+$mt->set_pti(35);
+$mt->set_payload(
+  '<i>0<i>0<i>0<i>0' . # character os
+    '<i>4<i>2<i>7<s>1<s>3<s>4'
+  );
 
 # 2-4 to 4
-ok($mtt->add(term => '<:child-of',
-	     pti => 34,
-	     payload => '<i>0<i>0' . # character os
-	       '<i>4<i>4<s>4<s>3<s>1'), 'New rel');
-
+ok($mt = $mtt->add_by_term('<:child-of'), 'New rel');
+$mt->set_pti(34);
+$mt->set_payload(
+  '<i>0<i>0' . # character os
+    '<i>4<i>4<s>4<s>3<s>1'
+  );
 
 # 2-7 to 1-7
-ok($mtt->add(term => '>:child-of',
-	     pti => 35,
-	     payload => '<i>0<i>0<i>0<i>0' . # character os
-	       '<i>7<i>1<i>7<s>2<s>4<s>2'), 'New rel');
+ok($mt = $mtt->add_by_term('>:child-of'), 'New rel');
+$mt->set_pti(35);
+$mt->set_payload(
+  '<i>0<i>0<i>0<i>0' . # character os
+    '<i>7<i>1<i>7<s>2<s>4<s>2'
+  );
 
 # 2-7 to 4-7
-ok($mtt->add(term => '<:child-of',
-	     pti => 35,
-	     payload => '<i>0<i>0<i>0<i>0' . # character os
-	       '<i>7<i>4<i>7<s>6<s>4<s>2'), 'New rel');
+ok($mt = $mtt->add_by_term('<:child-of'), 'New rel');
+$mt->set_pti(35);
+$mt->set_payload(
+  '<i>0<i>0<i>0<i>0' . # character os
+    '<i>7<i>4<i>7<s>6<s>4<s>2'
+  );
 
 
 
 # 2 to 3
-ok($mtt->add(term => '>:child-of',
-	     pti => 32,
-	     payload => '<i>3<s>2<s>4<s>2'
-	   ), 'New rel');
+ok($mt = $mtt->add_by_term('>:child-of'), 'New rel');
+$mt->set_pti(32);
+$mt->set_payload('<i>3<s>2<s>4<s>2');
+
 
 #NOTE: Sorting of the candidate spans can alternatively be done in
 # * indexing, instead of here. (first by left positions and then by
diff --git a/t/tokens.t b/t/tokens.t
index 9ea5bcd..319a02e 100644
--- a/t/tokens.t
+++ b/t/tokens.t
@@ -7,14 +7,12 @@
 
 use_ok('KorAP::XML::Index::MultiTerm');
 
-ok(my $term = KorAP::XML::Index::MultiTerm->new(
-  term => 'Baum',
-  p_start => 0,
-  p_end => 56,
-  payload => '<i>56',
-  o_start => 34,
-  o_end => 120
-), 'Create new object');
+ok(my $term = KorAP::XML::Index::MultiTerm->new('Baum'), 'Create new object');
+$term->set_p_start(0);
+$term->set_p_end(56);
+$term->set_payload('<i>56');
+$term->set_o_start(34);
+$term->set_o_end(120);
 
 is($term->get_term, 'Baum');
 is($term->get_p_start, 0);
@@ -24,9 +22,7 @@
 is($term->get_payload, '<i>56');
 is($term->to_string, 'Baum$<i>34<i>120<i>56<i>56');
 
-ok($term = KorAP::XML::Index::MultiTerm->new(
-  term => 'Baum'
-), 'Create new object');
+ok($term = KorAP::XML::Index::MultiTerm->new('Baum'), 'Create new object');
 
 is($term->get_term, 'Baum');
 is($term->get_p_start, 0);
@@ -36,9 +32,7 @@
 is($term->get_payload, undef);
 is($term->to_string, 'Baum');
 
-ok($term = KorAP::XML::Index::MultiTerm->new(
-  term => 'Ba#um'
-), 'Create new object');
+ok($term = KorAP::XML::Index::MultiTerm->new('Ba#um'), 'Create new object');
 
 is($term->get_term, 'Ba#um');
 is($term->get_p_start, 0);
@@ -48,10 +42,8 @@
 is($term->get_payload, undef);
 is($term->to_string, 'Ba\#um');
 
-ok($term = KorAP::XML::Index::MultiTerm->new(
-  term => 'Ba#u$m',
-  payload => '<i>45'
-), 'Create new object');
+ok($term = KorAP::XML::Index::MultiTerm->new('Ba#u$m'), 'Create new object');
+$term->set_payload('<i>45');
 
 is($term->get_term, 'Ba#u$m');
 is($term->get_p_start, 0);