diff --git a/t/index/dereko_struct.t b/t/index/dereko_struct.t
index 1c9ae07..f6f6f5e 100644
--- a/t/index/dereko_struct.t
+++ b/t/index/dereko_struct.t
@@ -43,7 +43,6 @@
    '@:dereko/s:pattern:text$<b>17<s>2',
    'Attribute of idsHeader');
 
-
 is($data->{stream}->[4]->[1],
    '<>:dereko/s:s$<b>64<i>32<i>42<i>6<b>6<s>1',
    'Sentence span');
diff --git a/t/sort_tokens.t b/t/sort_tokens.t
index 1cbfd26..fb9ef7d 100644
--- a/t/sort_tokens.t
+++ b/t/sort_tokens.t
@@ -46,9 +46,9 @@
 
 is($mtt->to_string,
    '[(0-5)<>:b=N$<i>0<i>5<i>5|'.
-     '<>:f=N$<i>0<i>5<i>6<b>5<b>122|'.
-       '<>:e=ADJ$<i>0<i>5<i>6<b>6|'.
-	 '<>:d=N$<i>0<i>5<i>6<b>7|'.
+     '<>:e=ADJ$<i>0<i>5<i>6<b>6|'.
+       '<>:d=N$<i>0<i>5<i>6<b>7|'.
+	 '<>:f=N$<i>0<i>5<i>6<b>5<b>122|'.
 	   '@:i=N$<s>3|'.
 	     '@:h=N$<s>5|'.
 	       '@:j=N$<s>8|'.
diff --git a/t/transform.t b/t/transform.t
index b2620f3..379595e 100644
--- a/t/transform.t
+++ b/t/transform.t
@@ -25,7 +25,7 @@
 };
 
 my @layers;
-push(@layers, ['Base', 'Sentences']);
+# push(@layers, ['Base', 'Sentences']);
 push(@layers, ['Base', 'Paragraphs']);
 
 # OpenNLP
@@ -35,17 +35,16 @@
 # CoreNLP
 push(@layers, ['CoreNLP', 'NamedEntities', 'ne_dewac_175m_600']);
 push(@layers, ['CoreNLP', 'NamedEntities', 'ne_hgc_175m_600']);
-push(@layers, ['CoreNLP', 'NamedEntities']);
 push(@layers, ['CoreNLP', 'Sentences']);
 
-push(@layers, ['DeReKo', 'Structure']);
+# push(@layers, ['DeReKo', 'Structure']);
 
-push(@layers, ['Glemm', 'Morpho']);
+# push(@layers, ['Glemm', 'Morpho']);
 
-push(@layers, ['Mate', 'Morpho']);
+# push(@layers, ['Mate', 'Morpho']);
 push(@layers, ['Mate', 'Dependency']);
 
-push(@layers, ['Malt', 'Dependency']);
+# push(@layers, ['Malt', 'Dependency']);
 
 # Connexor
 push(@layers, ['Connexor', 'Morpho']);
@@ -53,13 +52,16 @@
 push(@layers, ['Connexor', 'Phrase']);
 push(@layers, ['Connexor', 'Sentences']);
 
+
+# TODO: OpenNLP
+
 # TreeTagger
 push(@layers, ['TreeTagger', 'Morpho']);
 push(@layers, ['TreeTagger', 'Sentences']);
 
 # Mate
-push(@layers, ['Mate', 'Morpho']);
-push(@layers, ['Mate', 'Dependency']);
+#push(@layers, ['Mate', 'Morpho']);
+#push(@layers, ['Mate', 'Dependency']);
 
 # XIP
 push(@layers, ['XIP', 'Morpho']);