in progress...
[jalview.git] / forester / java / src / org / forester / test / Test.java
index ec44a86..e3666a8 100644 (file)
@@ -2,8 +2,8 @@
 // FORESTER -- software libraries and applications
 // for evolutionary biology research and applications.
 //
-// Copyright (C) 2008-2009 Christian M. Zmasek
-// Copyright (C) 2008-2009 Burnham Institute for Medical Research
+// Copyright (C) 2014 Christian M. Zmasek
+// Copyright (C) 2014 Sanford-Burnham Medical Research Institute
 // All rights reserved
 //
 // This library is free software; you can redistribute it and/or
@@ -20,7 +20,6 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 //
-// Contact: phylosoft @ gmail . com
 // WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.test;
@@ -29,6 +28,8 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
@@ -40,8 +41,10 @@ import java.util.Set;
 import java.util.SortedSet;
 
 import org.forester.application.support_transfer;
+import org.forester.archaeopteryx.AptxUtil;
 import org.forester.archaeopteryx.TreePanelUtil;
 import org.forester.archaeopteryx.webservices.WebserviceUtil;
+import org.forester.clade_analysis.CladeAnalysisTest;
 import org.forester.development.DevelopmentTools;
 import org.forester.evoinference.TestPhylogenyReconstruction;
 import org.forester.evoinference.matrix.character.CharacterStateMatrix;
@@ -62,8 +65,10 @@ import org.forester.io.parsers.util.ParserUtils;
 import org.forester.io.writers.PhylogenyWriter;
 import org.forester.io.writers.SequenceWriter;
 import org.forester.msa.BasicMsa;
+import org.forester.msa.DeleteableMsa;
 import org.forester.msa.Mafft;
 import org.forester.msa.Msa;
+import org.forester.msa.Msa.MSA_FORMAT;
 import org.forester.msa.MsaInferrer;
 import org.forester.msa.MsaMethods;
 import org.forester.pccx.TestPccx;
@@ -84,7 +89,7 @@ import org.forester.phylogeny.data.Identifier;
 import org.forester.phylogeny.data.PhylogenyData;
 import org.forester.phylogeny.data.PhylogenyDataUtil;
 import org.forester.phylogeny.data.Polygon;
-import org.forester.phylogeny.data.PropertiesMap;
+import org.forester.phylogeny.data.PropertiesList;
 import org.forester.phylogeny.data.Property;
 import org.forester.phylogeny.data.Property.AppliesTo;
 import org.forester.phylogeny.data.ProteinDomain;
@@ -102,7 +107,7 @@ import org.forester.sdi.SDI;
 import org.forester.sdi.SDIR;
 import org.forester.sdi.TestGSDI;
 import org.forester.sequence.BasicSequence;
-import org.forester.sequence.Sequence;
+import org.forester.sequence.MolecularSequence;
 import org.forester.species.BasicSpecies;
 import org.forester.species.Species;
 import org.forester.surfacing.TestSurfacing;
@@ -121,32 +126,24 @@ import org.forester.util.SequenceAccessionTools;
 import org.forester.ws.seqdb.SequenceDatabaseEntry;
 import org.forester.ws.seqdb.SequenceDbWsTools;
 import org.forester.ws.seqdb.UniProtTaxonomy;
-import org.forester.ws.wabi.TxSearch;
-import org.forester.ws.wabi.TxSearch.RANKS;
-import org.forester.ws.wabi.TxSearch.TAX_NAME_CLASS;
-import org.forester.ws.wabi.TxSearch.TAX_RANK;
 
 @SuppressWarnings( "unused")
 public final class Test {
 
     private final static String  PATH_TO_RESOURCES         = System.getProperty( "user.dir" )
-                                                                   + ForesterUtil.getFileSeparator() + "resources"
-                                                                   + ForesterUtil.getFileSeparator();
+            + ForesterUtil.getFileSeparator() + "resources" + ForesterUtil.getFileSeparator();
     private final static String  PATH_TO_TEST_DATA         = System.getProperty( "user.dir" )
-                                                                   + ForesterUtil.getFileSeparator() + "test_data"
-                                                                   + ForesterUtil.getFileSeparator();
+            + ForesterUtil.getFileSeparator() + "test_data" + ForesterUtil.getFileSeparator();
     private final static boolean PERFORM_DB_TESTS          = false;
-    private static final boolean PERFORM_WEB_TREE_ACCESS   = true;
+    private static final boolean PERFORM_WEB_TREE_ACCESS   = false;
     private static final String  PHYLOXML_LOCAL_XSD        = PATH_TO_RESOURCES + "phyloxml_schema/"
-                                                                   + ForesterConstants.PHYLO_XML_VERSION + "/"
-                                                                   + ForesterConstants.PHYLO_XML_XSD;
+            + ForesterConstants.PHYLO_XML_VERSION + "/" + ForesterConstants.PHYLO_XML_XSD;
     private static final String  PHYLOXML_REMOTE_XSD       = ForesterConstants.PHYLO_XML_LOCATION + "/"
-                                                                   + ForesterConstants.PHYLO_XML_VERSION + "/"
-                                                                   + ForesterConstants.PHYLO_XML_XSD;
+            + ForesterConstants.PHYLO_XML_VERSION + "/" + ForesterConstants.PHYLO_XML_XSD;
     private final static boolean USE_LOCAL_PHYLOXML_SCHEMA = true;
     private final static double  ZERO_DIFF                 = 1.0E-9;
 
-    public static boolean isEqual( final double a, final double b ) {
+    private static boolean isEqual( final double a, final double b ) {
         return ( ( Math.abs( a - b ) ) < Test.ZERO_DIFF );
     }
 
@@ -222,6 +219,33 @@ public final class Test {
             succeeded++;
         }
         System.out.println( "OK." );
+        System.out.print( "Common prefix: " );
+        if ( !testCommonPrefix() ) {
+            System.out.println( "failed." );
+            failed++;
+        }
+        else {
+            succeeded++;
+        }
+        System.out.println( "OK." );
+        System.out.print( "Common prefix sep: " );
+        if ( !testCommonPrefixSep() ) {
+            System.out.println( "failed." );
+            failed++;
+        }
+        else {
+            succeeded++;
+        }
+        System.out.println( "OK." );
+        System.out.print( "Contains prefix: " );
+        if ( !testContainsPrefix() ) {
+            System.out.println( "failed." );
+            failed++;
+        }
+        else {
+            succeeded++;
+        }
+        System.out.println( "OK." );
         System.out.print( "Sequence writer: " );
         if ( testSequenceWriter() ) {
             System.out.println( "OK." );
@@ -285,6 +309,15 @@ public final class Test {
             succeeded++;
         }
         System.out.println( "OK." );
+        System.out.print( "Taxonomy data extraction: " );
+        if ( Test.testExtractTaxonomyDataFromNodeName() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         System.out.print( "Taxonomy code extraction: " );
         if ( Test.testExtractTaxonomyCodeFromNodeName() ) {
             System.out.println( "OK." );
@@ -330,6 +363,15 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
+        System.out.print( "Node construction and parsing of NHX (node level): " );
+        if ( Test.testNHXNodeParsing2() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         System.out.print( "NHX parsing iterating: " );
         if ( Test.testNHParsingIter() ) {
             System.out.println( "OK." );
@@ -348,6 +390,15 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
+        System.out.print( "NH parsing - special chars: " );
+        if ( Test.testNHParsingSpecialChars() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         System.out.print( "Conversion to NHX (node level): " );
         if ( Test.testNHXconversion() ) {
             System.out.println( "OK." );
@@ -384,7 +435,6 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
-        System.exit( 0 );
         System.out.print( "Nexus characters parsing: " );
         if ( Test.testNexusCharactersParsing() ) {
             System.out.println( "OK." );
@@ -448,6 +498,15 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
+        System.out.print( "phyloXML parsing (validating against schema): " );
+        if ( testPhyloXMLparsingValidating() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         System.out.print( "Roundtrip phyloXML parsing (validating against schema): " );
         if ( Test.testBasicPhyloXMLparsingRoundtrip() ) {
             System.out.println( "OK." );
@@ -475,6 +534,15 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
+        System.out.print( "UTF-8 parsing from file: " );
+        if ( Test.testUTF8ParsingFromFile() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         System.out.print( "Copying of node data: " );
         if ( Test.testCopyOfNodeData() ) {
             System.out.println( "OK." );
@@ -511,6 +579,15 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
+        System.out.print( "Phylogeny methods:" );
+        if ( Test.testPhylogenyMethods() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         System.out.print( "Postorder Iterator: " );
         if ( Test.testPostOrderIterator() ) {
             System.out.println( "OK." );
@@ -727,6 +804,15 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
+        System.out.print( "Clade analyis: " );
+        if ( CladeAnalysisTest.test() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         System.out.print( "Phylogeny reconstruction:" );
         System.out.println();
         if ( TestPhylogenyReconstruction.test( new File( PATH_TO_TEST_DATA ) ) ) {
@@ -901,6 +987,24 @@ public final class Test {
             System.out.println( "failed." );
             failed++;
         }
+        System.out.print( "Deleteable MSA: " );
+        if ( Test.testDeleteableMsa() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
+        System.out.print( "MSA entropy: " );
+        if ( Test.testMsaEntropy() ) {
+            System.out.println( "OK." );
+            succeeded++;
+        }
+        else {
+            System.out.println( "failed." );
+            failed++;
+        }
         if ( PERFORM_DB_TESTS ) {
             System.out.print( "Uniprot Entry Retrieval: " );
             if ( Test.testUniprotEntryRetrieval() ) {
@@ -941,8 +1045,8 @@ public final class Test {
             }
         }
         if ( PERFORM_WEB_TREE_ACCESS ) {
-            System.out.print( "NHX parsing from URL: " );
-            if ( Test.testNHXparsingFromURL() ) {
+            System.out.print( "TreeBase acccess: " );
+            if ( Test.testTreeBaseReading() ) {
                 System.out.println( "OK." );
                 succeeded++;
             }
@@ -950,8 +1054,8 @@ public final class Test {
                 System.out.println( "failed." );
                 failed++;
             }
-            System.out.print( "phyloXML parsing from URL: " );
-            if ( Test.testPhyloXMLparsingFromURL() ) {
+            System.out.print( "ToL access: " );
+            if ( Test.testToLReading() ) {
                 System.out.println( "OK." );
                 succeeded++;
             }
@@ -959,8 +1063,8 @@ public final class Test {
                 System.out.println( "failed." );
                 failed++;
             }
-            System.out.print( "TreeBase acccess: " );
-            if ( Test.testTreeBaseReading() ) {
+            System.out.print( "NHX parsing from URL: " );
+            if ( Test.testNHXparsingFromURL() ) {
                 System.out.println( "OK." );
                 succeeded++;
             }
@@ -968,9 +1072,17 @@ public final class Test {
                 System.out.println( "failed." );
                 failed++;
             }
-            //
-            System.out.print( "ToL access: " );
-            if ( Test.testToLReading() ) {
+            System.out.print( "NHX parsing from URL 2: " );
+            if ( Test.testNHXparsingFromURL2() ) {
+                System.out.println( "OK." );
+                succeeded++;
+            }
+            else {
+                System.out.println( "failed." );
+                failed++;
+            }
+            System.out.print( "phyloXML parsing from URL: " );
+            if ( Test.testPhyloXMLparsingFromURL() ) {
                 System.out.println( "OK." );
                 succeeded++;
             }
@@ -978,7 +1090,6 @@ public final class Test {
                 System.out.println( "failed." );
                 failed++;
             }
-            //
             System.out.print( "TreeFam access: " );
             if ( Test.testTreeFamReading() ) {
                 System.out.println( "OK." );
@@ -988,8 +1099,6 @@ public final class Test {
                 System.out.println( "failed." );
                 failed++;
             }
-            //
-            //
             System.out.print( "Pfam tree access: " );
             if ( Test.testPfamTreeReading() ) {
                 System.out.println( "OK." );
@@ -1018,7 +1127,7 @@ public final class Test {
         }
     }
 
-    public static boolean testEngulfingOverlapRemoval() {
+    private static boolean testEngulfingOverlapRemoval() {
         try {
             final Domain d0 = new BasicDomain( "d0", 0, 8, ( short ) 1, ( short ) 1, 0.1, 1 );
             final Domain d1 = new BasicDomain( "d1", 0, 1, ( short ) 1, ( short ) 1, 0.1, 1 );
@@ -1027,7 +1136,7 @@ public final class Test {
             final Domain d4 = new BasicDomain( "d4", 7, 9, ( short ) 1, ( short ) 1, 0.1, 1 );
             final Domain d5 = new BasicDomain( "d4", 0, 9, ( short ) 1, ( short ) 1, 0.1, 1 );
             final Domain d6 = new BasicDomain( "d4", 4, 5, ( short ) 1, ( short ) 1, 0.1, 1 );
-            final List<Boolean> covered = new ArrayList<Boolean>();
+            final List<Boolean> covered = new ArrayList<>();
             covered.add( true ); // 0
             covered.add( false ); // 1
             covered.add( true ); // 2
@@ -1117,7 +1226,74 @@ public final class Test {
         return true;
     }
 
-    public static final boolean testNHXparsingFromURL() {
+    private static final boolean testNHXparsingFromURL2() {
+        try {
+            final String s = "https://sites.google.com/site/cmzmasek/home/software/archaeopteryx/examples/simple/simple_1.nh";
+            final Phylogeny phys[] = AptxUtil
+                    .readPhylogeniesFromUrl( new URL( s ), false, false, false, TAXONOMY_EXTRACTION.NO, false );
+            if ( ( phys == null ) || ( phys.length != 5 ) ) {
+                return false;
+            }
+            if ( !phys[ 0 ].toNewHampshire().equals( "((((A,B),C),D),(E,F));" ) ) {
+                System.out.println( phys[ 0 ].toNewHampshire() );
+                return false;
+            }
+            if ( !phys[ 1 ].toNewHampshire().equals( "((1,2,3),(4,5,6),(7,8,9));" ) ) {
+                System.out.println( phys[ 1 ].toNewHampshire() );
+                return false;
+            }
+            final Phylogeny phys2[] = AptxUtil
+                    .readPhylogeniesFromUrl( new URL( s ), false, false, false, TAXONOMY_EXTRACTION.NO, false );
+            if ( ( phys2 == null ) || ( phys2.length != 5 ) ) {
+                return false;
+            }
+            if ( !phys2[ 0 ].toNewHampshire().equals( "((((A,B),C),D),(E,F));" ) ) {
+                System.out.println( phys2[ 0 ].toNewHampshire() );
+                return false;
+            }
+            if ( !phys2[ 1 ].toNewHampshire().equals( "((1,2,3),(4,5,6),(7,8,9));" ) ) {
+                System.out.println( phys2[ 1 ].toNewHampshire() );
+                return false;
+            }
+            final Phylogeny phys3[] = AptxUtil.readPhylogeniesFromUrl( new URL( "http://swisstree.vital-it.ch:80/"
+                    + "SwissTree/ST001/consensus_tree.nhx" ),
+                                                                       false,
+                                                                       false,
+                                                                       false,
+                                                                       TAXONOMY_EXTRACTION.NO,
+                                                                       false );
+            if ( ( phys3 == null ) || ( phys3.length != 1 ) ) {
+                return false;
+            }
+            if ( !phys3[ 0 ].toNewHampshire()
+                    .equals( "((((POP23a_CIOIN_ENSCING00000016202,POP23b_CIOIN_ENSCING00000016169),POP23_CIOSA_ENSCSAVG00000000248),((POP23a_BRAFL_C3ZMF1,POP23b_BRAFL_121417),(((POP3_ORYLA_ENSORLG00000019669,POP3_GASAC_ENSGACG00000014023,POP3_DANRE_Q6JWW1),(POP3_XENTR_B1H1F6,(POP3_CHICK_Q9DG25,(POP3_ORNAN_ENSOANG00000004179,POP3_MONDO_ENSMODG00000018033,((POP3_MOUSE_Q9ES81,POP3_RAT_Q3BCU3),POP3_RABIT_ENSOCUG00000025973,POP3_MACMU_ENSMMUG00000014473,POP3_HUMAN_Q9HBV1))))),(((POP2_GASAC_ENSGACG00000001420,POP2_ORYLA_ENSORLG00000008627,POP2_TAKRU_ENSTRUG00000015933),POP2_DANRE_ENSDARG00000069922),POP2_XENTR_ENSXETG00000018064,(((POP2_TAEGU_ENSTGUG00000013383,POP2_CHICK_Q6T9Z5),POP2_ANOCA_ENSACAG00000003557),((POP2_MACEU_ENSMEUG00000015825,POP2_MONDO_ENSMODG00000018205),((POP2_RABIT_ENSOCUG00000009515,(POP2_RAT_Q6P722,POP2_MOUSE_Q9ES82)),(POP2_MACMU_ENSMMUG00000000905,POP2_HUMAN_Q9HBU9)))))))),((POP1_CIOSA_ENSCSAVG00000000247,POP1_CIOIN_ENSCING00000000496),((POP1_DANRE_Q5PQZ7,(POP1_ORYLA_ENSORLG00000019663,POP1_GASAC_ENSGACG00000014015,POP1_TAKRU_ENSORLG00000019663)),(POP1_XENTR_B1H1G2,(POP1_ANOCA_ENSACAG00000003910,(POP1_TAEGU_ENSTGUG00000012218,POP1_CHICK_Q9DG23)),POP1_ORNAN_ENSOANG00000004180,POP1_MONDO_ENSMODG00000018034,(POP1_RABIT_ENSOCUG00000016944,(POP1_RAT_Q3BCU4,POP1_MOUSE_Q9ES83),(POP1_HUMAN_Q8NE79,POP1_MACMU_ENSMMUG00000014471))))));" ) ) {
+                System.out.println( phys3[ 0 ].toNewHampshire() );
+                return false;
+            }
+            final Phylogeny phys4[] = AptxUtil.readPhylogeniesFromUrl( new URL( "http://swisstree.vital-it.ch:80/"
+                    + "SwissTree/ST001/consensus_tree.nhx" ),
+                                                                       false,
+                                                                       false,
+                                                                       false,
+                                                                       TAXONOMY_EXTRACTION.NO,
+                                                                       false );
+            if ( ( phys4 == null ) || ( phys4.length != 1 ) ) {
+                return false;
+            }
+            if ( !phys4[ 0 ].toNewHampshire()
+                    .equals( "((((POP23a_CIOIN_ENSCING00000016202,POP23b_CIOIN_ENSCING00000016169),POP23_CIOSA_ENSCSAVG00000000248),((POP23a_BRAFL_C3ZMF1,POP23b_BRAFL_121417),(((POP3_ORYLA_ENSORLG00000019669,POP3_GASAC_ENSGACG00000014023,POP3_DANRE_Q6JWW1),(POP3_XENTR_B1H1F6,(POP3_CHICK_Q9DG25,(POP3_ORNAN_ENSOANG00000004179,POP3_MONDO_ENSMODG00000018033,((POP3_MOUSE_Q9ES81,POP3_RAT_Q3BCU3),POP3_RABIT_ENSOCUG00000025973,POP3_MACMU_ENSMMUG00000014473,POP3_HUMAN_Q9HBV1))))),(((POP2_GASAC_ENSGACG00000001420,POP2_ORYLA_ENSORLG00000008627,POP2_TAKRU_ENSTRUG00000015933),POP2_DANRE_ENSDARG00000069922),POP2_XENTR_ENSXETG00000018064,(((POP2_TAEGU_ENSTGUG00000013383,POP2_CHICK_Q6T9Z5),POP2_ANOCA_ENSACAG00000003557),((POP2_MACEU_ENSMEUG00000015825,POP2_MONDO_ENSMODG00000018205),((POP2_RABIT_ENSOCUG00000009515,(POP2_RAT_Q6P722,POP2_MOUSE_Q9ES82)),(POP2_MACMU_ENSMMUG00000000905,POP2_HUMAN_Q9HBU9)))))))),((POP1_CIOSA_ENSCSAVG00000000247,POP1_CIOIN_ENSCING00000000496),((POP1_DANRE_Q5PQZ7,(POP1_ORYLA_ENSORLG00000019663,POP1_GASAC_ENSGACG00000014015,POP1_TAKRU_ENSORLG00000019663)),(POP1_XENTR_B1H1G2,(POP1_ANOCA_ENSACAG00000003910,(POP1_TAEGU_ENSTGUG00000012218,POP1_CHICK_Q9DG23)),POP1_ORNAN_ENSOANG00000004180,POP1_MONDO_ENSMODG00000018034,(POP1_RABIT_ENSOCUG00000016944,(POP1_RAT_Q3BCU4,POP1_MOUSE_Q9ES83),(POP1_HUMAN_Q8NE79,POP1_MACMU_ENSMMUG00000014471))))));" ) ) {
+                System.out.println( phys4[ 0 ].toNewHampshire() );
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    private static final boolean testNHXparsingFromURL() {
         try {
             final String s = "https://sites.google.com/site/cmzmasek/home/software/archaeopteryx/examples/simple/simple_1.nh";
             final URL u = new URL( s );
@@ -1134,7 +1310,8 @@ public final class Test {
                 System.out.println( phys[ 1 ].toNewHampshire() );
                 return false;
             }
-            final Phylogeny[] phys2 = factory.create( u.openStream(), new NHXParser() );
+            final URL u2 = new URL( s );
+            final Phylogeny[] phys2 = factory.create( u2.openStream(), new NHXParser() );
             if ( ( phys2 == null ) || ( phys2.length != 5 ) ) {
                 return false;
             }
@@ -1144,8 +1321,8 @@ public final class Test {
             }
             final PhylogenyFactory factory2 = ParserBasedPhylogenyFactory.getInstance();
             final NHXParser p = new NHXParser();
-            final URL u2 = new URL( s );
-            p.setSource( u2 );
+            final URL u3 = new URL( s );
+            p.setSource( u3 );
             if ( !p.hasNext() ) {
                 return false;
             }
@@ -1177,19 +1354,21 @@ public final class Test {
             }
         }
         catch ( final Exception e ) {
+            System.out.println( e.toString() );
             e.printStackTrace();
+            return false;
         }
         return true;
     }
 
-    public static boolean testOverlapRemoval() {
+    private static boolean testOverlapRemoval() {
         try {
             final Domain d0 = new BasicDomain( "d0", ( short ) 2, ( short ) 5, ( short ) 1, ( short ) 1, 0.1, 1 );
             final Domain d1 = new BasicDomain( "d1", ( short ) 7, ( short ) 10, ( short ) 1, ( short ) 1, 0.1, 1 );
             final Domain d2 = new BasicDomain( "d2", ( short ) 0, ( short ) 20, ( short ) 1, ( short ) 1, 0.1, 1 );
             final Domain d3 = new BasicDomain( "d3", ( short ) 9, ( short ) 10, ( short ) 1, ( short ) 1, 0.1, 1 );
             final Domain d4 = new BasicDomain( "d4", ( short ) 7, ( short ) 8, ( short ) 1, ( short ) 1, 0.1, 1 );
-            final List<Boolean> covered = new ArrayList<Boolean>();
+            final List<Boolean> covered = new ArrayList<>();
             covered.add( true ); // 0
             covered.add( false ); // 1
             covered.add( true ); // 2
@@ -1244,7 +1423,13 @@ public final class Test {
                                               ( short ) 1,
                                               0.0000001,
                                               1 );
-            final Domain e = new BasicDomain( "e", ( short ) 5000, ( short ) 5500, ( short ) 1, ( short ) 1, 0.0001, 1 );
+            final Domain e = new BasicDomain( "e",
+                                              ( short ) 5000,
+                                              ( short ) 5500,
+                                              ( short ) 1,
+                                              ( short ) 1,
+                                              0.0001,
+                                              1 );
             final Protein cde = new BasicProtein( "cde", "varanus", 0 );
             cde.addProteinDomain( c );
             cde.addProteinDomain( d );
@@ -1336,15 +1521,14 @@ public final class Test {
         return true;
     }
 
-    public static final boolean testPfamTreeReading() {
+    private static final boolean testPfamTreeReading() {
         try {
             final URL u = new URL( WebserviceUtil.PFAM_SERVER + "/family/PF" + "01849" + "/tree/download" );
             final NHXParser parser = new NHXParser();
             parser.setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
             parser.setReplaceUnderscores( false );
             parser.setGuessRootedness( true );
-            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny[] phys = factory.create( u.openStream(), parser );
+            final Phylogeny[] phys = ForesterUtil.readPhylogeniesFromUrl( u, parser );
             if ( ( phys == null ) || ( phys.length != 1 ) ) {
                 return false;
             }
@@ -1354,84 +1538,200 @@ public final class Test {
         }
         catch ( final Exception e ) {
             e.printStackTrace();
+            return false;
         }
         return true;
     }
 
-    public static final boolean testPhyloXMLparsingFromURL() {
+    private static final boolean testPhyloXMLparsingFromURL() {
         try {
             final String s = "https://sites.google.com/site/cmzmasek/home/software/archaeopteryx/examples/archaeopteryx_a/apaf_bcl2.xml";
             final URL u = new URL( s );
-            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny[] phys = factory.create( u.openStream(), PhyloXmlParser.createPhyloXmlParser() );
+            final Phylogeny[] phys = ForesterUtil.readPhylogeniesFromUrl( u, PhyloXmlParser.createPhyloXmlParser() );
             if ( ( phys == null ) || ( phys.length != 2 ) ) {
                 return false;
             }
+            final Phylogeny[] phys2 = ForesterUtil.readPhylogeniesFromUrl( u, PhyloXmlParser.createPhyloXmlParser() );
+            if ( ( phys2 == null ) || ( phys2.length != 2 ) ) {
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace();
+            return false;
         }
         return true;
     }
 
-    public static final boolean testToLReading() {
+    private static final boolean testToLReading() {
         try {
             final URL u = new URL( WebserviceUtil.TOL_URL_BASE + "15079" );
-            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny[] phys = factory.create( u.openStream(), new TolParser() );
+            final Phylogeny[] phys = ForesterUtil.readPhylogeniesFromUrl( u, new TolParser() );
             if ( ( phys == null ) || ( phys.length != 1 ) ) {
                 return false;
             }
             if ( !phys[ 0 ].getRoot().getNodeData().getTaxonomy().getIdentifier().getValue().equals( "15079" ) ) {
                 return false;
             }
-            if ( !phys[ 0 ].getRoot().getNodeData().getTaxonomy().getScientificName().equals( "Protacanthopterygii" ) ) {
+            if ( !phys[ 0 ].getRoot().getNodeData().getTaxonomy().getScientificName()
+                    .equals( "Protacanthopterygii" ) ) {
                 return false;
             }
             if ( phys[ 0 ].getNumberOfExternalNodes() < 5 ) {
                 return false;
             }
+            //
+            final URL u2 = new URL( WebserviceUtil.TOL_URL_BASE + "17706" );
+            final Phylogeny[] phys2 = ForesterUtil.readPhylogeniesFromUrl( u2, new TolParser() );
+            if ( ( phys2 == null ) || ( phys2.length != 1 ) ) {
+                return false;
+            }
+            if ( !phys2[ 0 ].getRoot().getNodeData().getTaxonomy().getIdentifier().getValue().equals( "17706" ) ) {
+                return false;
+            }
+            if ( phys2[ 0 ].getNumberOfExternalNodes() < 5 ) {
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace();
+            return false;
         }
         return true;
     }
 
-    public static final boolean testTreeBaseReading() {
+    private static final boolean testTreeBaseReading() {
         try {
-            final URL u = new URL( WebserviceUtil.TREEBASE_PHYLOWS_TREE_URL_BASE + "825?format=nexus" );
+            final URL u = new URL( WebserviceUtil.TREEBASE_PHYLOWS_TREE_URL_BASE + "72557?format=nexus" );
             final NexusPhylogeniesParser parser = new NexusPhylogeniesParser();
             parser.setReplaceUnderscores( true );
-            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny[] phys = factory.create( u.openStream(), parser );
+            final Phylogeny[] phys = ForesterUtil.readPhylogeniesFromUrl( u, parser );
             if ( ( phys == null ) || ( phys.length != 1 ) ) {
                 return false;
             }
+            final URL u_1 = new URL( WebserviceUtil.TREEBASE_PHYLOWS_TREE_URL_BASE + "2406?format=nexus" );
+            final NexusPhylogeniesParser parser_1 = new NexusPhylogeniesParser();
+            final Phylogeny[] phys_1 = ForesterUtil.readPhylogeniesFromUrl( u_1, parser_1 );
+            if ( ( phys_1 == null ) || ( phys_1.length != 1 ) ) {
+                return false;
+            }
+            final URL u_2 = new URL( WebserviceUtil.TREEBASE_PHYLOWS_TREE_URL_BASE + "422?format=nexus" );
+            final NexusPhylogeniesParser parser_2 = new NexusPhylogeniesParser();
+            final Phylogeny[] phys_2 = ForesterUtil.readPhylogeniesFromUrl( u_2, parser_2 );
+            if ( ( phys_2 == null ) || ( phys_2.length != 1 ) ) {
+                return false;
+            }
+            final URL u_3 = new URL( WebserviceUtil.TREEBASE_PHYLOWS_TREE_URL_BASE + "2654?format=nexus" );
+            final NexusPhylogeniesParser parser_3 = new NexusPhylogeniesParser();
+            final Phylogeny[] phys_3 = ForesterUtil.readPhylogeniesFromUrl( u_3, parser_3 );
+            if ( ( phys_3 == null ) || ( phys_3.length != 1 ) ) {
+                return false;
+            }
+            final URL u_4 = new URL( WebserviceUtil.TREEBASE_PHYLOWS_TREE_URL_BASE + "825?format=nexus" );
+            final NexusPhylogeniesParser parser_4 = new NexusPhylogeniesParser();
+            final Phylogeny[] phys_4 = ForesterUtil.readPhylogeniesFromUrl( u_4, parser_4 );
+            if ( ( phys_4 == null ) || ( phys_4.length != 1 ) ) {
+                return false;
+            }
             final URL u2 = new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE + "15613?format=nexus" );
             final NexusPhylogeniesParser parser2 = new NexusPhylogeniesParser();
             parser2.setReplaceUnderscores( true );
-            final PhylogenyFactory factory2 = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny[] phys2 = factory2.create( u2.openStream(), parser2 );
+            final Phylogeny[] phys2 = ForesterUtil.readPhylogeniesFromUrl( u2, parser2 );
             if ( ( phys2 == null ) || ( phys2.length != 9 ) ) {
                 return false;
             }
+            final URL u3 = new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE + "14909?format=nexus" );
+            final NexusPhylogeniesParser parser3 = new NexusPhylogeniesParser();
+            final Phylogeny[] phys3 = ForesterUtil.readPhylogeniesFromUrl( u3, parser3 );
+            if ( ( phys3 == null ) || ( phys3.length != 2 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys4 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                           new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                   + "14525?format=nexus" ),
+                                                                           new NexusPhylogeniesParser() );
+            if ( ( phys4 == null ) || ( phys4.length != 1 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys5 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                           new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                   + "15632?format=nexus" ),
+                                                                           new NexusPhylogeniesParser() );
+            if ( ( phys5 == null ) || ( phys5.length != 1 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys6 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                           new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                   + "10190?format=nexus" ),
+                                                                           new NexusPhylogeniesParser() );
+            if ( ( phys6 == null ) || ( phys6.length != 1 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys7 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                           new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                   + "13246?format=nexus" ),
+                                                                           new NexusPhylogeniesParser() );
+            if ( ( phys7 == null ) || ( phys7.length != 2 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys8 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                           new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                   + "11662?format=nexus" ),
+                                                                           new NexusPhylogeniesParser() );
+            if ( ( phys8 == null ) || ( phys8.length != 2 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys9 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                           new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                   + "562?format=nexus" ),
+                                                                           new NexusPhylogeniesParser() );
+            if ( ( phys9 == null ) || ( phys9.length != 4 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys16424 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                               new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                       + "16424?format=nexus" ),
+                                                                               new NexusPhylogeniesParser() );
+            if ( ( phys16424 == null ) || ( phys16424.length != 1 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys17878 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                               new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                       + "17878?format=nexus" ),
+                                                                               new NexusPhylogeniesParser() );
+            if ( ( phys17878 == null ) || ( phys17878.length != 17 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys18804 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                               new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                       + "18804?format=nexus" ),
+                                                                               new NexusPhylogeniesParser() );
+            if ( ( phys18804 == null ) || ( phys18804.length != 2 ) ) {
+                return false;
+            }
+            final Phylogeny[] phys346 = ForesterUtil.readPhylogeniesFromUrl(
+                                                                             new URL( WebserviceUtil.TREEBASE_PHYLOWS_STUDY_URL_BASE
+                                                                                     + "346?format=nexus" ),
+                                                                             new NexusPhylogeniesParser() );
+            if ( ( phys346 == null ) || ( phys346.length != 1 ) ) {
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace();
+            return false;
         }
         return true;
     }
 
-    public static final boolean testTreeFamReading() {
+    private static final boolean testTreeFamReading() {
         try {
             final URL u = new URL( WebserviceUtil.TREE_FAM_URL_BASE + "101004" + "/tree/newick" );
             final NHXParser parser = new NHXParser();
             parser.setTaxonomyExtraction( NHXParser.TAXONOMY_EXTRACTION.NO );
             parser.setReplaceUnderscores( false );
             parser.setGuessRootedness( true );
-            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny[] phys = factory.create( u.openStream(), parser );
+            final Phylogeny[] phys = ForesterUtil.readPhylogeniesFromUrl( u, parser );
             if ( ( phys == null ) || ( phys.length != 1 ) ) {
                 return false;
             }
@@ -1441,6 +1741,7 @@ public final class Test {
         }
         catch ( final Exception e ) {
             e.printStackTrace();
+            return false;
         }
         return true;
     }
@@ -1456,7 +1757,7 @@ public final class Test {
 
     private static boolean testAminoAcidSequence() {
         try {
-            final Sequence aa1 = BasicSequence.createAaSequence( "aa1", "aAklm-?xX*z$#" );
+            final MolecularSequence aa1 = BasicSequence.createAaSequence( "aa1", "aAklm-?xX*z$#" );
             if ( aa1.getLength() != 13 ) {
                 return false;
             }
@@ -1469,15 +1770,15 @@ public final class Test {
             if ( !new String( aa1.getMolecularSequence() ).equals( "AAKLM-XXX*ZXX" ) ) {
                 return false;
             }
-            final Sequence aa2 = BasicSequence.createAaSequence( "aa3", "ARNDCQEGHILKMFPSTWYVX*-BZOJU" );
-            if ( !new String( aa2.getMolecularSequence() ).equals( "ARNDCQEGHILKMFPSTWYVX*-BZXXU" ) ) {
+            final MolecularSequence aa2 = BasicSequence.createAaSequence( "aa3", "ARNDCQEGHILKMFPSTWYVX*-BZOJU" );
+            if ( !new String( aa2.getMolecularSequence() ).equals( "ARNDCQEGHILKMFPSTWYVX*-BZOXU" ) ) {
                 return false;
             }
-            final Sequence dna1 = BasicSequence.createDnaSequence( "dna1", "ACGTUX*-?RYMKWSN" );
+            final MolecularSequence dna1 = BasicSequence.createDnaSequence( "dna1", "ACGTUX*-?RYMKWSN" );
             if ( !new String( dna1.getMolecularSequence() ).equals( "ACGTNN*-NRYMKWSN" ) ) {
                 return false;
             }
-            final Sequence rna1 = BasicSequence.createRnaSequence( "rna1", "..ACGUTX*-?RYMKWSN" );
+            final MolecularSequence rna1 = BasicSequence.createRnaSequence( "rna1", "..ACGUTX*-?RYMKWSN" );
             if ( !new String( rna1.getMolecularSequence() ).equals( "--ACGUNN*-NRYMKWSN" ) ) {
                 return false;
             }
@@ -1495,89 +1796,508 @@ public final class Test {
             if ( !pd.getDomainId().equals( "id" ) ) {
                 return false;
             }
-            if ( pd.getNumber() != 1 ) {
+            if ( pd.getNumber() != 1 ) {
+                return false;
+            }
+            if ( pd.getTotalCount() != 4 ) {
+                return false;
+            }
+            if ( !pd.equals( new BasicDomain( "id", 22, 111, ( short ) 1, ( short ) 4, 0.2, -12 ) ) ) {
+                return false;
+            }
+            final Domain a1 = new BasicDomain( "a", 1, 10, ( short ) 1, ( short ) 4, 0.1, -12 );
+            final BasicDomain a1_copy = new BasicDomain( "a", 1, 10, ( short ) 1, ( short ) 4, 0.1, -12 );
+            final BasicDomain a1_equal = new BasicDomain( "a", 524, 743994, ( short ) 1, ( short ) 300, 3.0005, 230 );
+            final BasicDomain a2 = new BasicDomain( "a", 1, 10, ( short ) 2, ( short ) 4, 0.1, -12 );
+            final BasicDomain a3 = new BasicDomain( "A", 1, 10, ( short ) 1, ( short ) 4, 0.1, -12 );
+            if ( !a1.equals( a1 ) ) {
+                return false;
+            }
+            if ( !a1.equals( a1_copy ) ) {
+                return false;
+            }
+            if ( !a1.equals( a1_equal ) ) {
+                return false;
+            }
+            if ( !a1.equals( a2 ) ) {
+                return false;
+            }
+            if ( a1.equals( a3 ) ) {
+                return false;
+            }
+            if ( a1.compareTo( a1 ) != 0 ) {
+                return false;
+            }
+            if ( a1.compareTo( a1_copy ) != 0 ) {
+                return false;
+            }
+            if ( a1.compareTo( a1_equal ) != 0 ) {
+                return false;
+            }
+            if ( a1.compareTo( a2 ) != 0 ) {
+                return false;
+            }
+            if ( a1.compareTo( a3 ) == 0 ) {
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testBasicNodeMethods() {
+        try {
+            if ( PhylogenyNode.getNodeCount() != 0 ) {
+                return false;
+            }
+            final PhylogenyNode n1 = new PhylogenyNode();
+            final PhylogenyNode n2 = PhylogenyNode
+                    .createInstanceFromNhxString( "", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            final PhylogenyNode n3 = PhylogenyNode
+                    .createInstanceFromNhxString( "n3", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            final PhylogenyNode n4 = PhylogenyNode
+                    .createInstanceFromNhxString( "n4:0.01", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            if ( n1.isHasAssignedEvent() ) {
+                return false;
+            }
+            if ( PhylogenyNode.getNodeCount() != 4 ) {
+                return false;
+            }
+            if ( n3.getIndicator() != 0 ) {
+                return false;
+            }
+            if ( n3.getNumberOfExternalNodes() != 1 ) {
+                return false;
+            }
+            if ( !n3.isExternal() ) {
+                return false;
+            }
+            if ( !n3.isRoot() ) {
+                return false;
+            }
+            if ( !n4.getName().equals( "n4" ) ) {
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testCommonPrefix() {
+        final List<String> l0 = new ArrayList<>();
+        l0.add( "abc" );
+        if ( !ForesterUtil.greatestCommonPrefix( l0 ).equals( "abc" ) ) {
+            return false;
+        }
+        final List<String> l1 = new ArrayList<>();
+        l1.add( "abc" );
+        l1.add( "abX" );
+        if ( !ForesterUtil.greatestCommonPrefix( l1 ).equals( "ab" ) ) {
+            return false;
+        }
+        final List<String> l2 = new ArrayList<>();
+        l2.add( "abc" );
+        l2.add( "abX" );
+        l2.add( "axy" );
+        if ( !ForesterUtil.greatestCommonPrefix( l2 ).equals( "a" ) ) {
+            return false;
+        }
+        final List<String> l3 = new ArrayList<>();
+        l3.add( "abXsdfsdfsdfsdfsdfsd" );
+        l3.add( "abXsdfsdfsdfsdfsdfsd" );
+        l3.add( "abc" );
+        l3.add( "abXsdfsdfsdfsdfsdfsd" );
+        l3.add( "ab" );
+        l3.add( "abc" );
+        l3.add( "ab" );
+        if ( !ForesterUtil.greatestCommonPrefix( l3 ).equals( "ab" ) ) {
+            return false;
+        }
+        final List<String> l4 = new ArrayList<>();
+        l4.add( "abXsdfsdfsdfsdfsdfsd" );
+        l4.add( "abXsdfsdfsdfsdfsdfsd" );
+        l4.add( "abc" );
+        l4.add( "Xsdfsdfsdfsdfsdfsd" );
+        l4.add( "ab" );
+        l4.add( "abc" );
+        if ( !ForesterUtil.greatestCommonPrefix( l4 ).equals( "" ) ) {
+            return false;
+        }
+        final List<String> l5 = new ArrayList<>();
+        l5.add( "" );
+        if ( !ForesterUtil.greatestCommonPrefix( l5 ).equals( "" ) ) {
+            return false;
+        }
+        final List<String> l6 = new ArrayList<>();
+        l6.add( "abc" );
+        l6.add( "abX" );
+        l6.add( "" );
+        if ( !ForesterUtil.greatestCommonPrefix( l6 ).equals( "" ) ) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testCommonPrefixSep() {
+        final List<String> l0 = new ArrayList<>();
+        l0.add( "a.b.c" );
+        if ( !ForesterUtil.greatestCommonPrefix( l0, "." ).equals( "a.b.c" ) ) {
+            return false;
+        }
+        final List<String> l1 = new ArrayList<>();
+        l1.add( "a.b.c" );
+        l1.add( "a.b.X" );
+        if ( !ForesterUtil.greatestCommonPrefix( l1, "." ).equals( "a.b" ) ) {
+            return false;
+        }
+        final List<String> l2 = new ArrayList<>();
+        l2.add( "a.b.c." );
+        l2.add( "a.b.X." );
+        l2.add( "a.x.y." );
+        if ( !ForesterUtil.greatestCommonPrefix( l2, "." ).equals( "a" ) ) {
+            return false;
+        }
+        final List<String> l3 = new ArrayList<>();
+        l3.add( "a/b/X/s/d/f/s/d/f/s/d/f/s/d/f/s/d/f/s/d/" );
+        l3.add( "a/b/X/s/d/f/s/d/f/s/d/f/s/d/f/s/d/f/s/d" );
+        l3.add( "a/b/c" );
+        l3.add( "a/b/X/s/d/f/s/d/f/s/d/f/s/d/f/s/d/f/s/d/" );
+        l3.add( "a/b/" );
+        l3.add( "a/b/c/" );
+        l3.add( "a/b////////" );
+        if ( !ForesterUtil.greatestCommonPrefix( l3, "/" ).equals( "a/b" ) ) {
+            return false;
+        }
+        final List<String> l4 = new ArrayList<>();
+        l4.add( "a.b.X.s.d.f.s.d.f.s.d.f.s.d.f.s.d.f.s.d" );
+        l4.add( "a.b.X.s.d.f.s.d.f.s.d.f.s.d.f.s.d.f.s.d" );
+        l4.add( "a.b.c" );
+        l4.add( "X.s.d.f.s.d.f.s.d.f.s.d.f.s.d.f.s.d..." );
+        l4.add( "a.b" );
+        l4.add( "a.b.c" );
+        if ( !ForesterUtil.greatestCommonPrefix( l4, "." ).equals( "" ) ) {
+            return false;
+        }
+        final List<String> l5 = new ArrayList<>();
+        l5.add( "" );
+        if ( !ForesterUtil.greatestCommonPrefix( l5, "_" ).equals( "" ) ) {
+            return false;
+        }
+        final List<String> l6 = new ArrayList<>();
+        l6.add( "_" );
+        l6.add( "__" );
+        if ( !ForesterUtil.greatestCommonPrefix( l6, "_" ).equals( "" ) ) {
+            return false;
+        }
+        final List<String> l7 = new ArrayList<>();
+        l7.add( "a,b,c" );
+        l7.add( "a,b,X" );
+        l7.add( "" );
+        l7.add( ",,,,,,,,,," );
+        if ( !ForesterUtil.greatestCommonPrefix( l7, "," ).equals( "" ) ) {
+            return false;
+        }
+        final List<String> l8 = new ArrayList<>();
+        l8.add( "123.304.403.04" );
+        l8.add( "123.304.403.04.02" );
+        l8.add( "123.304.403.03.03" );
+        if ( !ForesterUtil.greatestCommonPrefix( l8, "." ).equals( "123.304.403" ) ) {
+            return false;
+        }
+        final List<String> l9 = new ArrayList<>();
+        l9.add( "123.304.403.04" );
+        l9.add( "123.304.403.04.02" );
+        l9.add( "123.304.402.03.03" );
+        if ( !ForesterUtil.greatestCommonPrefix( l9, "." ).equals( "123.304" ) ) {
+            return false;
+        }
+        final List<String> l10 = new ArrayList<>();
+        l10.add( "abcde" );
+        l10.add( "adc" );
+        if ( !ForesterUtil.greatestCommonPrefix( l10, "." ).equals( "" ) ) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testContainsPrefix() {
+        if ( !ForesterUtil.isContainsPrefix( "a.b", "a", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( "a.b.c", "a", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( "a.b.c", "a.b", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( "a.b", "a.b", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( "a", "a", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( ".a.b", ".a", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( ".a.b.", ".a", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( ".a.b.", ".a.", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( "a..b.", "a", "." ) ) {
+            return false;
+        }
+        if ( !ForesterUtil.isContainsPrefix( "a..b.", "a..", "." ) ) {
+            return false;
+        }
+        if ( ForesterUtil.isContainsPrefix( "a", "a.b", "." ) ) {
+            return false;
+        }
+        if ( ForesterUtil.isContainsPrefix( "a_b", "a", "." ) ) {
+            return false;
+        }
+        if ( ForesterUtil.isContainsPrefix( ".a.", ".a.b.", "." ) ) {
+            return false;
+        }
+        if ( ForesterUtil.isContainsPrefix( "a.b.c", "a.x", "." ) ) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testUTF8ParsingFromFile() {
+        try {
+            final PhyloXmlParser xml_parser = PhyloXmlParser.createPhyloXmlParser();
+            final Phylogeny[] phylogenies_xml = ParserBasedPhylogenyFactory.getInstance()
+                    .create( new File( Test.PATH_TO_TEST_DATA + "chars.xml" ), xml_parser );
+            if ( xml_parser.getErrorCount() > 0 ) {
+                System.out.println( xml_parser.getErrorMessages().toString() );
+                return false;
+            }
+            if ( phylogenies_xml.length != 1 ) {
+                return false;
+            }
+            final Phylogeny[] phylogenies_xml2 = ParserBasedPhylogenyFactory.getInstance()
+                    .create( new StringBuffer( phylogenies_xml[ 0 ].toPhyloXML( 0 ) ), xml_parser );
+            final Phylogeny[] phylogenies_nh = ParserBasedPhylogenyFactory.getInstance()
+                    .create( new File( Test.PATH_TO_TEST_DATA + "chars.nh" ), new NHXParser() );
+            if ( phylogenies_nh.length != 1 ) {
+                return false;
+            }
+            final Phylogeny[] phylogenies_nex = ParserBasedPhylogenyFactory.getInstance()
+                    .create( new File( Test.PATH_TO_TEST_DATA + "chars.nex" ), new NexusPhylogeniesParser() );
+            if ( phylogenies_nex.length != 1 ) {
+                return false;
+            }
+            final String[] xml_n = phylogenies_xml[ 0 ].getAllExternalNodeNames();
+            final String[] xml_n2 = phylogenies_xml2[ 0 ].getAllExternalNodeNames();
+            final String[] nh_n = phylogenies_nh[ 0 ].getAllExternalNodeNames();
+            final String[] nex_n = phylogenies_nex[ 0 ].getAllExternalNodeNames();
+            final String n0 = "AQ~!@#$%^&*()_+-=\\{}|;:\"<>?,./";
+            final String n1 = "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜˜˜™š›œžŸ¡¢£¤¥¦§¨©ª«¬®¯°±¹²³´µ¶·¸º»¼¿À÷þÿ";
+            final String n2 = "漢字ひらがなカタカナ";
+            final String n3 = "อักษรไทย";
+            final String n4 = "繁體字";
+            final String n5 = "한글";
+            final String n6 = "देवनागरी";
+            final String n7 = "chữ Quốc ngữ";
+            final String n8 = "ру́сский язы́к";
+            final String n9 = "អក្សរខ្មែរ";
+            if ( !xml_n[ 0 ].equals( n0 ) ) {
+                System.out.println( xml_n[ 0 ] );
+                System.out.println( n0 );
+                return false;
+            }
+            if ( !xml_n2[ 0 ].equals( n0 ) ) {
+                System.out.println( xml_n2[ 0 ] );
+                System.out.println( n0 );
+                return false;
+            }
+            if ( !nh_n[ 0 ].equals( n0 ) ) {
+                System.out.println( nh_n[ 0 ] );
+                System.out.println( n0 );
+                return false;
+            }
+            if ( !nex_n[ 0 ].equals( n0 ) ) {
+                System.out.println( nex_n[ 0 ] );
+                System.out.println( n0 );
+                return false;
+            }
+            if ( !xml_n[ 1 ].equals( n1 ) ) {
+                System.out.println( xml_n[ 1 ] );
+                System.out.println( n1 );
+                return false;
+            }
+            if ( !xml_n2[ 1 ].equals( n1 ) ) {
+                System.out.println( xml_n2[ 1 ] );
+                System.out.println( n1 );
+                return false;
+            }
+            if ( !nh_n[ 1 ].equals( n1 ) ) {
+                System.out.println( nh_n[ 1 ] );
+                System.out.println( n1 );
+                return false;
+            }
+            if ( !nex_n[ 1 ].equals( n1 ) ) {
+                System.out.println( nex_n[ 1 ] );
+                System.out.println( n1 );
+                return false;
+            }
+            if ( !xml_n[ 2 ].equals( n2 ) ) {
+                System.out.println( xml_n[ 2 ] );
+                System.out.println( n2 );
+                return false;
+            }
+            if ( !xml_n2[ 2 ].equals( n2 ) ) {
+                System.out.println( xml_n2[ 2 ] );
+                System.out.println( n2 );
+                return false;
+            }
+            if ( !nh_n[ 2 ].equals( n2 ) ) {
+                System.out.println( nh_n[ 2 ] );
+                System.out.println( n2 );
+                return false;
+            }
+            if ( !nex_n[ 2 ].equals( n2 ) ) {
+                System.out.println( nex_n[ 2 ] );
+                System.out.println( n2 );
+                return false;
+            }
+            //
+            if ( !xml_n[ 3 ].equals( n3 ) ) {
+                System.out.println( xml_n[ 3 ] );
+                System.out.println( n3 );
                 return false;
             }
-            if ( pd.getTotalCount() != 4 ) {
+            if ( !xml_n2[ 3 ].equals( n3 ) ) {
+                System.out.println( xml_n2[ 3 ] );
+                System.out.println( n3 );
                 return false;
             }
-            if ( !pd.equals( new BasicDomain( "id", 22, 111, ( short ) 1, ( short ) 4, 0.2, -12 ) ) ) {
+            if ( !nh_n[ 3 ].equals( n3 ) ) {
+                System.out.println( nh_n[ 3 ] );
+                System.out.println( n3 );
                 return false;
             }
-            final Domain a1 = new BasicDomain( "a", 1, 10, ( short ) 1, ( short ) 4, 0.1, -12 );
-            final BasicDomain a1_copy = new BasicDomain( "a", 1, 10, ( short ) 1, ( short ) 4, 0.1, -12 );
-            final BasicDomain a1_equal = new BasicDomain( "a", 524, 743994, ( short ) 1, ( short ) 300, 3.0005, 230 );
-            final BasicDomain a2 = new BasicDomain( "a", 1, 10, ( short ) 2, ( short ) 4, 0.1, -12 );
-            final BasicDomain a3 = new BasicDomain( "A", 1, 10, ( short ) 1, ( short ) 4, 0.1, -12 );
-            if ( !a1.equals( a1 ) ) {
+            if ( !nex_n[ 3 ].equals( n3 ) ) {
+                System.out.println( nex_n[ 3 ] );
+                System.out.println( n3 );
                 return false;
             }
-            if ( !a1.equals( a1_copy ) ) {
+            //
+            if ( !xml_n[ 4 ].equals( n4 ) ) {
+                System.out.println( xml_n[ 4 ] );
+                System.out.println( n4 );
                 return false;
             }
-            if ( !a1.equals( a1_equal ) ) {
+            if ( !nh_n[ 4 ].equals( n4 ) ) {
+                System.out.println( nh_n[ 4 ] );
+                System.out.println( n4 );
                 return false;
             }
-            if ( !a1.equals( a2 ) ) {
+            if ( !nex_n[ 4 ].equals( n4 ) ) {
+                System.out.println( nex_n[ 4 ] );
+                System.out.println( n4 );
                 return false;
             }
-            if ( a1.equals( a3 ) ) {
+            //
+            if ( !xml_n[ 5 ].equals( n5 ) ) {
+                System.out.println( xml_n[ 5 ] );
+                System.out.println( n5 );
                 return false;
             }
-            if ( a1.compareTo( a1 ) != 0 ) {
+            if ( !nh_n[ 5 ].equals( n5 ) ) {
+                System.out.println( nh_n[ 5 ] );
+                System.out.println( n5 );
                 return false;
             }
-            if ( a1.compareTo( a1_copy ) != 0 ) {
+            if ( !nex_n[ 5 ].equals( n5 ) ) {
+                System.out.println( nex_n[ 5 ] );
+                System.out.println( n5 );
                 return false;
             }
-            if ( a1.compareTo( a1_equal ) != 0 ) {
+            //
+            if ( !xml_n[ 6 ].equals( n6 ) ) {
+                System.out.println( xml_n[ 6 ] );
+                System.out.println( n6 );
                 return false;
             }
-            if ( a1.compareTo( a2 ) != 0 ) {
+            if ( !nh_n[ 6 ].equals( n6 ) ) {
+                System.out.println( nh_n[ 6 ] );
+                System.out.println( n6 );
                 return false;
             }
-            if ( a1.compareTo( a3 ) == 0 ) {
+            if ( !nex_n[ 6 ].equals( n6 ) ) {
+                System.out.println( nex_n[ 6 ] );
+                System.out.println( n6 );
                 return false;
             }
-        }
-        catch ( final Exception e ) {
-            e.printStackTrace( System.out );
-            return false;
-        }
-        return true;
-    }
-
-    private static boolean testBasicNodeMethods() {
-        try {
-            if ( PhylogenyNode.getNodeCount() != 0 ) {
+            //
+            if ( !xml_n[ 7 ].equals( n7 ) ) {
+                System.out.println( xml_n[ 7 ] );
+                System.out.println( n7 );
                 return false;
             }
-            final PhylogenyNode n1 = new PhylogenyNode();
-            final PhylogenyNode n2 = PhylogenyNode
-                    .createInstanceFromNhxString( "", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            final PhylogenyNode n3 = PhylogenyNode
-                    .createInstanceFromNhxString( "n3", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            final PhylogenyNode n4 = PhylogenyNode
-                    .createInstanceFromNhxString( "n4:0.01", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            if ( n1.isHasAssignedEvent() ) {
+            if ( !nh_n[ 7 ].equals( n7 ) ) {
+                System.out.println( nh_n[ 7 ] );
+                System.out.println( n7 );
                 return false;
             }
-            if ( PhylogenyNode.getNodeCount() != 4 ) {
+            if ( !nex_n[ 7 ].equals( n7 ) ) {
+                System.out.println( nex_n[ 7 ] );
+                System.out.println( n7 );
                 return false;
             }
-            if ( n3.getIndicator() != 0 ) {
+            if ( !xml_n[ 8 ].equals( n8 ) ) {
+                System.out.println( xml_n[ 8 ] );
+                System.out.println( n8 );
                 return false;
             }
-            if ( n3.getNumberOfExternalNodes() != 1 ) {
+            if ( !nh_n[ 8 ].equals( n8 ) ) {
+                System.out.println( nh_n[ 8 ] );
+                System.out.println( n8 );
                 return false;
             }
-            if ( !n3.isExternal() ) {
+            if ( !nex_n[ 8 ].equals( n8 ) ) {
+                System.out.println( nex_n[ 8 ] );
+                System.out.println( n8 );
                 return false;
             }
-            if ( !n3.isRoot() ) {
+            if ( !xml_n[ 9 ].equals( n9 ) ) {
+                System.out.println( xml_n[ 9 ] );
+                System.out.println( n9 );
                 return false;
             }
-            if ( !n4.getName().equals( "n4" ) ) {
+            if ( !xml_n2[ 9 ].equals( n9 ) ) {
+                System.out.println( xml_n2[ 9 ] );
+                System.out.println( n9 );
+                return false;
+            }
+            if ( !nh_n[ 9 ].equals( n9 ) ) {
+                System.out.println( nh_n[ 9 ] );
+                System.out.println( n9 );
+                return false;
+            }
+            if ( !nex_n[ 9 ].equals( n9 ) ) {
+                System.out.println( nex_n[ 9 ] );
+                System.out.println( n9 );
+                return false;
+            }
+            if ( !phylogenies_xml[ 0 ].toNewHampshire().equals( phylogenies_nh[ 0 ].toNewHampshire() ) ) {
+                System.out.println( phylogenies_xml[ 0 ].toNewHampshire() );
+                System.out.println( phylogenies_nh[ 0 ].toNewHampshire() );
+                return false;
+            }
+            if ( !phylogenies_xml[ 0 ].toNewHampshire().equals( phylogenies_nex[ 0 ].toNewHampshire() ) ) {
+                System.out.println( phylogenies_xml[ 0 ].toNewHampshire() );
+                System.out.println( phylogenies_nex[ 0 ].toNewHampshire() );
                 return false;
             }
         }
@@ -1592,8 +2312,8 @@ public final class Test {
         try {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
             final PhyloXmlParser xml_parser = PhyloXmlParser.createPhyloXmlParser();
-            final Phylogeny[] phylogenies_0 = factory.create( Test.PATH_TO_TEST_DATA + "phyloxml_test_t1.xml",
-                                                              xml_parser );
+            final Phylogeny[] phylogenies_0 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "phyloxml_test_t1.xml" ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( xml_parser.getErrorMessages().toString() );
                 return false;
@@ -1667,6 +2387,21 @@ public final class Test {
             if ( !t3.getIdentifier().getProvider().equals( "treebank" ) ) {
                 return false;
             }
+            if ( !t3.getNode( "root node" ).isDuplication() ) {
+                return false;
+            }
+            if ( !t3.getNode( "node a" ).isDuplication() ) {
+                return false;
+            }
+            if ( t3.getNode( "node a" ).isSpeciation() ) {
+                return false;
+            }
+            if ( t3.getNode( "node bc" ).isDuplication() ) {
+                return false;
+            }
+            if ( !t3.getNode( "node bc" ).isSpeciation() ) {
+                return false;
+            }
             if ( !t3.getNode( "root node" ).getNodeData().getSequence().getType().equals( "protein" ) ) {
                 return false;
             }
@@ -1680,7 +2415,8 @@ public final class Test {
             if ( !t3.getNode( "root node" ).getNodeData().getSequence().getAccession().getValue().equals( "Q9BZR8" ) ) {
                 return false;
             }
-            if ( !t3.getNode( "root node" ).getNodeData().getSequence().getAccession().getSource().equals( "UniProtKB" ) ) {
+            if ( !t3.getNode( "root node" ).getNodeData().getSequence().getAccession().getSource()
+                    .equals( "UniProtKB" ) ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getDesc()
@@ -1707,8 +2443,8 @@ public final class Test {
                     .getValue() != 1 ) {
                 return false;
             }
-            if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getConfidence()
-                    .getType().equals( "ml" ) ) {
+            if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getConfidence().getType()
+                    .equals( "ml" ) ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getDesc()
@@ -1716,27 +2452,27 @@ public final class Test {
                 return false;
             }
             if ( ( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getAppliesTo() != AppliesTo.ANNOTATION ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getAppliesTo() != AppliesTo.ANNOTATION ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getDataType().equals( "xsd:double" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getDataType().equals( "xsd:double" ) ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getRef().equals( "AFFY:expression" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getRef().equals( "AFFY:expression" ) ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getUnit().equals( "AFFY:x" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getUnit().equals( "AFFY:x" ) ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getValue().equals( "0.2" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getValue().equals( "0.2" ) ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "MED:disease" ).getValue().equals( "lymphoma" ) ) {
+                    .getProperties( "MED:disease" ).get( 0 ).getValue().equals( "lymphoma" ) ) {
                 return false;
             }
             if ( !( t3.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 1 ) ).getRef()
@@ -1791,8 +2527,8 @@ public final class Test {
             else {
                 xml_parser.setValidateAgainstSchema( PHYLOXML_REMOTE_XSD );
             }
-            final Phylogeny[] phylogenies_0 = factory.create( Test.PATH_TO_TEST_DATA + "phyloxml_test_t1.xml",
-                                                              xml_parser );
+            final Phylogeny[] phylogenies_0 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "phyloxml_test_t1.xml" ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( xml_parser.getErrorMessages().toString() );
                 return false;
@@ -1871,7 +2607,8 @@ public final class Test {
             if ( !t3_rt.getNode( "root node" ).getNodeData().getSequence().getSymbol().equals( "BCL2L14" ) ) {
                 return false;
             }
-            if ( !t3_rt.getNode( "root node" ).getNodeData().getSequence().getAccession().getValue().equals( "Q9BZR8" ) ) {
+            if ( !t3_rt.getNode( "root node" ).getNodeData().getSequence().getAccession().getValue()
+                    .equals( "Q9BZR8" ) ) {
                 return false;
             }
             if ( !t3_rt.getNode( "root node" ).getNodeData().getSequence().getAccession().getSource()
@@ -1911,27 +2648,27 @@ public final class Test {
                 return false;
             }
             if ( ( t3_rt.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getAppliesTo() != AppliesTo.ANNOTATION ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getAppliesTo() != AppliesTo.ANNOTATION ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getDataType().equals( "xsd:double" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getDataType().equals( "xsd:double" ) ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getRef().equals( "AFFY:expression" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getRef().equals( "AFFY:expression" ) ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getUnit().equals( "AFFY:x" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getUnit().equals( "AFFY:x" ) ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "AFFY:expression" ).getValue().equals( "0.2" ) ) {
+                    .getProperties( "AFFY:expression" ).get( 0 ).getValue().equals( "0.2" ) ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 2 ) ).getProperties()
-                    .getProperty( "MED:disease" ).getValue().equals( "lymphoma" ) ) {
+                    .getProperties( "MED:disease" ).get( 0 ).getValue().equals( "lymphoma" ) ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getAnnotation( 1 ) ).getRef()
@@ -1942,7 +2679,8 @@ public final class Test {
                     .equals( "intracellular organelle" ) ) {
                 return false;
             }
-            if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getUri( 0 ).getType().equals( "source" ) ) ) {
+            if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getUri( 0 ).getType()
+                    .equals( "source" ) ) ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getUri( 0 ).getDescription()
@@ -1952,11 +2690,13 @@ public final class Test {
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getSequence().getLocation().equals( "12p13-p12" ) ) ) {
                 return false;
             }
-            if ( !( t3_rt.getNode( "root node" ).getNodeData().getReference().getDoi().equals( "10.1038/387489a0" ) ) ) {
+            if ( !( t3_rt.getNode( "root node" ).getNodeData().getReference().getDoi()
+                    .equals( "10.1038/387489a0" ) ) ) {
                 return false;
             }
             if ( !( t3_rt.getNode( "root node" ).getNodeData().getReference().getDescription()
                     .equals( "Aguinaldo, A. M. A.; J. M. Turbeville, L. S. Linford, M. C. Rivera, J. R. Garey, R. A. Raff, & J. A. Lake (1997). \"Evidence for a clade of nematodes, arthropods and other moulting animals\". Nature 387 (6632): 489–493." ) ) ) {
+                System.out.println( t3_rt.getNode( "root node" ).getNodeData().getReference().getDescription() );
                 return false;
             }
             if ( !t3_rt.getNode( "root node" ).getNodeData().getTaxonomy().getTaxonomyCode().equals( "ECDYS" ) ) {
@@ -1965,7 +2705,8 @@ public final class Test {
             if ( !t3_rt.getNode( "root node" ).getNodeData().getTaxonomy().getScientificName().equals( "ecdysozoa" ) ) {
                 return false;
             }
-            if ( !t3_rt.getNode( "root node" ).getNodeData().getTaxonomy().getCommonName().equals( "molting animals" ) ) {
+            if ( !t3_rt.getNode( "root node" ).getNodeData().getTaxonomy().getCommonName()
+                    .equals( "molting animals" ) ) {
                 return false;
             }
             if ( !t3_rt.getNode( "root node" ).getNodeData().getTaxonomy().getIdentifier().getValue().equals( "1" ) ) {
@@ -1975,7 +2716,8 @@ public final class Test {
                     .equals( "ncbi" ) ) {
                 return false;
             }
-            if ( t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture().getTotalLength() != 124 ) {
+            if ( t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture()
+                    .getTotalLength() != 124 ) {
                 return false;
             }
             if ( !t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture().getDomain( 0 )
@@ -1986,7 +2728,8 @@ public final class Test {
                     .getFrom() != 21 ) {
                 return false;
             }
-            if ( t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture().getDomain( 0 ).getTo() != 44 ) {
+            if ( t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture().getDomain( 0 )
+                    .getTo() != 44 ) {
                 return false;
             }
             if ( t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture().getDomain( 0 )
@@ -1994,7 +2737,7 @@ public final class Test {
                 return false;
             }
             if ( t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture().getDomain( 0 )
-                    .getConfidence() != 2144 ) {
+                    .getConfidence() != 0 ) {
                 return false;
             }
             if ( !t3_rt.getNode( "node bc" ).getNodeData().getSequence().getDomainArchitecture().getDomain( 0 ).getId()
@@ -2075,7 +2818,6 @@ public final class Test {
             if ( !t3_rt.getNode( "node b" ).getNodeData().getBinaryCharacters().getType().equals( "characters" ) ) {
                 return false;
             }
-            //
             if ( !t3_rt.getNode( "node ba" ).getNodeData().getDate().getDesc().equals( "Silurian" ) ) {
                 return false;
             }
@@ -2083,7 +2825,8 @@ public final class Test {
                     .equalsIgnoreCase( "435" ) ) {
                 return false;
             }
-            if ( !t3_rt.getNode( "node ba" ).getNodeData().getDate().getMin().toPlainString().equalsIgnoreCase( "416" ) ) {
+            if ( !t3_rt.getNode( "node ba" ).getNodeData().getDate().getMin().toPlainString()
+                    .equalsIgnoreCase( "416" ) ) {
                 return false;
             }
             if ( !t3_rt.getNode( "node ba" ).getNodeData().getDate().getMax().toPlainString()
@@ -2144,8 +2887,8 @@ public final class Test {
                     xml_parser.setValidateAgainstSchema( PHYLOXML_REMOTE_XSD );
                 }
             }
-            final Phylogeny[] phylogenies_0 = factory.create( Test.PATH_TO_TEST_DATA + "phyloxml_test_t1.xml",
-                                                              xml_parser );
+            final Phylogeny[] phylogenies_0 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "phyloxml_test_t1.xml" ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( xml_parser.getErrorMessages().toString() );
                 return false;
@@ -2179,7 +2922,7 @@ public final class Test {
                 return false;
             }
             final String x2 = Test.PATH_TO_TEST_DATA + "phyloxml_test_t1.xml";
-            final Phylogeny[] phylogenies_1 = factory.create( x2, xml_parser );
+            final Phylogeny[] phylogenies_1 = factory.create( new File( x2 ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( "errors:" );
                 System.out.println( xml_parser.getErrorMessages().toString() );
@@ -2188,8 +2931,8 @@ public final class Test {
             if ( phylogenies_1.length != 4 ) {
                 return false;
             }
-            final Phylogeny[] phylogenies_2 = factory.create( Test.PATH_TO_TEST_DATA + "phyloxml_test_t3.xml",
-                                                              xml_parser );
+            final Phylogeny[] phylogenies_2 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "phyloxml_test_t3.xml" ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( "errors:" );
                 System.out.println( xml_parser.getErrorMessages().toString() );
@@ -2201,8 +2944,8 @@ public final class Test {
             if ( phylogenies_2[ 0 ].getNumberOfExternalNodes() != 2 ) {
                 return false;
             }
-            final Phylogeny[] phylogenies_3 = factory.create( Test.PATH_TO_TEST_DATA + "phyloxml_test_t4.xml",
-                                                              xml_parser );
+            final Phylogeny[] phylogenies_3 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "phyloxml_test_t4.xml" ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( xml_parser.getErrorMessages().toString() );
                 return false;
@@ -2223,8 +2966,8 @@ public final class Test {
             if ( !a.getNode( "node b1" ).getNodeData().getTaxonomy().getCommonName().equals( "b1 species" ) ) {
                 return false;
             }
-            final Phylogeny[] phylogenies_4 = factory.create( Test.PATH_TO_TEST_DATA + "special_characters.xml",
-                                                              xml_parser );
+            final Phylogeny[] phylogenies_4 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "special_characters.xml" ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( xml_parser.getErrorMessages().toString() );
                 return false;
@@ -2250,6 +2993,42 @@ public final class Test {
         return true;
     }
 
+    private static boolean testPhyloXMLparsingValidating() {
+        try {
+            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
+            PhyloXmlParser xml_parser = null;
+            try {
+                xml_parser = PhyloXmlParser.createPhyloXmlParserXsdValidating();
+            }
+            catch ( final Exception e ) {
+                // Do nothing -- means were not running from jar.
+            }
+            if ( xml_parser == null ) {
+                xml_parser = PhyloXmlParser.createPhyloXmlParser();
+                if ( USE_LOCAL_PHYLOXML_SCHEMA ) {
+                    xml_parser.setValidateAgainstSchema( PHYLOXML_LOCAL_XSD );
+                }
+                else {
+                    xml_parser.setValidateAgainstSchema( PHYLOXML_REMOTE_XSD );
+                }
+            }
+            final Phylogeny[] phylogenies_0 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "phyloxml_test_1.xml" ), xml_parser );
+            if ( xml_parser.getErrorCount() > 0 ) {
+                System.out.println( xml_parser.getErrorMessages().toString() );
+                return false;
+            }
+            if ( phylogenies_0.length != 3 ) {
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
     private static boolean testBasicProtein() {
         try {
             final BasicProtein p0 = new BasicProtein( "p0", "owl", 0 );
@@ -2427,7 +3206,7 @@ public final class Test {
             p.addProteinDomain( A20 );
             p.addProteinDomain( B25 );
             p.addProteinDomain( D80 );
-            List<String> domains_ids = new ArrayList<String>();
+            List<String> domains_ids = new ArrayList<>();
             domains_ids.add( "A" );
             domains_ids.add( "B" );
             domains_ids.add( "C" );
@@ -2444,7 +3223,7 @@ public final class Test {
             if ( p.contains( domains_ids, true ) ) {
                 return false;
             }
-            domains_ids = new ArrayList<String>();
+            domains_ids = new ArrayList<>();
             domains_ids.add( "A" );
             domains_ids.add( "C" );
             domains_ids.add( "D" );
@@ -2454,7 +3233,7 @@ public final class Test {
             if ( !p.contains( domains_ids, true ) ) {
                 return false;
             }
-            domains_ids = new ArrayList<String>();
+            domains_ids = new ArrayList<>();
             domains_ids.add( "A" );
             domains_ids.add( "D" );
             domains_ids.add( "C" );
@@ -2464,7 +3243,7 @@ public final class Test {
             if ( p.contains( domains_ids, true ) ) {
                 return false;
             }
-            domains_ids = new ArrayList<String>();
+            domains_ids = new ArrayList<>();
             domains_ids.add( "A" );
             domains_ids.add( "A" );
             domains_ids.add( "B" );
@@ -2474,7 +3253,7 @@ public final class Test {
             if ( !p.contains( domains_ids, true ) ) {
                 return false;
             }
-            domains_ids = new ArrayList<String>();
+            domains_ids = new ArrayList<>();
             domains_ids.add( "A" );
             domains_ids.add( "A" );
             domains_ids.add( "A" );
@@ -2486,7 +3265,7 @@ public final class Test {
             if ( !p.contains( domains_ids, true ) ) {
                 return false;
             }
-            domains_ids = new ArrayList<String>();
+            domains_ids = new ArrayList<>();
             domains_ids.add( "A" );
             domains_ids.add( "A" );
             domains_ids.add( "B" );
@@ -2515,7 +3294,7 @@ public final class Test {
 
     private static boolean testBasicTable() {
         try {
-            final BasicTable<String> t0 = new BasicTable<String>();
+            final BasicTable<String> t0 = new BasicTable<>();
             if ( t0.getNumberOfColumns() != 0 ) {
                 return false;
             }
@@ -2698,7 +3477,8 @@ public final class Test {
             if ( !t1.getRoot().getNodeData().getTaxonomy().getIdentifier().getValue().equals( "2484" ) ) {
                 return false;
             }
-            if ( !t1.getRoot().getChildNode( 0 ).getNodeData().getTaxonomy().getScientificName().equals( "Rhombozoa" ) ) {
+            if ( !t1.getRoot().getChildNode( 0 ).getNodeData().getTaxonomy().getScientificName()
+                    .equals( "Rhombozoa" ) ) {
                 return false;
             }
             if ( t1.getRoot().getChildNode( 0 ).getNumberOfDescendants() != 3 ) {
@@ -2731,7 +3511,8 @@ public final class Test {
             if ( t2.getRoot().getNumberOfDescendants() != 24 ) {
                 return false;
             }
-            if ( !t2.getRoot().getChildNode( 0 ).getNodeData().getTaxonomy().getScientificName().equals( "Aquificae" ) ) {
+            if ( !t2.getRoot().getChildNode( 0 ).getNodeData().getTaxonomy().getScientificName()
+                    .equals( "Aquificae" ) ) {
                 return false;
             }
             if ( !t2.getRoot().getChildNode( 0 ).getChildNode( 0 ).getNodeData().getTaxonomy().getScientificName()
@@ -2816,7 +3597,7 @@ public final class Test {
             if ( t2.getNumberOfExternalNodes() != 4 ) {
                 return false;
             }
-            if ( t2.getHeight() != 8.5 ) {
+            if ( t2.calculateHeight( false ) != 8.5 ) {
                 return false;
             }
             if ( !t2.isCompletelyBinary() ) {
@@ -2829,57 +3610,58 @@ public final class Test {
             if ( t3.getNumberOfExternalNodes() != 5 ) {
                 return false;
             }
-            if ( t3.getHeight() != 11 ) {
+            if ( t3.calculateHeight( true ) != 11 ) {
                 return false;
             }
             if ( t3.isCompletelyBinary() ) {
                 return false;
             }
             final PhylogenyNode n = t3.getNode( "ABC" );
-            final Phylogeny t4 = factory.create( "((A:1,B:2,C:10)ABC:1,(D:3,E:5)DE:3,(F,G,H,I))", new NHXParser() )[ 0 ];
+            final Phylogeny t4 = factory.create( "((A:1,B:2,C:10)ABC:1,(D:3,E:5)DE:3,(F,G,H,I))",
+                                                 new NHXParser() )[ 0 ];
             if ( t4.getNumberOfExternalNodes() != 9 ) {
                 return false;
             }
-            if ( t4.getHeight() != 11 ) {
+            if ( t4.calculateHeight( false ) != 11 ) {
                 return false;
             }
             if ( t4.isCompletelyBinary() ) {
                 return false;
             }
             final StringBuffer sb5 = new StringBuffer( "(((A11:2)A1:2,(A21:1,A22:2,A23)A2:11,A3:2)A:2,B:10,C:3,D:8)" );
-            final Phylogeny t5 = factory.create( sb5, new NHXParser() )[ 0 ];
+            final Phylogeny t5 = factory.create( sb5.toString(), new NHXParser() )[ 0 ];
             if ( t5.getNumberOfExternalNodes() != 8 ) {
                 return false;
             }
-            if ( t5.getHeight() != 15 ) {
+            if ( t5.calculateHeight( false ) != 15 ) {
                 return false;
             }
             final StringBuffer sb6 = new StringBuffer( "(X,Y,Z,(((A111)A11:2)A1:2,(X,Y,Z,A21:1,A22:2,A23)A2:11,A3:2)A:2,B:10,C:3,D:8)" );
-            final Phylogeny t6 = factory.create( sb6, new NHXParser() )[ 0 ];
-            if ( t6.getHeight() != 15 ) {
+            final Phylogeny t6 = factory.create( sb6.toString(), new NHXParser() )[ 0 ];
+            if ( t6.calculateHeight( true ) != 15 ) {
                 return false;
             }
             final StringBuffer sb7 = new StringBuffer( "(((A11:2)A1:2,(A21:1,A22:2,A23)A2:11,A3:2)A:2,B:10,C:15,D:8)" );
-            final Phylogeny t7 = factory.create( sb7, new NHXParser() )[ 0 ];
-            if ( t7.getHeight() != 15 ) {
+            final Phylogeny t7 = factory.create( sb7.toString(), new NHXParser() )[ 0 ];
+            if ( t7.calculateHeight( true ) != 15 ) {
                 return false;
             }
             final StringBuffer sb8 = new StringBuffer( "(((A11:11)A1:2,(A21:2,A22:2,A23,A24,AA:)A2:11,A3:2)A:2,B:15,C:15,D:15)" );
-            final Phylogeny t8 = factory.create( sb8, new NHXParser() )[ 0 ];
+            final Phylogeny t8 = factory.create( sb8.toString(), new NHXParser() )[ 0 ];
             if ( t8.getNumberOfExternalNodes() != 10 ) {
                 return false;
             }
-            if ( t8.getHeight() != 15 ) {
+            if ( t8.calculateHeight( true ) != 15 ) {
                 return false;
             }
             final char[] a9 = new char[] { 'a' };
             final Phylogeny t9 = factory.create( a9, new NHXParser() )[ 0 ];
-            if ( t9.getHeight() != 0 ) {
+            if ( t9.calculateHeight( true ) != 0 ) {
                 return false;
             }
             final char[] a10 = new char[] { 'a', ':', '6' };
             final Phylogeny t10 = factory.create( a10, new NHXParser() )[ 0 ];
-            if ( t10.getHeight() != 6 ) {
+            if ( t10.calculateHeight( true ) != 6 ) {
                 return false;
             }
         }
@@ -2894,9 +3676,9 @@ public final class Test {
         try {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
             final Phylogeny t0 = factory.create( "((((A,B)ab,C)abc,D)abcd,E)abcde", new NHXParser() )[ 0 ];
-            final Phylogeny[] ev0 = factory
-                    .create( "((((A,B),C),D),E);((((A,B),C),D),E);((((A,B),C),D),E);((((A,B),C),D),E);",
-                             new NHXParser() );
+            final Phylogeny[] ev0 = factory.create(
+                                                    "((((A,B),C),D),E);((((A,B),C),D),E);((((A,B),C),D),E);((((A,B),C),D),E);",
+                                                    new NHXParser() );
             ConfidenceAssessor.evaluate( "bootstrap", ev0, t0, false, 1, 0, 2 );
             if ( !isEqual( t0.getNode( "ab" ).getBranchData().getConfidence( 0 ).getValue(), 3 ) ) {
                 return false;
@@ -2905,9 +3687,9 @@ public final class Test {
                 return false;
             }
             final Phylogeny t1 = factory.create( "((((A,B)ab[&&NHX:B=50],C)abc,D)abcd,E)abcde", new NHXParser() )[ 0 ];
-            final Phylogeny[] ev1 = factory
-                    .create( "((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));",
-                             new NHXParser() );
+            final Phylogeny[] ev1 = factory.create(
+                                                    "((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));",
+                                                    new NHXParser() );
             ConfidenceAssessor.evaluate( "bootstrap", ev1, t1, false, 1 );
             if ( !isEqual( t1.getNode( "ab" ).getBranchData().getConfidence( 1 ).getValue(), 7 ) ) {
                 return false;
@@ -2916,9 +3698,9 @@ public final class Test {
                 return false;
             }
             final Phylogeny t_b = factory.create( "((((A,C)ac,D)acd,E)acde,B)abcde", new NHXParser() )[ 0 ];
-            final Phylogeny[] ev_b = factory
-                    .create( "((A,C),X);((A,X),C);(A,C);((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));((((A,C)ac,D)acd,E)acde,B)abcd",
-                             new NHXParser() );
+            final Phylogeny[] ev_b = factory.create(
+                                                     "((A,C),X);((A,X),C);(A,C);((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));((((A,C)ac,D)acd,E)acde,B)abcd",
+                                                     new NHXParser() );
             ConfidenceAssessor.evaluate( "bootstrap", ev_b, t_b, false, 1 );
             if ( !isEqual( t_b.getNode( "ac" ).getBranchData().getConfidence( 0 ).getValue(), 4 ) ) {
                 return false;
@@ -2928,9 +3710,9 @@ public final class Test {
             }
             //
             final Phylogeny t1x = factory.create( "((((A,B)ab,C)abc,D)abcd,E)abcde", new NHXParser() )[ 0 ];
-            final Phylogeny[] ev1x = factory
-                    .create( "((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));",
-                             new NHXParser() );
+            final Phylogeny[] ev1x = factory.create(
+                                                     "((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));",
+                                                     new NHXParser() );
             ConfidenceAssessor.evaluate( "bootstrap", ev1x, t1x, true, 1 );
             if ( !isEqual( t1x.getNode( "ab" ).getBranchData().getConfidence( 0 ).getValue(), 7 ) ) {
                 return false;
@@ -2939,9 +3721,9 @@ public final class Test {
                 return false;
             }
             final Phylogeny t_bx = factory.create( "((((A,C)ac,D)acd,E)acde,B)abcde", new NHXParser() )[ 0 ];
-            final Phylogeny[] ev_bx = factory
-                    .create( "((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));((((A,C)ac,D)acd,E)acde,B)abcd",
-                             new NHXParser() );
+            final Phylogeny[] ev_bx = factory.create(
+                                                      "((((A,B),C),D),E);((A,B),((E,D),C));(((A,B),C),(E,D));(A,(((E,D),C),B));(B,(A,((E,D),C)));(C,((E,D),(A,B)));(D,(E,((A,B),C)));((((A,C)ac,D)acd,E)acde,B)abcd",
+                                                      new NHXParser() );
             ConfidenceAssessor.evaluate( "bootstrap", ev_bx, t_bx, true, 1 );
             if ( !isEqual( t_bx.getNode( "ac" ).getBranchData().getConfidence( 0 ).getValue(), 1 ) ) {
                 return false;
@@ -2949,17 +3731,15 @@ public final class Test {
             if ( !isEqual( t_bx.getNode( "acd" ).getBranchData().getConfidence( 0 ).getValue(), 1 ) ) {
                 return false;
             }
-            //
-            final Phylogeny[] t2 = factory
-                    .create( "((((a,b),c),d),e);(((a,b),c),(d,e));(((((a,b),c),d),e),f);((((a,b),c),(d,e)),f);(((a,b),c),d,e);((a,b,c),d,e);",
-                             new NHXParser() );
-            final Phylogeny[] ev2 = factory
-                    .create( "((((a,b),c),d),e);((((a,b),c),d),e);((((a,b),e),d),c);((((a,b),e),d),c);(((a,b),(c,d)),e);((a,b),x);((a,b),(x,y));(a,b);(a,e);(a,b,c);",
-                             new NHXParser() );
+            final Phylogeny[] t2 = factory.create(
+                                                   "((((a,b),c),d),e);(((a,b),c),(d,e));(((((a,b),c),d),e),f);((((a,b),c),(d,e)),f);(((a,b),c),d,e);((a,b,c),d,e);",
+                                                   new NHXParser() );
+            final Phylogeny[] ev2 = factory.create(
+                                                    "((((a,b),c),d),e);((((a,b),c),d),e);((((a,b),e),d),c);((((a,b),e),d),c);(((a,b),(c,d)),e);((a,b),x);((a,b),(x,y));(a,b);(a,e);(a,b,c);",
+                                                    new NHXParser() );
             for( final Phylogeny target : t2 ) {
                 ConfidenceAssessor.evaluate( "bootstrap", ev2, target, false, 1 );
             }
-            //
             final Phylogeny t4 = factory.create( "((((((A,B)ab,C)abc,D)abcd,E)abcde,F)abcdef,G)abcdefg",
                                                  new NHXParser() )[ 0 ];
             final Phylogeny[] ev4 = factory.create( "(((A,B),C),(X,Y));((F,G),((A,B,C),(D,E)))", new NHXParser() );
@@ -3029,19 +3809,23 @@ public final class Test {
                 return false;
             }
             n.setName( "B0LM41_HUMAN" );
-            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null ).equals( ForesterUtil.UNIPROT_KB + "B0LM41_HUMAN" ) ) {
+            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null )
+                    .equals( ForesterUtil.UNIPROT_KB + "B0LM41_HUMAN" ) ) {
                 return false;
             }
             n.setName( "NP_001025424" );
-            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null ).equals( ForesterUtil.NCBI_PROTEIN + "NP_001025424" ) ) {
+            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null )
+                    .equals( ForesterUtil.NCBI_PROTEIN + "NP_001025424" ) ) {
                 return false;
             }
             n.setName( "_NM_001030253-" );
-            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null ).equals( ForesterUtil.NCBI_NUCCORE + "NM_001030253" ) ) {
+            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null )
+                    .equals( ForesterUtil.NCBI_NUCCORE + "NM_001030253" ) ) {
                 return false;
             }
             n.setName( "XM_002122186" );
-            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null ).equals( ForesterUtil.NCBI_NUCCORE + "XM_002122186" ) ) {
+            if ( !TreePanelUtil.createUriForSeqWeb( n, null, null )
+                    .equals( ForesterUtil.NCBI_NUCCORE + "XM_002122186" ) ) {
                 return false;
             }
             n.setName( "dgh_AAA34956_gdg" );
@@ -3209,7 +3993,7 @@ public final class Test {
             final ProteinDomain d2 = new ProteinDomain( "domain2", 50, 60 );
             final ProteinDomain d3 = new ProteinDomain( "domain3", 70, 80 );
             final ProteinDomain d4 = new ProteinDomain( "domain4", 90, 100 );
-            final ArrayList<PhylogenyData> domains0 = new ArrayList<PhylogenyData>();
+            final ArrayList<PhylogenyData> domains0 = new ArrayList<>();
             domains0.add( d2 );
             domains0.add( d0 );
             domains0.add( d3 );
@@ -3228,7 +4012,7 @@ public final class Test {
             if ( ds1.getNumberOfDomains() != 4 ) {
                 return false;
             }
-            final ArrayList<PhylogenyData> domains1 = new ArrayList<PhylogenyData>();
+            final ArrayList<PhylogenyData> domains1 = new ArrayList<>();
             domains1.add( d1 );
             domains1.add( d2 );
             domains1.add( d4 );
@@ -3894,10 +4678,6 @@ public final class Test {
                 System.out.println( entry.getSequenceName() );
                 return false;
             }
-            // if ( !entry.getSequenceSymbol().equals( "" ) ) {
-            //     System.out.println( entry.getSequenceSymbol() );
-            //     return false;
-            // }
             if ( !entry.getGeneName().equals( "treX-like" ) ) {
                 System.out.println( entry.getGeneName() );
                 return false;
@@ -3914,10 +4694,9 @@ public final class Test {
                 System.out.println( entry.getAnnotations().first().getRefSource() );
                 return false;
             }
-            if ( entry.getCrossReferences().size() != 5 ) {
+            if ( entry.getCrossReferences().size() < 1 ) {
                 return false;
             }
-            //
             final SequenceDatabaseEntry entry1 = SequenceDbWsTools.obtainEntry( "ABJ16409" );
             if ( !entry1.getAccession().equals( "ABJ16409" ) ) {
                 return false;
@@ -3938,10 +4717,9 @@ public final class Test {
                 System.out.println( entry1.getGeneName() );
                 return false;
             }
-            if ( entry1.getCrossReferences().size() != 6 ) {
+            if ( entry1.getCrossReferences().size() < 1 ) {
                 return false;
             }
-            //
             final SequenceDatabaseEntry entry2 = SequenceDbWsTools.obtainEntry( "NM_184234" );
             if ( !entry2.getAccession().equals( "NM_184234" ) ) {
                 return false;
@@ -3963,10 +4741,15 @@ public final class Test {
                 System.out.println( entry2.getGeneName() );
                 return false;
             }
-            if ( entry2.getCrossReferences().size() != 3 ) {
+            if ( entry2.getCrossReferences().size() < 1 ) {
+                return false;
+            }
+            if ( !entry2.getChromosome().equals( "20" ) ) {
+                return false;
+            }
+            if ( !entry2.getMap().equals( "20q11.22" ) ) {
                 return false;
             }
-            //
             final SequenceDatabaseEntry entry3 = SequenceDbWsTools.obtainEntry( "HM043801" );
             if ( !entry3.getAccession().equals( "HM043801" ) ) {
                 return false;
@@ -3990,11 +4773,9 @@ public final class Test {
             if ( !ForesterUtil.isEmpty( entry3.getGeneName() ) ) {
                 return false;
             }
-            if ( entry3.getCrossReferences().size() != 8 ) {
+            if ( entry3.getCrossReferences().size() < 1 ) {
                 return false;
             }
-            //
-            //
             final SequenceDatabaseEntry entry4 = SequenceDbWsTools.obtainEntry( "AAA36557.1" );
             if ( !entry4.getAccession().equals( "AAA36557" ) ) {
                 return false;
@@ -4015,21 +4796,6 @@ public final class Test {
                 System.out.println( entry4.getGeneName() );
                 return false;
             }
-            //   if ( !entry4.getChromosome().equals( "ras" ) ) {
-            //     System.out.println( entry4.getChromosome() );
-            //     return false;
-            // }
-            // if ( !entry4.getMap().equals( "ras" ) ) {
-            //     System.out.println( entry4.getMap() );
-            //     return false;
-            // }
-            //TODO FIXME gi...
-            //
-            //TODO fails:
-            //            final SequenceDatabaseEntry entry5 = SequenceDbWsTools.obtainEntry( "M30539" );
-            //            if ( !entry5.getAccession().equals( "HM043801" ) ) {
-            //                return false;
-            //            }
             final SequenceDatabaseEntry entry5 = SequenceDbWsTools.obtainEntry( "AAZ45343.1" );
             if ( !entry5.getAccession().equals( "AAZ45343" ) ) {
                 return false;
@@ -4046,6 +4812,25 @@ public final class Test {
                 System.out.println( entry5.getTaxonomyIdentifier() );
                 return false;
             }
+            final SequenceDatabaseEntry entry6 = SequenceDbWsTools.obtainEntry( "M30539" );
+            if ( !entry6.getAccession().equals( "M30539" ) ) {
+                return false;
+            }
+            if ( !entry6.getGeneName().equals( "ras" ) ) {
+                return false;
+            }
+            if ( !entry6.getSequenceName().equals( "Human SK2 c-Ha-ras-1 oncogene-encoded protein gene, exon 1" ) ) {
+                return false;
+            }
+            if ( !entry6.getTaxonomyIdentifier().equals( "9606" ) ) {
+                return false;
+            }
+            if ( !entry6.getTaxonomyScientificName().equals( "Homo sapiens" ) ) {
+                return false;
+            }
+            if ( entry6.getCrossReferences().size() < 1 ) {
+                return false;
+            }
         }
         catch ( final IOException e ) {
             System.out.println();
@@ -4141,7 +4926,8 @@ public final class Test {
             for( final PhylogenyNodeIterator iter = t5.iteratorExternalForward(); iter.hasNext(); ) {
                 final PhylogenyNode node = iter.next();
             }
-            final Phylogeny t6 = factory.create( "((((((A))),(((B))),((C)),((((D)))),E)),((F)))", new NHXParser() )[ 0 ];
+            final Phylogeny t6 = factory.create( "((((((A))),(((B))),((C)),((((D)))),E)),((F)))",
+                                                 new NHXParser() )[ 0 ];
             final PhylogenyNodeIterator iter = t6.iteratorExternalForward();
             if ( !iter.next().getName().equals( "A" ) ) {
                 return false;
@@ -4210,7 +4996,8 @@ public final class Test {
                     .equals( "Mus musculus musculus" ) ) {
                 return false;
             }
-            if ( ParserUtils.extractScientificNameFromNodeName( "could_be_anything_Mus_musculus_musculus_musculus" ) != null ) {
+            if ( ParserUtils
+                    .extractScientificNameFromNodeName( "could_be_anything_Mus_musculus_musculus_musculus" ) != null ) {
                 return false;
             }
             if ( ParserUtils.extractScientificNameFromNodeName( "musculus" ) != null ) {
@@ -4374,7 +5161,6 @@ public final class Test {
                     .equals( "Escherichia coli str. K-12 substr. MG1655star" ) ) {
                 return false;
             }
-            //
             if ( !ParserUtils.extractScientificNameFromNodeName( "Macrocera sp." ).equals( "Macrocera sp." ) ) {
                 return false;
             }
@@ -4388,7 +5174,61 @@ public final class Test {
                     .equals( "Macrocera sp." ) ) {
                 return false;
             }
-            if ( !ParserUtils.extractScientificNameFromNodeName( "Macrocera sp" ).equals( "Macrocera sp" ) ) {
+            if ( !ParserUtils.extractScientificNameFromNodeName( "Macrocera sp" ).equals( "Macrocera sp." ) ) {
+                return false;
+            }
+            if ( !ParserUtils.extractScientificNameFromNodeName( "Sesamum rigidum ssp merenskyanum 07 48" )
+                    .equals( "Sesamum rigidum subsp. merenskyanum" ) ) {
+                return false;
+            }
+            if ( !ParserUtils.extractScientificNameFromNodeName( "Sesamum rigidum ssp. merenskyanum" )
+                    .equals( "Sesamum rigidum subsp. merenskyanum" ) ) {
+                return false;
+            }
+            if ( !ParserUtils.extractScientificNameFromNodeName( "Sesamum rigidum (ssp. merenskyanum)" )
+                    .equals( "Sesamum rigidum (subsp. merenskyanum)" ) ) {
+                return false;
+            }
+            if ( !ParserUtils.extractScientificNameFromNodeName( "Sesamum rigidum (ssp merenskyanum)" )
+                    .equals( "Sesamum rigidum (subsp. merenskyanum)" ) ) {
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testExtractTaxonomyDataFromNodeName() {
+        try {
+            PhylogenyNode n = new PhylogenyNode( "tr|B1AM49|B1AM49_HUMAN" );
+            if ( !ParserUtils.extractTaxonomyDataFromNodeName( n, TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "HUMAN" ) ) {
+                return false;
+            }
+            n = new PhylogenyNode( "tr|B1AM49|B1AM49_HUMAN~1-2" );
+            if ( !ParserUtils.extractTaxonomyDataFromNodeName( n, TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "HUMAN" ) ) {
+                return false;
+            }
+            n = new PhylogenyNode( "tr|B1AM49|HNRPR_HUMAN" );
+            if ( !ParserUtils.extractTaxonomyDataFromNodeName( n, TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "HUMAN" ) ) {
+                return false;
+            }
+            n = new PhylogenyNode( "tr|B1AM49|HNRPR_HUMAN|" );
+            if ( !ParserUtils.extractTaxonomyDataFromNodeName( n, TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "HUMAN" ) ) {
+                return false;
+            }
+            n = new PhylogenyNode( "tr|B1AM49|HNRPR_HUMAN~12" );
+            if ( !ParserUtils.extractTaxonomyDataFromNodeName( n, TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "HUMAN" ) ) {
+                return false;
+            }
+            n = new PhylogenyNode( "HNRPR_HUMAN" );
+            if ( !ParserUtils.extractTaxonomyDataFromNodeName( n, TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "HUMAN" ) ) {
+                return false;
+            }
+            n = new PhylogenyNode( "HNRPR_HUMAN_X" );
+            if ( !ParserUtils.extractTaxonomyDataFromNodeName( n, TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "HUMAN" ) ) {
                 return false;
             }
         }
@@ -4401,7 +5241,8 @@ public final class Test {
 
     private static boolean testExtractTaxonomyCodeFromNodeName() {
         try {
-            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "MOUSE", TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ) != null ) {
+            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "MOUSE",
+                                                              TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ) != null ) {
                 return false;
             }
             if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "SOYBN", TAXONOMY_EXTRACTION.AGGRESSIVE )
@@ -4416,13 +5257,16 @@ public final class Test {
                     .equals( "ARATH" ) ) {
                 return false;
             }
-            if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "RAT", TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "RAT" ) ) {
+            if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "RAT", TAXONOMY_EXTRACTION.AGGRESSIVE )
+                    .equals( "RAT" ) ) {
                 return false;
             }
-            if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "RAT", TAXONOMY_EXTRACTION.AGGRESSIVE ).equals( "RAT" ) ) {
+            if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "RAT", TAXONOMY_EXTRACTION.AGGRESSIVE )
+                    .equals( "RAT" ) ) {
                 return false;
             }
-            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "RAT1", TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ) != null ) {
+            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "RAT1",
+                                                              TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ) != null ) {
                 return false;
             }
             if ( !ParserUtils.extractTaxonomyCodeFromNodeName( " _SOYBN", TAXONOMY_EXTRACTION.AGGRESSIVE )
@@ -4457,18 +5301,20 @@ public final class Test {
                     .equals( "SOYBN" ) ) {
                 return false;
             }
-            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "xxxSOYBNxxx", TAXONOMY_EXTRACTION.AGGRESSIVE ) != null ) {
+            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "xxxSOYBNxxx",
+                                                              TAXONOMY_EXTRACTION.AGGRESSIVE ) != null ) {
                 return false;
             }
             if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "-SOYBN~", TAXONOMY_EXTRACTION.AGGRESSIVE )
                     .equals( "SOYBN" ) ) {
                 return false;
             }
-            if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "NNN8_ECOLI/1-2:0.01",
-                                                               TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT ).equals( "ECOLI" ) ) {
+            if ( !ParserUtils
+                    .extractTaxonomyCodeFromNodeName( "NNN8_ECOLI/1-2:0.01", TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT )
+                    .equals( "ECOLI" ) ) {
                 return false;
             }
-            if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "blag_9YX45-blag", TAXONOMY_EXTRACTION.AGGRESSIVE )
+            if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "blagg_9YX45-blag", TAXONOMY_EXTRACTION.AGGRESSIVE )
                     .equals( "9YX45" ) ) {
                 return false;
             }
@@ -4496,15 +5342,18 @@ public final class Test {
                 return false;
             }
             if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "BCL2_RAT function = 23445",
-                                                               TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ).equals( "RAT" ) ) {
+                                                               TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED )
+                    .equals( "RAT" ) ) {
                 return false;
             }
             if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "BCL2_RAT function = 23445",
-                                                               TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ).equals( "RAT" ) ) {
+                                                               TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED )
+                    .equals( "RAT" ) ) {
                 return false;
             }
             if ( !ParserUtils.extractTaxonomyCodeFromNodeName( "BCL2_RAT|function = 23445",
-                                                               TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ).equals( "RAT" ) ) {
+                                                               TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED )
+                    .equals( "RAT" ) ) {
                 return false;
             }
             if ( ParserUtils.extractTaxonomyCodeFromNodeName( "BCL2_RATfunction = 23445",
@@ -4532,7 +5381,8 @@ public final class Test {
                     .equals( "MOUSE" ) ) {
                 return false;
             }
-            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "_MOUSE ", TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ) != null ) {
+            if ( ParserUtils.extractTaxonomyCodeFromNodeName( "_MOUSE ",
+                                                              TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED ) != null ) {
                 return false;
             }
         }
@@ -4719,12 +5569,22 @@ public final class Test {
 
     private static boolean testFastaParser() {
         try {
-            if ( !FastaParser.isLikelyFasta( new FileInputStream( PATH_TO_TEST_DATA + "fasta_0.fasta" ) ) ) {
+            final FileInputStream fis1 = new FileInputStream( PATH_TO_TEST_DATA + "fasta_0.fasta" );
+            if ( !FastaParser.isLikelyFasta( fis1 ) ) {
+                fis1.close();
                 return false;
             }
-            if ( FastaParser.isLikelyFasta( new FileInputStream( PATH_TO_TEST_DATA + "msa_3.txt" ) ) ) {
+            else {
+                fis1.close();
+            }
+            final FileInputStream fis2 = new FileInputStream( PATH_TO_TEST_DATA + "msa_3.txt" );
+            if ( FastaParser.isLikelyFasta( fis2 ) ) {
+                fis2.close();
                 return false;
             }
+            else {
+                fis2.close();
+            }
             final Msa msa_0 = FastaParser.parseMsa( new FileInputStream( PATH_TO_TEST_DATA + "fasta_0.fasta" ) );
             if ( !msa_0.getSequenceAsString( 0 ).toString().equalsIgnoreCase( "ACGTGKXFMFDMXEXXXSFMFMF" ) ) {
                 return false;
@@ -4735,7 +5595,7 @@ public final class Test {
             if ( !msa_0.getSequenceAsString( 1 ).toString().equalsIgnoreCase( "DKXASDFXSFXFKFKSXDFKSLX" ) ) {
                 return false;
             }
-            if ( !msa_0.getSequenceAsString( 2 ).toString().equalsIgnoreCase( "SXDFKSXLFSFPWEXPRXWXERR" ) ) {
+            if ( !msa_0.getSequenceAsString( 2 ).toString().equalsIgnoreCase( "SXDFKSXLFSFPWEXPROWXERR" ) ) {
                 return false;
             }
             if ( !msa_0.getSequenceAsString( 3 ).toString().equalsIgnoreCase( "AAAAAAAAAAAAAAAAAAAAAAA" ) ) {
@@ -4763,7 +5623,8 @@ public final class Test {
         if ( !SequenceAccessionTools.parseGenbankAccessorFromString( ".AY423861.2" ).equals( "AY423861.2" ) ) {
             return false;
         }
-        if ( !SequenceAccessionTools.parseGenbankAccessorFromString( "345_.AY423861.24_345" ).equals( "AY423861.24" ) ) {
+        if ( !SequenceAccessionTools.parseGenbankAccessorFromString( "345_.AY423861.24_345" )
+                .equals( "AY423861.24" ) ) {
             return false;
         }
         if ( SequenceAccessionTools.parseGenbankAccessorFromString( "AAY423861" ) != null ) {
@@ -4805,13 +5666,13 @@ public final class Test {
     private static boolean testGeneralMsaParser() {
         try {
             final String msa_str_0 = "seq1 abcd\n\nseq2 efgh\n";
-            final Msa msa_0 = GeneralMsaParser.parse( new ByteArrayInputStream( msa_str_0.getBytes() ) );
+            final Msa msa_0 = GeneralMsaParser.parseMsa( new ByteArrayInputStream( msa_str_0.getBytes() ) );
             final String msa_str_1 = "seq1 abc\nseq2 ghi\nseq1 def\nseq2 jkm\n";
-            final Msa msa_1 = GeneralMsaParser.parse( new ByteArrayInputStream( msa_str_1.getBytes() ) );
+            final Msa msa_1 = GeneralMsaParser.parseMsa( new ByteArrayInputStream( msa_str_1.getBytes() ) );
             final String msa_str_2 = "seq1 abc\nseq2 ghi\n\ndef\njkm\n";
-            final Msa msa_2 = GeneralMsaParser.parse( new ByteArrayInputStream( msa_str_2.getBytes() ) );
+            final Msa msa_2 = GeneralMsaParser.parseMsa( new ByteArrayInputStream( msa_str_2.getBytes() ) );
             final String msa_str_3 = "seq1 abc\n def\nseq2 ghi\n jkm\n";
-            final Msa msa_3 = GeneralMsaParser.parse( new ByteArrayInputStream( msa_str_3.getBytes() ) );
+            final Msa msa_3 = GeneralMsaParser.parseMsa( new ByteArrayInputStream( msa_str_3.getBytes() ) );
             if ( !msa_1.getSequenceAsString( 0 ).toString().equalsIgnoreCase( "abcdef" ) ) {
                 return false;
             }
@@ -4848,7 +5709,7 @@ public final class Test {
             if ( !msa_3.getIdentifier( 1 ).toString().equals( "seq2" ) ) {
                 return false;
             }
-            final Msa msa_4 = GeneralMsaParser.parse( new FileInputStream( PATH_TO_TEST_DATA + "msa_1.txt" ) );
+            final Msa msa_4 = GeneralMsaParser.parseMsa( new FileInputStream( PATH_TO_TEST_DATA + "msa_1.txt" ) );
             if ( !msa_4.getSequenceAsString( 0 ).toString().equalsIgnoreCase( "abcdefeeeeeeeexx" ) ) {
                 return false;
             }
@@ -4858,7 +5719,7 @@ public final class Test {
             if ( !msa_4.getSequenceAsString( 2 ).toString().equalsIgnoreCase( "klmnxphhhhhhhhzz" ) ) {
                 return false;
             }
-            final Msa msa_5 = GeneralMsaParser.parse( new FileInputStream( PATH_TO_TEST_DATA + "msa_2.txt" ) );
+            final Msa msa_5 = GeneralMsaParser.parseMsa( new FileInputStream( PATH_TO_TEST_DATA + "msa_2.txt" ) );
             if ( !msa_5.getSequenceAsString( 0 ).toString().equalsIgnoreCase( "abcdefxx" ) ) {
                 return false;
             }
@@ -4868,7 +5729,7 @@ public final class Test {
             if ( !msa_5.getSequenceAsString( 2 ).toString().equalsIgnoreCase( "klmnxpzz" ) ) {
                 return false;
             }
-            final Msa msa_6 = GeneralMsaParser.parse( new FileInputStream( PATH_TO_TEST_DATA + "msa_3.txt" ) );
+            final Msa msa_6 = GeneralMsaParser.parseMsa( new FileInputStream( PATH_TO_TEST_DATA + "msa_3.txt" ) );
             if ( !msa_6.getSequenceAsString( 0 ).toString().equalsIgnoreCase( "abcdefeeeeeeeexx" ) ) {
                 return false;
             }
@@ -4888,7 +5749,7 @@ public final class Test {
 
     private static boolean testGeneralTable() {
         try {
-            final GeneralTable<Integer, String> t0 = new GeneralTable<Integer, String>();
+            final GeneralTable<Integer, String> t0 = new GeneralTable<>();
             t0.setValue( 3, 2, "23" );
             t0.setValue( 10, 1, "error" );
             t0.setValue( 10, 1, "110" );
@@ -4924,7 +5785,7 @@ public final class Test {
             if ( !t0.getValueAsString( 22349, 3434344 ).equals( "" ) ) {
                 return false;
             }
-            final GeneralTable<String, String> t1 = new GeneralTable<String, String>();
+            final GeneralTable<String, String> t1 = new GeneralTable<>();
             t1.setValue( "3", "2", "23" );
             t1.setValue( "10", "1", "error" );
             t1.setValue( "10", "1", "110" );
@@ -5243,9 +6104,9 @@ public final class Test {
             if ( !rt.getName().equals( "r" ) ) {
                 return false;
             }
-            final Phylogeny p3 = factory
-                    .create( "((((a,(b,c)bc)abc,(d,e)de)abcde,f)abcdef,(((g,h)gh,(i,j)ij)ghij,k)ghijk,l)",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny p3 = factory.create(
+                                                 "((((a,(b,c)bc)abc,(d,e)de)abcde,f)abcdef,(((g,h)gh,(i,j)ij)ghij,k)ghijk,l)",
+                                                 new NHXParser() )[ 0 ];
             final PhylogenyNode bc_3 = PhylogenyMethods.calculateLCA( p3.getNode( "b" ), p3.getNode( "c" ) );
             if ( !bc_3.getName().equals( "bc" ) ) {
                 return false;
@@ -5529,9 +6390,9 @@ public final class Test {
             if ( !rt.getName().equals( "r" ) ) {
                 return false;
             }
-            final Phylogeny p3 = factory
-                    .create( "((((a,(b,c)bc)abc,(d,e)de)abcde,f)abcdef,(((g,h)gh,(i,j)ij)ghij,k)ghijk,l)",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny p3 = factory.create(
+                                                 "((((a,(b,c)bc)abc,(d,e)de)abcde,f)abcdef,(((g,h)gh,(i,j)ij)ghij,k)ghijk,l)",
+                                                 new NHXParser() )[ 0 ];
             PhylogenyMethods.preOrderReId( p3 );
             final PhylogenyNode bc_3 = PhylogenyMethods.calculateLCAonTreeWithIdsInPreOrder( p3.getNode( "b" ),
                                                                                              p3.getNode( "c" ) );
@@ -5655,10 +6516,14 @@ public final class Test {
         final String test_dir = Test.PATH_TO_TEST_DATA;
         try {
             final HmmscanPerDomainTableParser parser1 = new HmmscanPerDomainTableParser( new File( test_dir
-                    + ForesterUtil.getFileSeparator() + "hmmscan30b3_output_1" ), "MONBR", INDIVIDUAL_SCORE_CUTOFF.NONE );
+                    + ForesterUtil.getFileSeparator() + "hmmscan30b3_output_1" ),
+                                                                                         "MONBR",
+                                                                                         INDIVIDUAL_SCORE_CUTOFF.NONE );
             parser1.parse();
             final HmmscanPerDomainTableParser parser2 = new HmmscanPerDomainTableParser( new File( test_dir
-                    + ForesterUtil.getFileSeparator() + "hmmscan30b3_output_2" ), "MONBR", INDIVIDUAL_SCORE_CUTOFF.NONE );
+                    + ForesterUtil.getFileSeparator() + "hmmscan30b3_output_2" ),
+                                                                                         "MONBR",
+                                                                                         INDIVIDUAL_SCORE_CUTOFF.NONE );
             final List<Protein> proteins = parser2.parse();
             if ( parser2.getProteinsEncountered() != 4 ) {
                 return false;
@@ -5931,7 +6796,7 @@ public final class Test {
 
     private static boolean testMafft( final String path ) {
         try {
-            final List<String> opts = new ArrayList<String>();
+            final List<String> opts = new ArrayList<>();
             opts.add( "--maxiterate" );
             opts.add( "1000" );
             opts.add( "--localpair" );
@@ -6023,11 +6888,11 @@ public final class Test {
 
     private static boolean testMsaQualityMethod() {
         try {
-            final Sequence s0 = BasicSequence.createAaSequence( "a", "ABAXEFGHIJJE-" );
-            final Sequence s1 = BasicSequence.createAaSequence( "b", "ABBXEFGHIJJBB" );
-            final Sequence s2 = BasicSequence.createAaSequence( "c", "AXCXEFGHIJJ--" );
-            final Sequence s3 = BasicSequence.createAaSequence( "d", "AXDDEFGHIJ---" );
-            final List<Sequence> l = new ArrayList<Sequence>();
+            final MolecularSequence s0 = BasicSequence.createAaSequence( "a", "ABAXEFGHIJJE-" );
+            final MolecularSequence s1 = BasicSequence.createAaSequence( "b", "ABBXEFGHIJJBB" );
+            final MolecularSequence s2 = BasicSequence.createAaSequence( "c", "AXCXEFGHIJJ--" );
+            final MolecularSequence s3 = BasicSequence.createAaSequence( "d", "AXDDEFGHIJ---" );
+            final List<MolecularSequence> l = new ArrayList<>();
             l.add( s0 );
             l.add( s1 );
             l.add( s2 );
@@ -6036,22 +6901,245 @@ public final class Test {
             if ( !isEqual( 1, MsaMethods.calculateIdentityRatio( msa, 0 ) ) ) {
                 return false;
             }
-            if ( !isEqual( 0.5, MsaMethods.calculateIdentityRatio( msa, 1 ) ) ) {
+            if ( !isEqual( 0.5, MsaMethods.calculateIdentityRatio( msa, 1 ) ) ) {
+                return false;
+            }
+            if ( !isEqual( 0.25, MsaMethods.calculateIdentityRatio( msa, 2 ) ) ) {
+                return false;
+            }
+            if ( !isEqual( 0.75, MsaMethods.calculateIdentityRatio( msa, 3 ) ) ) {
+                return false;
+            }
+            if ( !isEqual( 0.75, MsaMethods.calculateIdentityRatio( msa, 10 ) ) ) {
+                return false;
+            }
+            if ( !isEqual( 0.25, MsaMethods.calculateIdentityRatio( msa, 11 ) ) ) {
+                return false;
+            }
+            if ( !isEqual( 0.25, MsaMethods.calculateIdentityRatio( msa, 12 ) ) ) {
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testMsaEntropy() {
+        try {
+            final MolecularSequence s0 = BasicSequence.createAaSequence( "a", "AAAAAAA" );
+            final MolecularSequence s1 = BasicSequence.createAaSequence( "b", "AAAIACC" );
+            final MolecularSequence s2 = BasicSequence.createAaSequence( "c", "AAIIIIF" );
+            final MolecularSequence s3 = BasicSequence.createAaSequence( "d", "AIIIVVW" );
+            final List<MolecularSequence> l = new ArrayList<>();
+            l.add( s0 );
+            l.add( s1 );
+            l.add( s2 );
+            l.add( s3 );
+            final Msa msa = BasicMsa.createInstance( l );
+            //TODO need to DO the tests!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            //FIXME
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa, 0 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa, 1 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa, 2 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa, 3 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa, 4 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa, 5 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa, 6 ) );
+            //            System.out.println();
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 6, msa, 0 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 6, msa, 1 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 6, msa, 2 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 6, msa, 3 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 6, msa, 4 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 6, msa, 5 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 6, msa, 6 ) );
+            final List<MolecularSequence> l2 = new ArrayList<>();
+            l2.add( BasicSequence.createAaSequence( "1", "AAAAAAA" ) );
+            l2.add( BasicSequence.createAaSequence( "2", "AAAIACC" ) );
+            l2.add( BasicSequence.createAaSequence( "3", "AAIIIIF" ) );
+            l2.add( BasicSequence.createAaSequence( "4", "AIIIVVW" ) );
+            l2.add( BasicSequence.createAaSequence( "5", "AAAAAAA" ) );
+            l2.add( BasicSequence.createAaSequence( "6", "AAAIACC" ) );
+            l2.add( BasicSequence.createAaSequence( "7", "AAIIIIF" ) );
+            l2.add( BasicSequence.createAaSequence( "8", "AIIIVVW" ) );
+            l2.add( BasicSequence.createAaSequence( "9", "AAAAAAA" ) );
+            l2.add( BasicSequence.createAaSequence( "10", "AAAIACC" ) );
+            l2.add( BasicSequence.createAaSequence( "11", "AAIIIIF" ) );
+            l2.add( BasicSequence.createAaSequence( "12", "AIIIVVW" ) );
+            l2.add( BasicSequence.createAaSequence( "13", "AAIIIIF" ) );
+            l2.add( BasicSequence.createAaSequence( "14", "AIIIVVW" ) );
+            l2.add( BasicSequence.createAaSequence( "15", "AAAAAAA" ) );
+            l2.add( BasicSequence.createAaSequence( "16", "AAAIACC" ) );
+            l2.add( BasicSequence.createAaSequence( "17", "AAIIIIF" ) );
+            l2.add( BasicSequence.createAaSequence( "18", "AIIIVVW" ) );
+            l2.add( BasicSequence.createAaSequence( "19", "AAAAAAA" ) );
+            l2.add( BasicSequence.createAaSequence( "20", "AAAIACC" ) );
+            l2.add( BasicSequence.createAaSequence( "21", "AAIIIIF" ) );
+            l2.add( BasicSequence.createAaSequence( "22", "AIIIVVW" ) );
+            final Msa msa2 = BasicMsa.createInstance( l2 );
+            //            System.out.println();
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa2, 0 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa2, 1 ) );
+            //            System.out.println( MsaMethods.calcNormalizedShannonsEntropy( 20, msa2, 2 ) );
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testDeleteableMsa() {
+        try {
+            final MolecularSequence s0 = BasicSequence.createAaSequence( "a", "AAAA" );
+            final MolecularSequence s1 = BasicSequence.createAaSequence( "b", "BAAA" );
+            final MolecularSequence s2 = BasicSequence.createAaSequence( "c", "CAAA" );
+            final MolecularSequence s3 = BasicSequence.createAaSequence( "d", "DAAA" );
+            final MolecularSequence s4 = BasicSequence.createAaSequence( "e", "EAAA" );
+            final MolecularSequence s5 = BasicSequence.createAaSequence( "f", "FAAA" );
+            final List<MolecularSequence> l0 = new ArrayList<>();
+            l0.add( s0 );
+            l0.add( s1 );
+            l0.add( s2 );
+            l0.add( s3 );
+            l0.add( s4 );
+            l0.add( s5 );
+            final DeleteableMsa dmsa0 = DeleteableMsa.createInstance( l0 );
+            dmsa0.deleteRow( "b", false );
+            if ( !dmsa0.getIdentifier( 1 ).equals( "c" ) ) {
+                return false;
+            }
+            dmsa0.deleteRow( "e", false );
+            dmsa0.deleteRow( "a", false );
+            dmsa0.deleteRow( "f", false );
+            if ( dmsa0.getLength() != 4 ) {
+                return false;
+            }
+            if ( dmsa0.getNumberOfSequences() != 2 ) {
+                return false;
+            }
+            if ( !dmsa0.getIdentifier( 0 ).equals( "c" ) ) {
+                return false;
+            }
+            if ( !dmsa0.getIdentifier( 1 ).equals( "d" ) ) {
+                return false;
+            }
+            if ( dmsa0.getResidueAt( 0, 0 ) != 'C' ) {
+                return false;
+            }
+            if ( !dmsa0.getSequenceAsString( 0 ).toString().equals( "CAAA" ) ) {
+                return false;
+            }
+            if ( dmsa0.getColumnAt( 0 ).size() != 2 ) {
+                return false;
+            }
+            dmsa0.deleteRow( "c", false );
+            dmsa0.deleteRow( "d", false );
+            if ( dmsa0.getNumberOfSequences() != 0 ) {
+                return false;
+            }
+            //
+            final MolecularSequence s_0 = BasicSequence.createAaSequence( "a", "--A---B-C--X----" );
+            final MolecularSequence s_1 = BasicSequence.createAaSequence( "b", "--B-----C-------" );
+            final MolecularSequence s_2 = BasicSequence.createAaSequence( "c", "--C--AB-C------Z" );
+            final MolecularSequence s_3 = BasicSequence.createAaSequence( "d", "--D--AA-C-------" );
+            final MolecularSequence s_4 = BasicSequence.createAaSequence( "e", "--E--AA-C-------" );
+            final MolecularSequence s_5 = BasicSequence.createAaSequence( "f", "--F--AB-CD--Y---" );
+            final List<MolecularSequence> l1 = new ArrayList<>();
+            l1.add( s_0 );
+            l1.add( s_1 );
+            l1.add( s_2 );
+            l1.add( s_3 );
+            l1.add( s_4 );
+            l1.add( s_5 );
+            final DeleteableMsa dmsa1 = DeleteableMsa.createInstance( l1 );
+            dmsa1.deleteGapOnlyColumns();
+            dmsa1.deleteRow( "a", false );
+            dmsa1.deleteRow( "f", false );
+            dmsa1.deleteRow( "d", false );
+            dmsa1.deleteGapOnlyColumns();
+            if ( !dmsa1.getSequenceAsString( 0 ).toString().equals( "B--C-" ) ) {
+                return false;
+            }
+            if ( !dmsa1.getSequenceAsString( 1 ).toString().equals( "CABCZ" ) ) {
+                return false;
+            }
+            if ( !dmsa1.getSequenceAsString( 2 ).toString().equals( "EAAC-" ) ) {
+                return false;
+            }
+            dmsa1.deleteRow( "c", false );
+            dmsa1.deleteGapOnlyColumns();
+            final Writer w0 = new StringWriter();
+            dmsa1.write( w0, MSA_FORMAT.FASTA );
+            final Writer w1 = new StringWriter();
+            dmsa1.write( w1, MSA_FORMAT.PHYLIP );
+            if ( !dmsa1.getSequenceAsString( 0 ).toString().equals( "B--C" ) ) {
+                return false;
+            }
+            if ( !dmsa1.getSequenceAsString( 1 ).toString().equals( "EAAC" ) ) {
+                return false;
+            }
+            final MolecularSequence s__0 = BasicSequence.createAaSequence( "a", "A------" );
+            final MolecularSequence s__1 = BasicSequence.createAaSequence( "b", "BB-----" );
+            final MolecularSequence s__2 = BasicSequence.createAaSequence( "c", "CCC----" );
+            final MolecularSequence s__3 = BasicSequence.createAaSequence( "d", "DDDD---" );
+            final MolecularSequence s__4 = BasicSequence.createAaSequence( "e", "EEEEE--" );
+            final MolecularSequence s__5 = BasicSequence.createAaSequence( "f", "FFFFFF-" );
+            final List<MolecularSequence> l2 = new ArrayList<>();
+            l2.add( s__0 );
+            l2.add( s__1 );
+            l2.add( s__2 );
+            l2.add( s__3 );
+            l2.add( s__4 );
+            l2.add( s__5 );
+            final DeleteableMsa dmsa2 = DeleteableMsa.createInstance( l2 );
+            dmsa2.deleteGapColumns( 0.5 );
+            if ( !dmsa2.getSequenceAsString( 0 ).toString().equals( "A---" ) ) {
+                return false;
+            }
+            if ( !dmsa2.getSequenceAsString( 1 ).toString().equals( "BB--" ) ) {
                 return false;
             }
-            if ( !isEqual( 0.25, MsaMethods.calculateIdentityRatio( msa, 2 ) ) ) {
+            if ( !dmsa2.getSequenceAsString( 2 ).toString().equals( "CCC-" ) ) {
                 return false;
             }
-            if ( !isEqual( 0.75, MsaMethods.calculateIdentityRatio( msa, 3 ) ) ) {
+            dmsa2.deleteGapColumns( 0.2 );
+            if ( !dmsa2.getSequenceAsString( 0 ).toString().equals( "A-" ) ) {
                 return false;
             }
-            if ( !isEqual( 0.75, MsaMethods.calculateIdentityRatio( msa, 10 ) ) ) {
+            if ( !dmsa2.getSequenceAsString( 1 ).toString().equals( "BB" ) ) {
                 return false;
             }
-            if ( !isEqual( 0.25, MsaMethods.calculateIdentityRatio( msa, 11 ) ) ) {
+            if ( !dmsa2.getSequenceAsString( 2 ).toString().equals( "CC" ) ) {
                 return false;
             }
-            if ( !isEqual( 0.25, MsaMethods.calculateIdentityRatio( msa, 12 ) ) ) {
+            dmsa2.deleteGapColumns( 0 );
+            dmsa2.deleteRow( "a", false );
+            dmsa2.deleteRow( "b", false );
+            dmsa2.deleteRow( "f", false );
+            dmsa2.deleteRow( "e", false );
+            dmsa2.setIdentifier( 0, "new_c" );
+            dmsa2.setIdentifier( 1, "new_d" );
+            dmsa2.setResidueAt( 0, 0, 'x' );
+            final MolecularSequence s = dmsa2.deleteRow( "new_d", true );
+            if ( !s.getMolecularSequenceAsString().equals( "D" ) ) {
+                return false;
+            }
+            final Writer w = new StringWriter();
+            dmsa2.write( w, MSA_FORMAT.PHYLIP );
+            final String phylip = w.toString();
+            if ( !phylip.equals( "1 1" + ForesterUtil.LINE_SEPARATOR + "new_c x" + ForesterUtil.LINE_SEPARATOR ) ) {
+                System.out.println( phylip );
+                return false;
+            }
+            final Writer w2 = new StringWriter();
+            dmsa2.write( w2, MSA_FORMAT.FASTA );
+            final String fasta = w2.toString();
+            if ( !fasta.equals( ">new_c" + ForesterUtil.LINE_SEPARATOR + "x" + ForesterUtil.LINE_SEPARATOR ) ) {
+                System.out.println( fasta );
                 return false;
             }
         }
@@ -6066,9 +7154,9 @@ public final class Test {
         try {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
             PhylogenyNode n;
-            List<PhylogenyNode> ext = new ArrayList<PhylogenyNode>();
+            List<PhylogenyNode> ext = new ArrayList<>();
             final StringBuffer sb0 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h))fgh)cdefgh)abcdefgh" );
-            final Phylogeny t0 = factory.create( sb0, new NHXParser() )[ 0 ];
+            final Phylogeny t0 = factory.create( sb0.toString(), new NHXParser() )[ 0 ];
             t0.getNode( "cd" ).setCollapse( true );
             t0.getNode( "cde" ).setCollapse( true );
             n = t0.getFirstExternalNode();
@@ -6096,12 +7184,12 @@ public final class Test {
             }
             ext.clear();
             final StringBuffer sb1 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h))fgh)cdefgh)abcdefgh" );
-            final Phylogeny t1 = factory.create( sb1, new NHXParser() )[ 0 ];
+            final Phylogeny t1 = factory.create( sb1.toString(), new NHXParser() )[ 0 ];
             t1.getNode( "ab" ).setCollapse( true );
             t1.getNode( "cd" ).setCollapse( true );
             t1.getNode( "cde" ).setCollapse( true );
             n = t1.getNode( "ab" );
-            ext = new ArrayList<PhylogenyNode>();
+            ext = new ArrayList<>();
             while ( n != null ) {
                 ext.add( n );
                 n = n.getNextExternalNodeWhileTakingIntoAccountCollapsedNodes();
@@ -6121,11 +7209,9 @@ public final class Test {
             if ( !ext.get( 4 ).getName().equals( "h" ) ) {
                 return false;
             }
-            //
-            //
             ext.clear();
             final StringBuffer sb2 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t2 = factory.create( sb2, new NHXParser() )[ 0 ];
+            final Phylogeny t2 = factory.create( sb2.toString(), new NHXParser() )[ 0 ];
             t2.getNode( "ab" ).setCollapse( true );
             t2.getNode( "cd" ).setCollapse( true );
             t2.getNode( "cde" ).setCollapse( true );
@@ -6134,7 +7220,7 @@ public final class Test {
             t2.getNode( "e" ).setCollapse( true );
             t2.getNode( "gh" ).setCollapse( true );
             n = t2.getNode( "ab" );
-            ext = new ArrayList<PhylogenyNode>();
+            ext = new ArrayList<>();
             while ( n != null ) {
                 ext.add( n );
                 n = n.getNextExternalNodeWhileTakingIntoAccountCollapsedNodes();
@@ -6151,11 +7237,9 @@ public final class Test {
             if ( !ext.get( 3 ).getName().equals( "gh" ) ) {
                 return false;
             }
-            //
-            //
             ext.clear();
             final StringBuffer sb3 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t3 = factory.create( sb3, new NHXParser() )[ 0 ];
+            final Phylogeny t3 = factory.create( sb3.toString(), new NHXParser() )[ 0 ];
             t3.getNode( "ab" ).setCollapse( true );
             t3.getNode( "cd" ).setCollapse( true );
             t3.getNode( "cde" ).setCollapse( true );
@@ -6165,7 +7249,7 @@ public final class Test {
             t3.getNode( "gh" ).setCollapse( true );
             t3.getNode( "fgh" ).setCollapse( true );
             n = t3.getNode( "ab" );
-            ext = new ArrayList<PhylogenyNode>();
+            ext = new ArrayList<>();
             while ( n != null ) {
                 ext.add( n );
                 n = n.getNextExternalNodeWhileTakingIntoAccountCollapsedNodes();
@@ -6179,11 +7263,9 @@ public final class Test {
             if ( !ext.get( 2 ).getName().equals( "fgh" ) ) {
                 return false;
             }
-            //
-            //
             ext.clear();
             final StringBuffer sb4 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t4 = factory.create( sb4, new NHXParser() )[ 0 ];
+            final Phylogeny t4 = factory.create( sb4.toString(), new NHXParser() )[ 0 ];
             t4.getNode( "ab" ).setCollapse( true );
             t4.getNode( "cd" ).setCollapse( true );
             t4.getNode( "cde" ).setCollapse( true );
@@ -6197,10 +7279,8 @@ public final class Test {
             if ( n.getNextExternalNodeWhileTakingIntoAccountCollapsedNodes() != null ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb5 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h))fgh)cdefgh)abcdefgh" );
-            final Phylogeny t5 = factory.create( sb5, new NHXParser() )[ 0 ];
+            final Phylogeny t5 = factory.create( sb5.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             n = t5.getFirstExternalNode();
             while ( n != null ) {
@@ -6234,10 +7314,8 @@ public final class Test {
             if ( !ext.get( 7 ).getName().equals( "h" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb6 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h))fgh)cdefgh)abcdefgh" );
-            final Phylogeny t6 = factory.create( sb6, new NHXParser() )[ 0 ];
+            final Phylogeny t6 = factory.create( sb6.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t6.getNode( "ab" ).setCollapse( true );
             n = t6.getNode( "ab" );
@@ -6269,10 +7347,8 @@ public final class Test {
             if ( !ext.get( 6 ).getName().equals( "h" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb7 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h))fgh)cdefgh)abcdefgh" );
-            final Phylogeny t7 = factory.create( sb7, new NHXParser() )[ 0 ];
+            final Phylogeny t7 = factory.create( sb7.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t7.getNode( "cd" ).setCollapse( true );
             n = t7.getNode( "a" );
@@ -6304,10 +7380,8 @@ public final class Test {
             if ( !ext.get( 6 ).getName().equals( "h" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb8 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h))fgh)cdefgh)abcdefgh" );
-            final Phylogeny t8 = factory.create( sb8, new NHXParser() )[ 0 ];
+            final Phylogeny t8 = factory.create( sb8.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t8.getNode( "cd" ).setCollapse( true );
             t8.getNode( "c" ).setCollapse( true );
@@ -6342,10 +7416,8 @@ public final class Test {
             if ( !ext.get( 6 ).getName().equals( "h" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb9 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t9 = factory.create( sb9, new NHXParser() )[ 0 ];
+            final Phylogeny t9 = factory.create( sb9.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t9.getNode( "gh" ).setCollapse( true );
             n = t9.getNode( "a" );
@@ -6377,10 +7449,8 @@ public final class Test {
             if ( !ext.get( 6 ).getName().equals( "gh" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb10 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t10 = factory.create( sb10, new NHXParser() )[ 0 ];
+            final Phylogeny t10 = factory.create( sb10.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t10.getNode( "gh" ).setCollapse( true );
             t10.getNode( "g" ).setCollapse( true );
@@ -6414,10 +7484,8 @@ public final class Test {
             if ( !ext.get( 6 ).getName().equals( "gh" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb11 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t11 = factory.create( sb11, new NHXParser() )[ 0 ];
+            final Phylogeny t11 = factory.create( sb11.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t11.getNode( "gh" ).setCollapse( true );
             t11.getNode( "fgh" ).setCollapse( true );
@@ -6447,10 +7515,8 @@ public final class Test {
             if ( !ext.get( 5 ).getName().equals( "fgh" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb12 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t12 = factory.create( sb12, new NHXParser() )[ 0 ];
+            final Phylogeny t12 = factory.create( sb12.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t12.getNode( "gh" ).setCollapse( true );
             t12.getNode( "fgh" ).setCollapse( true );
@@ -6483,10 +7549,8 @@ public final class Test {
             if ( !ext.get( 5 ).getName().equals( "fgh" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb13 = new StringBuffer( "((a,b)ab,(((c,d)cd,e)cde,(f,(g,h)gh)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t13 = factory.create( sb13, new NHXParser() )[ 0 ];
+            final Phylogeny t13 = factory.create( sb13.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t13.getNode( "ab" ).setCollapse( true );
             t13.getNode( "b" ).setCollapse( true );
@@ -6515,10 +7579,8 @@ public final class Test {
             if ( !ext.get( 4 ).getName().equals( "fgh" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb14 = new StringBuffer( "((a,b,0)ab,(((c,d)cd,e)cde,(f,(g,h,1,2)gh,0)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t14 = factory.create( sb14, new NHXParser() )[ 0 ];
+            final Phylogeny t14 = factory.create( sb14.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t14.getNode( "ab" ).setCollapse( true );
             t14.getNode( "a" ).setCollapse( true );
@@ -6547,10 +7609,8 @@ public final class Test {
             if ( !ext.get( 4 ).getName().equals( "fgh" ) ) {
                 return false;
             }
-            //
-            //
             final StringBuffer sb15 = new StringBuffer( "((a,b,0)ab,(((c,d)cd,e)cde,x,(f,(g,h,1,2)gh,0)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t15 = factory.create( sb15, new NHXParser() )[ 0 ];
+            final Phylogeny t15 = factory.create( sb15.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t15.getNode( "ab" ).setCollapse( true );
             t15.getNode( "a" ).setCollapse( true );
@@ -6585,7 +7645,7 @@ public final class Test {
             //
             //
             final StringBuffer sb16 = new StringBuffer( "((a,b,0)ab,(((c,d)cd,e)cde,x,(f,(g,h,1,2)gh,0)fgh)cdefgh)abcdefgh" );
-            final Phylogeny t16 = factory.create( sb16, new NHXParser() )[ 0 ];
+            final Phylogeny t16 = factory.create( sb16.toString(), new NHXParser() )[ 0 ];
             ext.clear();
             t16.getNode( "ab" ).setCollapse( true );
             t16.getNode( "a" ).setCollapse( true );
@@ -6950,12 +8010,12 @@ public final class Test {
             if ( phylogenies.length != 9 ) {
                 return false;
             }
-            if ( !isEqual( 0.48039661496919533, phylogenies[ 0 ].getNode( "Diadocidia_spinosula" )
-                    .getDistanceToParent() ) ) {
+            if ( !isEqual( 0.48039661496919533,
+                           phylogenies[ 0 ].getNode( "Diadocidia_spinosula" ).getDistanceToParent() ) ) {
                 return false;
             }
-            if ( !isEqual( 0.3959796191512233, phylogenies[ 0 ].getNode( "Diadocidia_stanfordensis" )
-                    .getDistanceToParent() ) ) {
+            if ( !isEqual( 0.3959796191512233,
+                           phylogenies[ 0 ].getNode( "Diadocidia_stanfordensis" ).getDistanceToParent() ) ) {
                 return false;
             }
             if ( !phylogenies[ 0 ].getName().equals( "Family Diadocidiidae MLT (Imported_tree_0)" ) ) {
@@ -7005,7 +8065,6 @@ public final class Test {
             if ( phy != null ) {
                 return false;
             }
-            //
             p.reset();
             if ( !p.hasNext() ) {
                 return false;
@@ -7027,7 +8086,6 @@ public final class Test {
             if ( phy != null ) {
                 return false;
             }
-            ////
             p.setSource( Test.PATH_TO_TEST_DATA + "nexus_test_2.nex" );
             if ( !p.hasNext() ) {
                 return false;
@@ -7049,7 +8107,6 @@ public final class Test {
             if ( phy != null ) {
                 return false;
             }
-            //
             p.reset();
             if ( !p.hasNext() ) {
                 return false;
@@ -7071,7 +8128,6 @@ public final class Test {
             if ( phy != null ) {
                 return false;
             }
-            //
             p.setSource( Test.PATH_TO_TEST_DATA + "nexus_test_3.nex" );
             if ( !p.hasNext() ) {
                 return false;
@@ -7354,8 +8410,7 @@ public final class Test {
                 System.out.println( phy.getNumberOfExternalNodes() );
                 return false;
             }
-            if ( !phy
-                    .toNewHampshire()
+            if ( !phy.toNewHampshire()
                     .equals( "(1:0.212481,8:0.297838,(9:0.222729,((6:0.201563,7:0.194547):0.282035,(4:1.146091,(3:1.008881,(10:0.384105,(2:0.235682,5:0.353432):0.32368):0.103875):0.41354):0.254687):0.095341):0.079254):0.0;" ) ) {
                 System.out.println( phy.toNewHampshire() );
                 return false;
@@ -7375,8 +8430,7 @@ public final class Test {
                 System.out.println( phy.getNumberOfExternalNodes() );
                 return false;
             }
-            if ( !phy
-                    .toNewHampshire()
+            if ( !phy.toNewHampshire()
                     .equals( "(1:0.212481,8:0.297838,(9:0.222729,((6:0.201563,7:0.194547):0.282035,(4:1.146091,(3:1.008881,(10:0.384105,(2:0.235682,5:0.353432):0.32368):0.103875):0.41354):0.254687):0.095341):0.079254):0.0;" ) ) {
                 System.out.println( phy.toNewHampshire() );
                 return false;
@@ -7396,8 +8450,7 @@ public final class Test {
                 System.out.println( phy.getNumberOfExternalNodes() );
                 return false;
             }
-            if ( !phy
-                    .toNewHampshire()
+            if ( !phy.toNewHampshire()
                     .equals( "(1:0.212481,8:0.297838,(9:0.222729,((6:0.201563,7:0.194547):0.282035,(4:1.146091,(3:1.008881,(10:0.384105,(2:0.235682,5:0.353432):0.32368):0.103875):0.41354):0.254687):0.095341):0.079254):0.0;" ) ) {
                 System.out.println( phy.toNewHampshire() );
                 return false;
@@ -7417,8 +8470,7 @@ public final class Test {
                 System.out.println( phy.getNumberOfExternalNodes() );
                 return false;
             }
-            if ( !phy
-                    .toNewHampshire()
+            if ( !phy.toNewHampshire()
                     .equals( "(1:0.212481,8:0.297838,(9:0.222729,((6:0.201563,7:0.194547):0.282035,(4:1.146091,(3:1.008881,(10:0.384105,(2:0.235682,5:0.353432):0.32368):0.103875):0.41354):0.254687):0.095341):0.079254):0.0;" ) ) {
                 System.out.println( phy.toNewHampshire() );
                 return false;
@@ -7800,19 +8852,19 @@ public final class Test {
             if ( !uc0.getRoot().getChildNode( 1 ).getName().equals( "B B" ) ) {
                 return false;
             }
-            final Phylogeny p1b = factory
-                    .create( "   \n  \t  \b   \r \f   ; (  \n  \t  \b   \r \f; A ;  \n  \t  \b   \r \f,  \n  \t  \b   \r \f; B ;   \n  \t  \b   \r \f 1  \n  \t  \b   \r \f ;  \n  \t  \b   \r \f );;;;; \n  \t  \b   \r \f;;;  \n  \t  \b   \r \f ",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny p1b = factory.create(
+                                                  "   \n  \t  \b   \r \f   ; (  \n  \t  \b   \r \f; A ;  \n  \t  \b   \r \f,  \n  \t  \b   \r \f; B ;   \n  \t  \b   \r \f 1  \n  \t  \b   \r \f ;  \n  \t  \b   \r \f );;;;; \n  \t  \b   \r \f;;;  \n  \t  \b   \r \f ",
+                                                  new NHXParser() )[ 0 ];
             if ( !p1b.toNewHampshireX().equals( "(';A;',';B;1;')" ) ) {
                 return false;
             }
             if ( !p1b.toNewHampshire().equals( "(';A;',';B;1;');" ) ) {
                 return false;
             }
-            final Phylogeny p2 = factory.create( new StringBuffer( "(A,B2)" ), new NHXParser() )[ 0 ];
+            final Phylogeny p2 = factory.create( new StringBuffer( "(A,B2)" ).toString(), new NHXParser() )[ 0 ];
             final Phylogeny p3 = factory.create( new char[] { '(', 'A', ',', 'B', '3', ')' }, new NHXParser() )[ 0 ];
             final Phylogeny p4 = factory.create( "(A,B4);", new NHXParser() )[ 0 ];
-            final Phylogeny p5 = factory.create( new StringBuffer( "(A,B5);" ), new NHXParser() )[ 0 ];
+            final Phylogeny p5 = factory.create( new StringBuffer( "(A,B5);" ).toString(), new NHXParser() )[ 0 ];
             final Phylogeny[] p7 = factory.create( "(A,B7);(C,D7)", new NHXParser() );
             final Phylogeny[] p8 = factory.create( "(A,B8) (C,D8)", new NHXParser() );
             final Phylogeny[] p9 = factory.create( "(A,B9)\n(C,D9)", new NHXParser() );
@@ -7820,8 +8872,7 @@ public final class Test {
             final Phylogeny[] p11 = factory.create( "(A,B11);(C,D11) (E,F11)\t(G,H11)", new NHXParser() );
             final Phylogeny[] p12 = factory.create( "(A,B12) (C,D12) (E,F12) (G,H12)", new NHXParser() );
             final Phylogeny[] p13 = factory.create( " ; (;A; , ; B ; 1  3 ; \n)\t ( \n ;"
-                                                            + " C ; ,; D;13;);;;;;;(;E;,;F;13 ;) ; "
-                                                            + "; ; ( \t\n\r\b; G ;, ;H ;1 3; )  ;  ;   ;",
+                    + " C ; ,; D;13;);;;;;;(;E;,;F;13 ;) ; " + "; ; ( \t\n\r\b; G ;, ;H ;1 3; )  ;  ;   ;",
                                                     new NHXParser() );
             if ( !p13[ 0 ].toNewHampshireX().equals( "(';A;',';B;13;')" ) ) {
                 return false;
@@ -8070,21 +9121,24 @@ public final class Test {
             if ( p46.length != 0 ) {
                 return false;
             }
-            final Phylogeny p47 = factory.create( new StringBuffer( "((A,B)ab:2[0.44],C)" ), new NHXParser() )[ 0 ];
+            final Phylogeny p47 = factory.create( new StringBuffer( "((A,B)ab:2[0.44],C)" ).toString(),
+                                                  new NHXParser() )[ 0 ];
             if ( !isEqual( 0.44, p47.getNode( "ab" ).getBranchData().getConfidence( 0 ).getValue() ) ) {
                 return false;
             }
-            final Phylogeny p48 = factory.create( new StringBuffer( "((A,B)ab:2[88],C)" ), new NHXParser() )[ 0 ];
+            final Phylogeny p48 = factory.create( new StringBuffer( "((A,B)ab:2[88],C)" ).toString(),
+                                                  new NHXParser() )[ 0 ];
             if ( !isEqual( 88, p48.getNode( "ab" ).getBranchData().getConfidence( 0 ).getValue() ) ) {
                 return false;
             }
             final Phylogeny p49 = factory
-                    .create( new StringBuffer( "((A,B)a[comment:a,b;(a)]b:2[0.44][comment(a,b,b);],C)" ),
+                    .create( new StringBuffer( "((A,B)a[comment:a,b;(a)]b:2[0.44][comment(a,b,b);],C)" ).toString(),
                              new NHXParser() )[ 0 ];
             if ( !isEqual( 0.44, p49.getNode( "ab" ).getBranchData().getConfidence( 0 ).getValue() ) ) {
                 return false;
             }
-            final Phylogeny p50 = factory.create( new StringBuffer( "((\"A\",B)ab:2[88],C)" ), new NHXParser() )[ 0 ];
+            final Phylogeny p50 = factory.create( new StringBuffer( "((\"A\",B)ab:2[88],C)" ).toString(),
+                                                  new NHXParser() )[ 0 ];
             if ( p50.getNode( "A" ) == null ) {
                 return false;
             }
@@ -8099,55 +9153,200 @@ public final class Test {
                     .equals( "((A,B)88:2.0,C);" ) ) {
                 return false;
             }
-            final Phylogeny p51 = factory.create( new StringBuffer( "((\"A(A\",B)ab:2[88],C)" ), new NHXParser() )[ 0 ];
+            final Phylogeny p51 = factory.create( new StringBuffer( "((\"A(A\",B)ab:2[88],C)" ).toString(),
+                                                  new NHXParser() )[ 0 ];
             if ( p51.getNode( "A(A" ) == null ) {
                 return false;
             }
-            final Phylogeny p52 = factory.create( new StringBuffer( "(('A(A',B)ab:2[88],C)" ), new NHXParser() )[ 0 ];
+            final Phylogeny p52 = factory.create( new StringBuffer( "(('A(A',B)ab:2[88],C)" ).toString(),
+                                                  new NHXParser() )[ 0 ];
             if ( p52.getNode( "A(A" ) == null ) {
                 return false;
             }
             final Phylogeny p53 = factory
-                    .create( new StringBuffer( "(('A(A',\"B (x (a' ,b) f(x);\"[com])[ment]ab:2[88],C)" ),
+                    .create( new StringBuffer( "(('A(A',\"B (x (a' ,b) f(x);\"[com])[ment]ab:2[88],C)" ).toString(),
                              new NHXParser() )[ 0 ];
             if ( p53.getNode( "B (x (a' ,b) f(x);" ) == null ) {
                 return false;
             }
-            final Phylogeny p54 = factory.create( new StringBuffer( "((A,B):[88],C)" ), new NHXParser() )[ 0 ];
+            final Phylogeny p54 = factory.create( new StringBuffer( "((A,B):[88],C)" ).toString(),
+                                                  new NHXParser() )[ 0 ];
             if ( p54.getNode( "A" ) == null ) {
                 return false;
             }
-            if ( !p54.toNewHampshire( NH_CONVERSION_SUPPORT_VALUE_STYLE.IN_SQUARE_BRACKETS ).equals( "((A,B)[88],C);" ) ) {
+            if ( !p54.toNewHampshire( NH_CONVERSION_SUPPORT_VALUE_STYLE.IN_SQUARE_BRACKETS )
+                    .equals( "((A,B)[88],C);" ) ) {
                 return false;
             }
-            // 
             final Phylogeny p55 = factory
-                    .create( new StringBuffer( "((\"lcl|HPV32_L1.:1  s\":0.195593,\"lcl|HPV30_L1.1|;a\":0.114237):0.0359322,\"lcl|HPV56_L1.1|,d\":0.0727412,\"lcl|HPV66_L1.1x\":0.0798012);" ),
-                             new NHXParser() )[ 0 ];
-            if ( !p55
-                    .toNewHampshire()
+                    .create( new StringBuffer( "((\"lcl|HPV32_L1.:1  s\":0.195593,\"lcl|HPV30_L1.1|;a\":0.114237):0.0359322,\"lcl|HPV56_L1.1|,d\":0.0727412,\"lcl|HPV66_L1.1x\":0.0798012);" )
+                            .toString(), new NHXParser() )[ 0 ];
+            if ( !p55.toNewHampshire()
                     .equals( "(('lcl|HPV32_L1.:1 s':0.195593,'lcl|HPV30_L1.1|;a':0.114237):0.0359322,'lcl|HPV56_L1.1|,d':0.0727412,lcl|HPV66_L1.1x:0.0798012);" ) ) {
                 System.out.println( p55.toNewHampshire() );
                 return false;
             }
             final Phylogeny p56 = factory
-                    .create( new StringBuffer( "((\"lcl|HPV32_L1.:1      s\":0.195593,\"lcl|HPV30_L1.1|;a\":0.114\n237):0.0359322,\"lcl|HPV56_L1.1|,d\":0.0727412,\"lcl|HPV66_L1.1:x\":0.0798012);" ),
-                             new NHXParser() )[ 0 ];
-            if ( !p56
-                    .toNewHampshire()
+                    .create( new StringBuffer( "((\"lcl|HPV32_L1.:1      s\":0.195593,\"lcl|HPV30_L1.1|;a\":0.114\n237):0.0359322,\"lcl|HPV56_L1.1|,d\":0.0727412,\"lcl|HPV66_L1.1:x\":0.0798012);" )
+                            .toString(), new NHXParser() )[ 0 ];
+            if ( !p56.toNewHampshire()
                     .equals( "(('lcl|HPV32_L1.:1 s':0.195593,'lcl|HPV30_L1.1|;a':0.114237):0.0359322,'lcl|HPV56_L1.1|,d':0.0727412,'lcl|HPV66_L1.1:x':0.0798012);" ) ) {
                 System.out.println( p56.toNewHampshire() );
                 return false;
             }
             final Phylogeny p57 = factory
-                    .create( new StringBuffer( "((\"lcl|HPV32_L1.:1      s\":0.195593,\"lcl|HPV30_L1.1|;a\":0.114\n237):0.0359322,\"lcl|HPV56_L1.1|,d\":0.0727412,\"lcl|HPV66_L1.1:x\":0.0798012);" ),
-                             new NHXParser() )[ 0 ];
-            if ( !p57
-                    .toNewHampshire()
+                    .create( new StringBuffer( "((\"lcl|HPV32_L1.:1      s\":0.195593,\"lcl|HPV30_L1.1|;a\":0.114\n237):0.0359322,\"lcl|HPV56_L1.1|,d\":0.0727412,\"lcl|HPV66_L1.1:x\":0.0798012);" )
+                            .toString(), new NHXParser() )[ 0 ];
+            if ( !p57.toNewHampshire()
                     .equals( "(('lcl|HPV32_L1.:1 s':0.195593,'lcl|HPV30_L1.1|;a':0.114237):0.0359322,'lcl|HPV56_L1.1|,d':0.0727412,'lcl|HPV66_L1.1:x':0.0798012);" ) ) {
                 System.out.println( p56.toNewHampshire() );
                 return false;
             }
+            final String s58 = "('Homo \"man\" sapiens:1',\"Homo 'man' sapiens;\")';root \"1_ )';";
+            final Phylogeny p58 = factory.create( s58, new NHXParser() )[ 0 ];
+            if ( !p58.toNewHampshire().equals( s58 ) ) {
+                System.out.println( p58.toNewHampshire() );
+                return false;
+            }
+            final String s59 = "('Homo \"man sapiens:1',\"Homo 'man sapiens\")\"root; '1_ )\";";
+            final Phylogeny p59 = factory.create( s59, new NHXParser() )[ 0 ];
+            if ( !p59.toNewHampshire().equals( s59 ) ) {
+                System.out.println( p59.toNewHampshire() );
+                return false;
+            }
+            final String s60 = "('\" ;,:\":\"',\"'abc def' g's_\",'=:0.45+,.:%~`!@#$%^&*()_-+={} | ;,');";
+            final Phylogeny p60 = factory.create( s60, new NHXParser() )[ 0 ];
+            if ( !p60.toNewHampshire().equals( s60 ) ) {
+                System.out.println( p60.toNewHampshire() );
+                return false;
+            }
+            final String s61 = "('H[omo] \"man\" sapiens:1',\"H[omo] 'man' sapiens;\",H[omo] sapiens)';root \"1_ )';";
+            final Phylogeny p61 = factory.create( s61, new NHXParser() )[ 0 ];
+            if ( !p61.toNewHampshire()
+                    .equals( "('H{omo} \"man\" sapiens:1',\"H{omo} 'man' sapiens;\",Hsapiens)';root \"1_ )';" ) ) {
+                System.out.println( p61.toNewHampshire() );
+                return false;
+            }
+            final String s62 = "(1[&type=\"X\",size=123,subtree=(1,2);]:0.003,2[&type=\"(X,Y:3)\"]:0.004)[&type=\"(X,Y)\"]:0.0;";
+            final Phylogeny p62 = factory.create( s62, new NHXParser() )[ 0 ];
+            if ( !p62.toNewHampshire().equals( "(1:0.003,2:0.004):0.0;" ) ) {
+                System.out.println( p62.toNewHampshire() );
+                return false;
+            }
+            final String s63 = "(1:0.003[&type=\"X\",size=123,subtree=(1,2);],2:0.004[&type=\"(X,Y:3)\"]):0.0[&type=\"(X,Y)\"];";
+            final Phylogeny p63 = factory.create( s63, new NHXParser() )[ 0 ];
+            if ( !p63.toNewHampshire().equals( "(1:0.003,2:0.004):0.0;" ) ) {
+                System.out.println( p63.toNewHampshire() );
+                return false;
+            }
+            final String s64 = "((1,2):[95.5],3);";
+            final Phylogeny p64 = factory.create( s64, new NHXParser() )[ 0 ];
+            if ( !p64.toNewHampshireX().equals( "((1,2)[&&NHX:B=95.5],3)" ) ) {
+                System.out.println( p64.toNewHampshireX() );
+                return false;
+            }
+            final String s65 = "((1:0.1,2:0.2):0.3[10.2],3);";
+            final Phylogeny p65 = factory.create( s65, new NHXParser() )[ 0 ];
+            if ( !p65.toNewHampshireX().equals( "((1:0.1,2:0.2):0.3[&&NHX:B=10.2],3)" ) ) {
+                System.out.println( p65.toNewHampshireX() );
+                return false;
+            }
+            final Phylogeny p66 = factory.create( "((A,B)ab:2[0.44],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 0.44, p66.getNode( "ab" ).getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p67 = factory.create( "((A,B):2[0.67],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 0.67, p67.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p68 = factory.create( "((A,B):[0.68],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 0.68, p68.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p69 = factory.create( "((A,B)[0.69],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 0.69, p69.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p70 = factory.create( "((A,B)[+0.7],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 0.7, p70.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p71 = factory.create( "((A,B)[-0.71],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( -0.71, p71.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p72 = factory.create( "((A,B)[],C)", new NHXParser() )[ 0 ];
+            if ( !p72.toNewHampshireX().equals( "((A,B),C)" ) ) {
+                return false;
+            }
+            final Phylogeny p73 = factory.create( "((A,B)[12x],C)", new NHXParser() )[ 0 ];
+            if ( !p73.toNewHampshireX().equals( "((A,B),C)" ) ) {
+                return false;
+            }
+            final Phylogeny p74 = factory.create( "((A,B)[12+],C)", new NHXParser() )[ 0 ];
+            if ( !p74.toNewHampshireX().equals( "((A,B),C)" ) ) {
+                return false;
+            }
+            final Phylogeny p75 = factory.create( "((A,B)ab[222]:3,C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 222, p75.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p76 = factory.create( "((A,B)[100]:12,C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 100, p76.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p77 = factory.create( "((A,B)abcde:13[77],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 77, p77.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final Phylogeny p78 = factory.create( "((A,B):14[0],C)", new NHXParser() )[ 0 ];
+            if ( !isEqual( 0, p78.getNode( "A" ).getParent().getBranchData().getConfidence( 0 ).getValue() ) ) {
+                return false;
+            }
+            final String the_one = "((((((a,b)ab:3.0[2],c):12.0[100],(d,e)de)abcde:13.0[2],f):14.0[0]):0.0[0]):0.0[0];";
+            final Phylogeny p79 = factory.create(
+                                                  "((((((a,b)ab[2]:3,c)[100]:12,(d,e)de)abcde:13[2],f):14[0]):0[0])[0]:0;",
+                                                  new NHXParser() )[ 0 ];
+            final String str79 = p79.toNewHampshire( NH_CONVERSION_SUPPORT_VALUE_STYLE.IN_SQUARE_BRACKETS );
+            if ( !str79.equals( the_one ) ) {
+                System.out.println( str79 );
+                return false;
+            }
+            final Phylogeny p80 = factory.create(
+                                                  "((((((a[a)],b[12])ab[2]:3,c)[+100]:12,(d,e)de[12d,)])ab[]c[]de:13[2],f):14[0]):0[0])[0]:0;",
+                                                  new NHXParser() )[ 0 ];
+            final String str80 = p80.toNewHampshire( NH_CONVERSION_SUPPORT_VALUE_STYLE.IN_SQUARE_BRACKETS );
+            if ( !str80.equals( the_one ) ) {
+                System.out.println( str80 );
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testNHParsingSpecialChars() {
+        try {
+            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
+            final String i0 = "(A!+=~QWERTY!@#$%^&*-,€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜˜˜™š›œžŸ¡¢£¤¥¦§¨©ª«¬®¯°±¹²³´µ¶·¸º»¼¿À÷þÿ)";
+            final Phylogeny p0 = factory.create( i0, new NHXParser() )[ 0 ];
+            if ( !p0.toNewHampshireX().equals( i0 ) ) {
+                System.out.println();
+                System.out.println( p0.toNewHampshireX() );
+                System.out.println( i0 );
+                return false;
+            }
+            final String i1 = "(हिंदी,한글,ไทย,'Tiếng Việt',ひらがなカタカナ漢字,繁體字,русский)";
+            final Phylogeny p1 = factory.create( i1, new NHXParser() )[ 0 ];
+            if ( !p1.toNewHampshireX().equals( i1 ) ) {
+                System.out.println();
+                System.out.println( p1.toNewHampshireX() );
+                System.out.println( i1 );
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace( System.out );
@@ -8636,6 +9835,14 @@ public final class Test {
                 System.out.println( n6.toNewHampshireX() );
                 return false;
             }
+            final PhylogenyNode n7 = new PhylogenyNode();
+            n7.setName( "   gks:dr-m4 \"    '    `@:[]sadq04 " );
+            if ( !n7.toNewHampshire( true, PhylogenyNode.NH_CONVERSION_SUPPORT_VALUE_STYLE.IN_SQUARE_BRACKETS )
+                    .equals( "'gks:dr-m4 \" ` `@:[]sadq04'" ) ) {
+                System.out.println( n7
+                        .toNewHampshire( true, PhylogenyNode.NH_CONVERSION_SUPPORT_VALUE_STYLE.IN_SQUARE_BRACKETS ) );
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace( System.out );
@@ -8875,130 +10082,304 @@ public final class Test {
             if ( !n00.getNodeData().getSequence().getName().equals( "gene_name" ) ) {
                 return false;
             }
-            if ( !n00.getNodeData().getSequence().getAccession().getValue().equals( "accession123" ) ) {
+            if ( !n00.getNodeData().getSequence().getAccession().getValue().equals( "accession123" ) ) {
+                return false;
+            }
+            final PhylogenyNode nx = PhylogenyNode.createInstanceFromNhxString( "n5:0.1[&&NHX:S=Ecoli:GN=gene_1]" );
+            if ( !nx.getNodeData().getSequence().getName().equals( "gene_1" ) ) {
+                return false;
+            }
+            final PhylogenyNode n13 = PhylogenyNode
+                    .createInstanceFromNhxString( "BLAH_12345/1-2", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( !n13.getName().equals( "BLAH_12345/1-2" ) ) {
+                return false;
+            }
+            if ( PhylogenyMethods.getSpecies( n13 ).equals( "12345" ) ) {
+                return false;
+            }
+            if ( !n13.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "12345" ) ) {
+                return false;
+            }
+            if ( !n13.getNodeData().getTaxonomy().getIdentifier().getProvider().equals( "uniprot" ) ) {
+                return false;
+            }
+            final PhylogenyNode n14 = PhylogenyNode
+                    .createInstanceFromNhxString( "BLA1_9QX45/1-2", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            if ( !n14.getName().equals( "BLA1_9QX45/1-2" ) ) {
+                return false;
+            }
+            if ( !PhylogenyMethods.getSpecies( n14 ).equals( "9QX45" ) ) {
+                return false;
+            }
+            final PhylogenyNode n15 = PhylogenyNode
+                    .createInstanceFromNhxString( "something_wicked[123]",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            if ( !n15.getName().equals( "something_wicked" ) ) {
+                return false;
+            }
+            if ( n15.getBranchData().getNumberOfConfidences() != 1 ) {
+                return false;
+            }
+            if ( !isEqual( n15.getBranchData().getConfidence( 0 ).getValue(), 123 ) ) {
+                return false;
+            }
+            final PhylogenyNode n16 = PhylogenyNode
+                    .createInstanceFromNhxString( "something_wicked2[9]",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            if ( !n16.getName().equals( "something_wicked2" ) ) {
+                return false;
+            }
+            if ( n16.getBranchData().getNumberOfConfidences() != 1 ) {
+                return false;
+            }
+            if ( !isEqual( n16.getBranchData().getConfidence( 0 ).getValue(), 9 ) ) {
+                return false;
+            }
+            final PhylogenyNode n17 = PhylogenyNode
+                    .createInstanceFromNhxString( "something_wicked3[a]",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            if ( !n17.getName().equals( "something_wicked3" ) ) {
+                return false;
+            }
+            if ( n17.getBranchData().getNumberOfConfidences() != 0 ) {
+                return false;
+            }
+            final PhylogenyNode n18 = PhylogenyNode
+                    .createInstanceFromNhxString( ":0.5[91]", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            if ( !isEqual( n18.getDistanceToParent(), 0.5 ) ) {
+                return false;
+            }
+            if ( n18.getBranchData().getNumberOfConfidences() != 1 ) {
+                return false;
+            }
+            if ( !isEqual( n18.getBranchData().getConfidence( 0 ).getValue(), 91 ) ) {
+                return false;
+            }
+            final PhylogenyNode n19 = PhylogenyNode
+                    .createInstanceFromNhxString( "BLAH_1-roejojoej",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( !n19.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "1" ) ) {
+                return false;
+            }
+            if ( !n19.getNodeData().getTaxonomy().getIdentifier().getProvider().equals( "uniprot" ) ) {
+                return false;
+            }
+            final PhylogenyNode n30 = PhylogenyNode
+                    .createInstanceFromNhxString( "BLAH_1234567-roejojoej",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( !n30.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "1234567" ) ) {
+                return false;
+            }
+            if ( !n30.getNodeData().getTaxonomy().getIdentifier().getProvider().equals( "uniprot" ) ) {
+                return false;
+            }
+            final PhylogenyNode n31 = PhylogenyNode
+                    .createInstanceFromNhxString( "BLAH_12345678-roejojoej",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( n31.getNodeData().isHasTaxonomy() ) {
+                return false;
+            }
+            final PhylogenyNode n32 = PhylogenyNode
+                    .createInstanceFromNhxString( "sd_12345678", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( n32.getNodeData().isHasTaxonomy() ) {
+                return false;
+            }
+            final PhylogenyNode n40 = PhylogenyNode
+                    .createInstanceFromNhxString( "BCL2_12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( !n40.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "12345" ) ) {
+                return false;
+            }
+            final PhylogenyNode n41 = PhylogenyNode
+                    .createInstanceFromNhxString( "12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( n41.getNodeData().isHasTaxonomy() ) {
+                return false;
+            }
+            final PhylogenyNode n42 = PhylogenyNode
+                    .createInstanceFromNhxString( "12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
+            if ( n42.getNodeData().isHasTaxonomy() ) {
+                return false;
+            }
+            final PhylogenyNode n43 = PhylogenyNode.createInstanceFromNhxString( "12345",
+                                                                                 NHXParser.TAXONOMY_EXTRACTION.NO );
+            if ( n43.getNodeData().isHasTaxonomy() ) {
+                return false;
+            }
+            final PhylogenyNode n44 = PhylogenyNode
+                    .createInstanceFromNhxString( "12345~1-2", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( n44.getNodeData().isHasTaxonomy() ) {
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean testNHXNodeParsing2() {
+        try {
+            final PhylogenyNode n0_0 = PhylogenyNode.createInstanceFromNhxString( "n0:[ignore me 123]:1E-3",
+                                                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                                                  true,
+                                                                                  true );
+            if ( !n0_0.getName().equals( "n0" ) ) {
+                return false;
+            }
+            if ( !isEqual( n0_0.getDistanceToParent(), 0.001 ) ) {
+                return false;
+            }
+            final PhylogenyNode n0_1 = PhylogenyNode.createInstanceFromNhxString( "n0[ignore me 123]:1E-3",
+                                                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                                                  true,
+                                                                                  true );
+            if ( !n0_1.getName().equals( "n0" ) ) {
+                return false;
+            }
+            if ( !isEqual( n0_1.getDistanceToParent(), 0.001 ) ) {
+                return false;
+            }
+            final PhylogenyNode n0_2 = PhylogenyNode.createInstanceFromNhxString( "n0:1E-3[ignore me 123]",
+                                                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                                                  true,
+                                                                                  true );
+            if ( !n0_2.getName().equals( "n0" ) ) {
+                return false;
+            }
+            if ( !isEqual( n0_2.getDistanceToParent(), 0.001 ) ) {
+                return false;
+            }
+            final PhylogenyNode n0_3 = PhylogenyNode.createInstanceFromNhxString( "n0:1E-3:[ignore me 123]",
+                                                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                                                  true,
+                                                                                  true );
+            if ( !n0_3.getName().equals( "n0" ) ) {
                 return false;
             }
-            final PhylogenyNode nx = PhylogenyNode.createInstanceFromNhxString( "n5:0.1[&&NHX:S=Ecoli:GN=gene_1]" );
-            if ( !nx.getNodeData().getSequence().getName().equals( "gene_1" ) ) {
+            if ( !isEqual( n0_3.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            final PhylogenyNode n13 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAH_12345/1-2", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( !n13.getName().equals( "BLAH_12345/1-2" ) ) {
+            final PhylogenyNode n0_4 = PhylogenyNode.createInstanceFromNhxString( "n0:0.001:[ignore me 123]",
+                                                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                                                  true,
+                                                                                  true );
+            if ( !n0_4.getName().equals( "n0" ) ) {
                 return false;
             }
-            if ( PhylogenyMethods.getSpecies( n13 ).equals( "12345" ) ) {
+            if ( !isEqual( n0_4.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            if ( !n13.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "12345" ) ) {
+            final PhylogenyNode n1_0 = PhylogenyNode
+                    .createInstanceFromNhxString( "xyz|A/American_duck/NH/00321/|Duck|Canada[&!color=#FFFFFF]",
+                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                  true,
+                                                  true );
+            if ( !n1_0.getName().equals( "xyz|A/American duck/NH/00321/|Duck|Canada" ) ) {
                 return false;
             }
-            if ( !n13.getNodeData().getTaxonomy().getIdentifier().getProvider().equals( "uniprot" ) ) {
+            if ( n1_0.getBranchData().getBranchColor().getValue().getGreen() != 255 ) {
                 return false;
             }
-            final PhylogenyNode n14 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLA1_9QX45/1-2", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            if ( !n14.getName().equals( "BLA1_9QX45/1-2" ) ) {
+            final PhylogenyNode n1_1 = PhylogenyNode
+                    .createInstanceFromNhxString( "xyz|A/American_duck/NH/00321/|Duck|Canada[&!color=#FFFFFF]:0.001",
+                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                  true,
+                                                  true );
+            if ( !n1_1.getName().equals( "xyz|A/American duck/NH/00321/|Duck|Canada" ) ) {
                 return false;
             }
-            if ( !PhylogenyMethods.getSpecies( n14 ).equals( "9QX45" ) ) {
+            if ( n1_1.getBranchData().getBranchColor().getValue().getGreen() != 255 ) {
                 return false;
             }
-            final PhylogenyNode n15 = PhylogenyNode
-                    .createInstanceFromNhxString( "something_wicked[123]",
-                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            if ( !n15.getName().equals( "something_wicked" ) ) {
+            if ( !isEqual( n1_1.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            if ( n15.getBranchData().getNumberOfConfidences() != 1 ) {
+            final PhylogenyNode n1_2 = PhylogenyNode
+                    .createInstanceFromNhxString( "xyz|A/American_duck/NH/00321/|Duck|Canada:0.001[&!color=#FFFFFF]",
+                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                  true,
+                                                  true );
+            if ( !n1_2.getName().equals( "xyz|A/American duck/NH/00321/|Duck|Canada" ) ) {
                 return false;
             }
-            if ( !isEqual( n15.getBranchData().getConfidence( 0 ).getValue(), 123 ) ) {
+            if ( n1_2.getBranchData().getBranchColor().getValue().getGreen() != 255 ) {
                 return false;
             }
-            final PhylogenyNode n16 = PhylogenyNode
-                    .createInstanceFromNhxString( "something_wicked2[9]",
-                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            if ( !n16.getName().equals( "something_wicked2" ) ) {
+            if ( !isEqual( n1_2.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            if ( n16.getBranchData().getNumberOfConfidences() != 1 ) {
+            final PhylogenyNode n1_3 = PhylogenyNode
+                    .createInstanceFromNhxString( "xyz|A/American_duck/NH/00321/|Duck|Canada:1e-3[&boostrap=69,&!color=#FFFFFF]",
+                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                  true,
+                                                  true );
+            if ( !n1_3.getName().equals( "xyz|A/American duck/NH/00321/|Duck|Canada" ) ) {
                 return false;
             }
-            if ( !isEqual( n16.getBranchData().getConfidence( 0 ).getValue(), 9 ) ) {
+            if ( n1_3.getBranchData().getBranchColor().getValue().getGreen() != 255 ) {
                 return false;
             }
-            final PhylogenyNode n17 = PhylogenyNode
-                    .createInstanceFromNhxString( "something_wicked3[a]",
-                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            if ( !n17.getName().equals( "something_wicked3" ) ) {
+            if ( !isEqual( n1_3.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            if ( n17.getBranchData().getNumberOfConfidences() != 0 ) {
+            if ( !isEqual( n1_3.getBranchData().getConfidence( 0 ).getValue(), 69 ) ) {
                 return false;
             }
-            final PhylogenyNode n18 = PhylogenyNode
-                    .createInstanceFromNhxString( ":0.5[91]", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            if ( !isEqual( n18.getDistanceToParent(), 0.5 ) ) {
+            if ( !n1_3.getBranchData().getConfidence( 0 ).getType().equals( "bootstrap" ) ) {
                 return false;
             }
-            if ( n18.getBranchData().getNumberOfConfidences() != 1 ) {
+            final PhylogenyNode n1_4 = PhylogenyNode
+                    .createInstanceFromNhxString( "xyz|A/American_duck/NH/00321/|Duck|Canada[&bootstrap=69,&!colour=#FFFFFF]:1e-3",
+                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                  true,
+                                                  true );
+            if ( !n1_4.getName().equals( "xyz|A/American duck/NH/00321/|Duck|Canada" ) ) {
                 return false;
             }
-            if ( !isEqual( n18.getBranchData().getConfidence( 0 ).getValue(), 91 ) ) {
+            if ( n1_4.getBranchData().getBranchColor().getValue().getGreen() != 255 ) {
                 return false;
             }
-            final PhylogenyNode n19 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAH_1-roejojoej", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( !n19.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "1" ) ) {
+            if ( !isEqual( n1_4.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            if ( !n19.getNodeData().getTaxonomy().getIdentifier().getProvider().equals( "uniprot" ) ) {
+            if ( !isEqual( n1_4.getBranchData().getConfidence( 0 ).getValue(), 69 ) ) {
                 return false;
             }
-            final PhylogenyNode n30 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAH_1234567-roejojoej",
-                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( !n30.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "1234567" ) ) {
+            if ( !n1_4.getBranchData().getConfidence( 0 ).getType().equals( "bootstrap" ) ) {
                 return false;
             }
-            if ( !n30.getNodeData().getTaxonomy().getIdentifier().getProvider().equals( "uniprot" ) ) {
+            final PhylogenyNode n1_5 = PhylogenyNode
+                    .createInstanceFromNhxString( "xyz|A/American_duck/NH/00321/|Duck|Canada:1e-3[69.0]",
+                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                  true,
+                                                  true );
+            if ( !n1_5.getName().equals( "xyz|A/American duck/NH/00321/|Duck|Canada" ) ) {
                 return false;
             }
-            final PhylogenyNode n31 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAH_12345678-roejojoej",
-                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( n31.getNodeData().isHasTaxonomy() ) {
+            if ( !isEqual( n1_5.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            final PhylogenyNode n32 = PhylogenyNode
-                    .createInstanceFromNhxString( "sd_12345678", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( n32.getNodeData().isHasTaxonomy() ) {
+            if ( !isEqual( n1_5.getBranchData().getConfidence( 0 ).getValue(), 69 ) ) {
                 return false;
             }
-            final PhylogenyNode n40 = PhylogenyNode
-                    .createInstanceFromNhxString( "BCL2_12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( !n40.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "12345" ) ) {
+            final PhylogenyNode n1_6 = PhylogenyNode
+                    .createInstanceFromNhxString( "xyz|A/American_duck/NH/00321/|Duck|Canada[&prob=0.9500000000000000e+00,prob_stddev=0.1100000000000000e+00]:1e-3",
+                                                  NHXParser.TAXONOMY_EXTRACTION.NO,
+                                                  true,
+                                                  true );
+            if ( !n1_6.getName().equals( "xyz|A/American duck/NH/00321/|Duck|Canada" ) ) {
                 return false;
             }
-            final PhylogenyNode n41 = PhylogenyNode
-                    .createInstanceFromNhxString( "12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( n41.getNodeData().isHasTaxonomy() ) {
+            if ( !isEqual( n1_6.getDistanceToParent(), 0.001 ) ) {
                 return false;
             }
-            final PhylogenyNode n42 = PhylogenyNode
-                    .createInstanceFromNhxString( "12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_STRICT );
-            if ( n42.getNodeData().isHasTaxonomy() ) {
+            if ( !isEqual( n1_6.getBranchData().getConfidence( 0 ).getStandardDeviation(), 0.11 ) ) {
                 return false;
             }
-            final PhylogenyNode n43 = PhylogenyNode.createInstanceFromNhxString( "12345",
-                                                                                 NHXParser.TAXONOMY_EXTRACTION.NO );
-            if ( n43.getNodeData().isHasTaxonomy() ) {
+            if ( !isEqual( n1_6.getBranchData().getConfidence( 0 ).getValue(), 0.95 ) ) {
                 return false;
             }
-            final PhylogenyNode n44 = PhylogenyNode
-                    .createInstanceFromNhxString( "12345~1-2", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
-            if ( n44.getNodeData().isHasTaxonomy() ) {
+            if ( !n1_6.getBranchData().getConfidence( 0 ).getType().equals( "posterior probability" ) ) {
                 return false;
             }
         }
@@ -9012,7 +10393,8 @@ public final class Test {
     private static boolean testNHXParsing() {
         try {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny p1 = factory.create( "(A     [&&NHX:S=a_species],B1[&&NHX:S=b_species])", new NHXParser() )[ 0 ];
+            final Phylogeny p1 = factory.create( "(A     [&&NHX:S=a_species],B1[&&NHX:S=b_species])",
+                                                 new NHXParser() )[ 0 ];
             if ( !p1.toNewHampshireX().equals( "(A[&&NHX:S=a_species],B1[&&NHX:S=b_species])" ) ) {
                 return false;
             }
@@ -9026,21 +10408,21 @@ public final class Test {
             if ( !p2b[ 0 ].toNewHampshireX().equals( "(((((((A:0.2):0.2):0.3):0.4):0.5):0.6):0.7):0.8" ) ) {
                 return false;
             }
-            final Phylogeny[] p3 = factory
-                    .create( "[  comment&&NHX,())))](((((((A:0.2[&&NHX:S=qwerty]):0.2[&&NHX:S=uiop]):0.3[&&NHX:S=asdf]):0.4[&&NHX:S=zxc]):0.5[&&NHX:S=a]):0.6[&&NHX:S=asd]):0.7[&&NHX:S=za]):0.8[&&NHX:S=zaq]",
-                             new NHXParser() );
+            final Phylogeny[] p3 = factory.create(
+                                                   "[  comment&&NHX,())))](((((((A:0.2[&&NHX:S=qwerty]):0.2[&&NHX:S=uiop]):0.3[&&NHX:S=asdf]):0.4[&&NHX:S=zxc]):0.5[&&NHX:S=a]):0.6[&&NHX:S=asd]):0.7[&&NHX:S=za]):0.8[&&NHX:S=zaq]",
+                                                   new NHXParser() );
             if ( !p3[ 0 ].toNewHampshireX().equals( p2_S ) ) {
                 return false;
             }
-            final Phylogeny[] p4 = factory
-                    .create( "(((((((A:0.2[&&NHX:S=qwerty]):0.2[&&NHX:S=uiop]):0.3[&&NHX:S=asdf]):0.4[&&NHX:S=zxc]):0.5[&&NHX:S=a]):0.6[&&NHX:S=asd]):0.7[&&NHX:S=za]):0.8[&&NHX:S=zaq][comment(]",
-                             new NHXParser() );
+            final Phylogeny[] p4 = factory.create(
+                                                   "(((((((A:0.2[&&NHX:S=qwerty]):0.2[&&NHX:S=uiop]):0.3[&&NHX:S=asdf]):0.4[&&NHX:S=zxc]):0.5[&&NHX:S=a]):0.6[&&NHX:S=asd]):0.7[&&NHX:S=za]):0.8[&&NHX:S=zaq][comment(]",
+                                                   new NHXParser() );
             if ( !p4[ 0 ].toNewHampshireX().equals( p2_S ) ) {
                 return false;
             }
-            final Phylogeny[] p5 = factory
-                    .create( "[]  (  [][ ][   ]  ([((( &&NHXcomment only![[[[[[]([]((((A:0.2[&&NHX:S=q[comment )))]werty][,,,,))]):0.2[&&NHX:S=uiop]):0.3[&&NHX:S=a[comment,,))]sdf])[comment(((]:0.4[&&NHX:S=zxc][comment(((][comment(((]):0.5[&&NHX:S=a]):0.6[&&NHX:S=a[comment(((]sd]):0.7[&&NHX:S=za]):0.8[&&NHX:S=zaq][comment(((]",
-                             new NHXParser() );
+            final Phylogeny[] p5 = factory.create(
+                                                   "[]  (  [][ ][   ]  ([((( &&NHXcomment only![[[[[[]([]((((A:0.2[&&NHX:S=q[comment )))]werty][,,,,))]):0.2[&&NHX:S=uiop]):0.3[&&NHX:S=a[comment,,))]sdf])[comment(((]:0.4[&&NHX:S=zxc][comment(((][comment(((]):0.5[&&NHX:S=a]):0.6[&&NHX:S=a[comment(((]sd]):0.7[&&NHX:S=za]):0.8[&&NHX:S=zaq][comment(((]",
+                                                   new NHXParser() );
             if ( !p5[ 0 ].toNewHampshireX().equals( p2_S ) ) {
                 return false;
             }
@@ -9066,12 +10448,23 @@ public final class Test {
             if ( !p9.toNewHampshireX().equals( "((A:0.2,B:0.3):0.5[&&NHX:B=91],C:0.1)root:0.1[&&NHX:B=100]" ) ) {
                 return false;
             }
-            final Phylogeny p10 = factory
-                    .create( " [79]   ( (A [co mment] :0 .2[comment],B:0.3[com])[com ment]: 0. 5 \t[ 9 1 ][ comment],C: 0.1)[comment]root:0.1[100] [comment]",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny p10 = factory.create(
+                                                  " [79]   ( (A [co mment] :0 .2[comment],B:0.3[com])[com ment]: 0. 5 \t[ 9 1 ][ comment],C: 0.1)[comment]root:0.1[100] [comment]",
+                                                  new NHXParser() )[ 0 ];
             if ( !p10.toNewHampshireX().equals( "((A:0.2,B:0.3):0.5[&&NHX:B=91],C:0.1)root:0.1[&&NHX:B=100]" ) ) {
                 return false;
             }
+            final Phylogeny p11 = factory.create(
+                                                  " [79]   ( ('A: \" ' [co mment] :0 .2[comment],B:0.3[com])[com ment]: 0. 5 \t[ 9 1 ][ comment],C: 0.1)[comment]root:0.1[100] [comment]",
+                                                  new NHXParser() )[ 0 ];
+            if ( !p11.toNewHampshireX().equals( "(('A: \"':0.2,B:0.3):0.5[&&NHX:B=91],C:0.1)root:0.1[&&NHX:B=100]" ) ) {
+                return false;
+            }
+            final Phylogeny p12 = factory.create( "((A:0.2,B:0.3):0.5[&&NHX:B=91],C:0.1)root:0.1[&&NHX:B=100]",
+                                                  new NHXParser() )[ 0 ];
+            if ( !p12.toNewHampshireX().equals( "((A:0.2,B:0.3):0.5[&&NHX:B=91],C:0.1)root:0.1[&&NHX:B=100]" ) ) {
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace( System.out );
@@ -9110,15 +10503,14 @@ public final class Test {
             }
             final Phylogeny p2 = factory
                     .create( "(1[something_else(?)s,prob=0.9500000000000000e+00{}(((,p)rob_stddev=0.110000000000e+00,"
-                                     + "prob_range={1.000000000000000e+00,1.000000000000000e+00},prob(percent)=\"100\","
-                                     + "prob+-sd=\"100+-0\"]:4.129000000000000e-02[&length_mean=4.153987461671767e-02,"
-                                     + "length_median=4.129000000000000e-02,length_95%HPD={3.217800000000000e-02,"
-                                     + "5.026800000000000e-02}],2[&prob=0.810000000000000e+00,prob_stddev=0.000000000000000e+00,"
-                                     + "prob_range={1.000000000000000e+00,1.000000000000000e+00},prob(percent)=\"100\","
-                                     + "prob+-sd=\"100+-0\"]:6.375699999999999e-02[&length_mean=6.395210411945065e-02,"
-                                     + "length_median=6.375699999999999e-02,length_95%HPD={5.388600000000000e-02,"
-                                     + "7.369400000000000e-02}])",
-                             new NHXParser() )[ 0 ];
+                            + "prob_range={1.000000000000000e+00,1.000000000000000e+00},prob(percent)=\"100\","
+                            + "prob+-sd=\"100+-0\"]:4.129000000000000e-02[&length_mean=4.153987461671767e-02,"
+                            + "length_median=4.129000000000000e-02,length_95%HPD={3.217800000000000e-02,"
+                            + "5.026800000000000e-02}],2[&prob=0.810000000000000e+00,prob_stddev=0.000000000000000e+00,"
+                            + "prob_range={1.000000000000000e+00,1.000000000000000e+00},prob(percent)=\"100\","
+                            + "prob+-sd=\"100+-0\"]:6.375699999999999e-02[&length_mean=6.395210411945065e-02,"
+                            + "length_median=6.375699999999999e-02,length_95%HPD={5.388600000000000e-02,"
+                            + "7.369400000000000e-02}])", new NHXParser() )[ 0 ];
             if ( p2.getNode( "1" ) == null ) {
                 return false;
             }
@@ -9162,13 +10554,13 @@ public final class Test {
             if ( phy.getNodes( "'single quotes' inside double quotes" ).size() != 1 ) {
                 return false;
             }
-            if ( phy.getNodes( "double quotes inside single quotes" ).size() != 1 ) {
+            if ( phy.getNodes( "\"double quotes\" inside single quotes" ).size() != 1 ) {
                 return false;
             }
             if ( phy.getNodes( "noquotes" ).size() != 1 ) {
                 return false;
             }
-            if ( phy.getNodes( "A   (  B    C '" ).size() != 1 ) {
+            if ( phy.getNodes( "A ( B C '" ).size() != 1 ) {
                 return false;
             }
             final NHXParser p1p = new NHXParser();
@@ -9195,10 +10587,10 @@ public final class Test {
             if ( !p4.toNewHampshire().equals( "('A)','B(),; x');" ) ) {
                 return false;
             }
-            final Phylogeny p10 = factory
-                    .create( " [79]   ( (\"A \n\tB \" [co mment] :0 .2[comment],'B':0.3[com])[com ment]: 0. 5 \t[ 9 1 ][ comment],'C (or D?\\//;,))': 0.1)[comment]'\nroot is here (cool,  was! ) ':0.1[100] [comment]",
-                             new NHXParser() )[ 0 ];
-            final String p10_clean_str = "(('A B':0.2,B:0.3):0.5[&&NHX:B=91],'C (or D?\\//;,))':0.1)'root is here (cool,  was! )':0.1[&&NHX:B=100]";
+            final Phylogeny p10 = factory.create(
+                                                  " [79]   ( (\"A \n\tB \" [co mment] :0 .2[comment],'B':0.3[com])[com ment]: 0. 5 \t[ 9 1 ][ comment],'C (or D?\\//;,))': 0.1)[comment]'\nroot is here (cool,  was! ) ':0.1[100] [comment]",
+                                                  new NHXParser() )[ 0 ];
+            final String p10_clean_str = "(('A B':0.2,B:0.3):0.5[&&NHX:B=91],'C (or D?\\//;,))':0.1)'root is here (cool, was! )':0.1[&&NHX:B=100]";
             if ( !p10.toNewHampshireX().equals( p10_clean_str ) ) {
                 return false;
             }
@@ -9206,11 +10598,10 @@ public final class Test {
             if ( !p11.toNewHampshireX().equals( p10_clean_str ) ) {
                 return false;
             }
-            //
-            final Phylogeny p12 = factory
-                    .create( " [79]   ( (\"A \n\tB \" [[][] :0 .2[comment][\t&\t&\n N\tH\tX:S=mo\tnkey !],'\tB\t\b\t\n\f\rB B ':0.0\b3[])\t[com ment]: 0. 5 \t[ 9 1 ][ \ncomment],'C\t (or D?\\//;,))': 0.\b1)[comment]'\nroot \tis here (cool, \b\t\n\f\r was! ) ':0.1[100] [comment]",
-                             new NHXParser() )[ 0 ];
-            final String p12_clean_str = "(('A B':0.2[&&NHX:S=monkey!],'BB B':0.03):0.5[&&NHX:B=91],'C (or D?\\//;,))':0.1)'root is here (cool,  was! )':0.1[&&NHX:B=100]";
+            final Phylogeny p12 = factory.create(
+                                                  " [79]   ( (\"A \n\tB \" [[][] :0 .2[comment][\t&\t&\n N\tH\tX:S=mo\tnkey !],'\tB\t\b\t\n\f\rB B ':0.0\b3[])\t[com ment]: 0. 5 \t[ 9 1 ][ \ncomment],'C\t (or D?\\//;,))': 0.\b1)[comment]'\nroot \tis here (cool, \b\t\n\f\r was! ) ':0.1[100] [comment]",
+                                                  new NHXParser() )[ 0 ];
+            final String p12_clean_str = "(('A B':0.2[&&NHX:S=monkey!],'BB B':0.03):0.5[&&NHX:B=91],'C (or D?\\//;,))':0.1)'root is here (cool, was! )':0.1[&&NHX:B=100]";
             if ( !p12.toNewHampshireX().equals( p12_clean_str ) ) {
                 return false;
             }
@@ -9218,7 +10609,7 @@ public final class Test {
             if ( !p13.toNewHampshireX().equals( p12_clean_str ) ) {
                 return false;
             }
-            final String p12_clean_str_nh = "(('A B':0.2,'BB B':0.03):0.5,'C (or D?\\//;,))':0.1)'root is here (cool,  was! )':0.1;";
+            final String p12_clean_str_nh = "(('A B':0.2,'BB B':0.03):0.5,'C (or D?\\//;,))':0.1)'root is here (cool, was! )':0.1;";
             if ( !p13.toNewHampshire().equals( p12_clean_str_nh ) ) {
                 return false;
             }
@@ -9321,8 +10712,8 @@ public final class Test {
                     xml_parser.setValidateAgainstSchema( PHYLOXML_REMOTE_XSD );
                 }
             }
-            final Phylogeny[] phylogenies_0 = factory.create( Test.PATH_TO_TEST_DATA + "phyloxml_distribution.xml",
-                                                              xml_parser );
+            final Phylogeny[] phylogenies_0 = factory
+                    .create( new File( Test.PATH_TO_TEST_DATA + "phyloxml_distribution.xml" ), xml_parser );
             if ( xml_parser.getErrorCount() > 0 ) {
                 System.out.println( xml_parser.getErrorMessages().toString() );
                 return false;
@@ -9621,7 +11012,8 @@ public final class Test {
             for( it0.reset(); it0.hasNext(); ) {
                 it0.next();
             }
-            final Phylogeny t1 = factory.create( "(((A,B)ab,(C,D)cd)abcd,((E,F)ef,(G,H)gh)efgh)r", new NHXParser() )[ 0 ];
+            final Phylogeny t1 = factory.create( "(((A,B)ab,(C,D)cd)abcd,((E,F)ef,(G,H)gh)efgh)r",
+                                                 new NHXParser() )[ 0 ];
             final PhylogenyNodeIterator it = t1.iteratorPostorder();
             if ( !it.next().getName().equals( "A" ) ) {
                 return false;
@@ -9715,7 +11107,8 @@ public final class Test {
             if ( it.hasNext() ) {
                 return false;
             }
-            final Phylogeny t1 = factory.create( "(((A,B)ab,(C,D)cd)abcd,((E,F)ef,(G,H)gh)efgh)r", new NHXParser() )[ 0 ];
+            final Phylogeny t1 = factory.create( "(((A,B)ab,(C,D)cd)abcd,((E,F)ef,(G,H)gh)efgh)r",
+                                                 new NHXParser() )[ 0 ];
             it = t1.iteratorPreorder();
             if ( !it.next().getName().equals( "r" ) ) {
                 return false;
@@ -9775,7 +11168,7 @@ public final class Test {
 
     private static boolean testPropertiesMap() {
         try {
-            final PropertiesMap pm = new PropertiesMap();
+            final PropertiesList pm = new PropertiesList();
             final Property p0 = new Property( "dimensions:diameter", "1", "metric:mm", "xsd:decimal", AppliesTo.NODE );
             final Property p1 = new Property( "dimensions:length", "2", "metric:mm", "xsd:decimal", AppliesTo.NODE );
             final Property p2 = new Property( "something:else",
@@ -9786,10 +11179,10 @@ public final class Test {
             pm.addProperty( p0 );
             pm.addProperty( p1 );
             pm.addProperty( p2 );
-            if ( !pm.getProperty( "dimensions:diameter" ).getValue().equals( "1" ) ) {
+            if ( !pm.getProperties( "dimensions:diameter" ).get( 0 ).getValue().equals( "1" ) ) {
                 return false;
             }
-            if ( !pm.getProperty( "dimensions:length" ).getValue().equals( "2" ) ) {
+            if ( !pm.getProperties( "dimensions:length" ).get( 0 ).getValue().equals( "2" ) ) {
                 return false;
             }
             if ( pm.getProperties().size() != 3 ) {
@@ -9804,16 +11197,6 @@ public final class Test {
             if ( pm.getProperties().size() != 3 ) {
                 return false;
             }
-            pm.removeProperty( "dimensions:diameter" );
-            if ( pm.getProperties().size() != 2 ) {
-                return false;
-            }
-            if ( pm.getPropertiesWithGivenReferencePrefix( "dimensions" ).size() != 1 ) {
-                return false;
-            }
-            if ( pm.getPropertiesWithGivenReferencePrefix( "something" ).size() != 1 ) {
-                return false;
-            }
         }
         catch ( final Exception e ) {
             e.printStackTrace( System.out );
@@ -10143,12 +11526,12 @@ public final class Test {
             if ( !gene1.getRoot().isDuplication() ) {
                 return false;
             }
-            final Phylogeny species2 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene2 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=B])ab,[&&NHX:S=C])abc,[&&NHX:S=D])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species2 = factory.create(
+                                                       "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene2 = factory.create(
+                                                    "(((([&&NHX:S=A],[&&NHX:S=B])ab,[&&NHX:S=C])abc,[&&NHX:S=D])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
+                                                    new NHXParser() )[ 0 ];
             species2.setRooted( true );
             gene2.setRooted( true );
             final SDI sdi2 = new SDI( gene2, species2 );
@@ -10173,12 +11556,12 @@ public final class Test {
             if ( !gene2.getNode( "r" ).isHasAssignedEvent() ) {
                 return false;
             }
-            final Phylogeny species3 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene3 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=A])aa,[&&NHX:S=C])abc,[&&NHX:S=D])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species3 = factory.create(
+                                                       "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene3 = factory.create(
+                                                    "(((([&&NHX:S=A],[&&NHX:S=A])aa,[&&NHX:S=C])abc,[&&NHX:S=D])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
+                                                    new NHXParser() )[ 0 ];
             species3.setRooted( true );
             gene3.setRooted( true );
             final SDI sdi3 = new SDI( gene3, species3 );
@@ -10191,12 +11574,12 @@ public final class Test {
             if ( !gene3.getNode( "aa" ).isHasAssignedEvent() ) {
                 return false;
             }
-            final Phylogeny species4 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene4 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=C])ac,[&&NHX:S=B])abc,[&&NHX:S=D])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species4 = factory.create(
+                                                       "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene4 = factory.create(
+                                                    "(((([&&NHX:S=A],[&&NHX:S=C])ac,[&&NHX:S=B])abc,[&&NHX:S=D])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
+                                                    new NHXParser() )[ 0 ];
             species4.setRooted( true );
             gene4.setRooted( true );
             final SDI sdi4 = new SDI( gene4, species4 );
@@ -10218,12 +11601,12 @@ public final class Test {
             if ( gene4.getNumberOfExternalNodes() != 6 ) {
                 return false;
             }
-            final Phylogeny species5 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene5 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=D])ad,[&&NHX:S=C])adc,[&&NHX:S=B])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species5 = factory.create(
+                                                       "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene5 = factory.create(
+                                                    "(((([&&NHX:S=A],[&&NHX:S=D])ad,[&&NHX:S=C])adc,[&&NHX:S=B])abcd,([&&NHX:S=E],[&&NHX:S=F])ef)r",
+                                                    new NHXParser() )[ 0 ];
             species5.setRooted( true );
             gene5.setRooted( true );
             final SDI sdi5 = new SDI( gene5, species5 );
@@ -10248,15 +11631,15 @@ public final class Test {
             // Trees from Louxin Zhang 1997 "On a Mirkin-Muchnik-Smith
             // Conjecture for Comparing Molecular Phylogenies"
             // J. of Comput Bio. Vol. 4, No 2, pp.177-187
-            final Phylogeny species6 = factory
-                    .create( "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
-                                     + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene6 = factory
-                    .create( "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1,3:0.1[&&NHX:S=3])1-2-3:0.1,"
-                                     + "((4:0.1[&&NHX:S=4],(5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.1)4-5-6:0.1,"
-                                     + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],9:0.1[&&NHX:S=9])8-9:0.1)7-8-9:0.1)4-5-6-7-8-9:0.1)r;",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species6 = factory.create(
+                                                       "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
+                                                               + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene6 = factory.create(
+                                                    "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1,3:0.1[&&NHX:S=3])1-2-3:0.1,"
+                                                            + "((4:0.1[&&NHX:S=4],(5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.1)4-5-6:0.1,"
+                                                            + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],9:0.1[&&NHX:S=9])8-9:0.1)7-8-9:0.1)4-5-6-7-8-9:0.1)r;",
+                                                    new NHXParser() )[ 0 ];
             species6.setRooted( true );
             gene6.setRooted( true );
             final SDI sdi6 = new SDI( gene6, species6 );
@@ -10378,7 +11761,8 @@ public final class Test {
     private static boolean testSDIunrooted() {
         try {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
-            final Phylogeny p0 = factory.create( "((((A,B)ab,(C1,C2)cc)abc,D)abcd,(E,F)ef)abcdef", new NHXParser() )[ 0 ];
+            final Phylogeny p0 = factory.create( "((((A,B)ab,(C1,C2)cc)abc,D)abcd,(E,F)ef)abcdef",
+                                                 new NHXParser() )[ 0 ];
             final List<PhylogenyBranch> l = SDIR.getBranchesInPreorder( p0 );
             final Iterator<PhylogenyBranch> iter = l.iterator();
             PhylogenyBranch br = iter.next();
@@ -10543,12 +11927,12 @@ public final class Test {
             if ( iter2.hasNext() ) {
                 return false;
             }
-            final Phylogeny species0 = factory
-                    .create( "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene1 = factory
-                    .create( "(((((A:0.6[&&NHX:S=A],B:0.1[&&NHX:S=B])ab:0.1,C:0.1[&&NHX:S=C])abc:0.3,D:1.0[&&NHX:S=D])abcd:0.2,E:0.1[&&NHX:S=E])abcde:0.2,F:0.2[&&NHX:S=F])",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species0 = factory.create(
+                                                       "(((([&&NHX:S=A],[&&NHX:S=B]),[&&NHX:S=C]),[&&NHX:S=D]),([&&NHX:S=E],[&&NHX:S=F]))",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene1 = factory.create(
+                                                    "(((((A:0.6[&&NHX:S=A],B:0.1[&&NHX:S=B])ab:0.1,C:0.1[&&NHX:S=C])abc:0.3,D:1.0[&&NHX:S=D])abcd:0.2,E:0.1[&&NHX:S=E])abcde:0.2,F:0.2[&&NHX:S=F])",
+                                                    new NHXParser() )[ 0 ];
             species0.setRooted( true );
             gene1.setRooted( true );
             final SDIR sdi_unrooted = new SDIR();
@@ -10568,9 +11952,9 @@ public final class Test {
             if ( sdi_unrooted.getMinimalMappingCost() != Integer.MAX_VALUE ) {
                 return false;
             }
-            final Phylogeny gene2 = factory
-                    .create( "(((((A:2.6[&&NHX:S=A],B:0.1[&&NHX:S=B])ab:0.1,C:0.1[&&NHX:S=C])abc:0.3,D:1.0[&&NHX:S=D])abcd:0.2,E:0.1[&&NHX:S=E])abcde:0.2,F:0.2[&&NHX:S=F])",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny gene2 = factory.create(
+                                                    "(((((A:2.6[&&NHX:S=A],B:0.1[&&NHX:S=B])ab:0.1,C:0.1[&&NHX:S=C])abc:0.3,D:1.0[&&NHX:S=D])abcd:0.2,E:0.1[&&NHX:S=E])abcde:0.2,F:0.2[&&NHX:S=F])",
+                                                    new NHXParser() )[ 0 ];
             gene2.setRooted( true );
             sdi_unrooted.infer( gene2, species0, false, false, true, true, 10 );
             if ( sdi_unrooted.getCount() != 1 ) {
@@ -10588,17 +11972,17 @@ public final class Test {
             if ( sdi_unrooted.getMinimalMappingCost() != Integer.MAX_VALUE ) {
                 return false;
             }
-            final Phylogeny species6 = factory
-                    .create( "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
-                                     + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene6 = factory
-                    .create( "((5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.05[&&NHX:S=6],(4:0.1[&&NHX:S=4],"
-                                     + "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1[&&NHX:S=2],3:0.25[&&NHX:S=3])1-2-3:0.2[&&NHX:S=2],"
-                                     + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],"
-                                     + "9:0.1[&&NHX:S=9])8-9:0.1[&&NHX:S=9])7-8-9:0.1[&&NHX:S=8])"
-                                     + "4-5-6-7-8-9:0.1[&&NHX:S=5])4-5-6:0.05[&&NHX:S=5])",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species6 = factory.create(
+                                                       "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
+                                                               + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene6 = factory.create(
+                                                    "((5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.05[&&NHX:S=6],(4:0.1[&&NHX:S=4],"
+                                                            + "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1[&&NHX:S=2],3:0.25[&&NHX:S=3])1-2-3:0.2[&&NHX:S=2],"
+                                                            + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],"
+                                                            + "9:0.1[&&NHX:S=9])8-9:0.1[&&NHX:S=9])7-8-9:0.1[&&NHX:S=8])"
+                                                            + "4-5-6-7-8-9:0.1[&&NHX:S=5])4-5-6:0.05[&&NHX:S=5])",
+                                                    new NHXParser() )[ 0 ];
             species6.setRooted( true );
             gene6.setRooted( true );
             Phylogeny[] p6 = sdi_unrooted.infer( gene6, species6, false, true, true, true, 10 );
@@ -10642,17 +12026,17 @@ public final class Test {
                 return false;
             }
             p6 = null;
-            final Phylogeny species7 = factory
-                    .create( "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
-                                     + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene7 = factory
-                    .create( "((5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.05[&&NHX:S=6],(4:0.1[&&NHX:S=4],"
-                                     + "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1[&&NHX:S=2],3:0.25[&&NHX:S=3])1-2-3:0.2[&&NHX:S=2],"
-                                     + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],"
-                                     + "9:0.1[&&NHX:S=9])8-9:0.1[&&NHX:S=9])7-8-9:0.1[&&NHX:S=8])"
-                                     + "4-5-6-7-8-9:0.1[&&NHX:S=5])4-5-6:0.05[&&NHX:S=5])",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species7 = factory.create(
+                                                       "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
+                                                               + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene7 = factory.create(
+                                                    "((5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.05[&&NHX:S=6],(4:0.1[&&NHX:S=4],"
+                                                            + "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1[&&NHX:S=2],3:0.25[&&NHX:S=3])1-2-3:0.2[&&NHX:S=2],"
+                                                            + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],"
+                                                            + "9:0.1[&&NHX:S=9])8-9:0.1[&&NHX:S=9])7-8-9:0.1[&&NHX:S=8])"
+                                                            + "4-5-6-7-8-9:0.1[&&NHX:S=5])4-5-6:0.05[&&NHX:S=5])",
+                                                    new NHXParser() )[ 0 ];
             species7.setRooted( true );
             gene7.setRooted( true );
             Phylogeny[] p7 = sdi_unrooted.infer( gene7, species7, true, true, true, true, 10 );
@@ -10696,17 +12080,17 @@ public final class Test {
                 return false;
             }
             p7 = null;
-            final Phylogeny species8 = factory
-                    .create( "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
-                                     + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
-                             new NHXParser() )[ 0 ];
-            final Phylogeny gene8 = factory
-                    .create( "((5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.05[&&NHX:S=6],(4:0.1[&&NHX:S=4],"
-                                     + "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1[&&NHX:S=2],3:0.25[&&NHX:S=3])1-2-3:0.2[&&NHX:S=2],"
-                                     + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],"
-                                     + "9:0.1[&&NHX:S=9])8-9:0.1[&&NHX:S=9])7-8-9:0.1[&&NHX:S=8])"
-                                     + "4-5-6-7-8-9:0.1[&&NHX:S=5])4-5-6:0.05[&&NHX:S=5])",
-                             new NHXParser() )[ 0 ];
+            final Phylogeny species8 = factory.create(
+                                                       "(((1:[&&NHX:S=1],5:[&&NHX:S=5])1-5,((4:[&&NHX:S=4],6:[&&NHX:S=6])4-6,2:[&&NHX:S=2])4-6-2)1-5-4-6-2,"
+                                                               + "((9:[&&NHX:S=9],3:[&&NHX:S=3])9-3,(8:[&&NHX:S=8],7:[&&NHX:S=7])8-7)9-3-8-7)",
+                                                       new NHXParser() )[ 0 ];
+            final Phylogeny gene8 = factory.create(
+                                                    "((5:0.1[&&NHX:S=5],6:0.1[&&NHX:S=6])5-6:0.05[&&NHX:S=6],(4:0.1[&&NHX:S=4],"
+                                                            + "(((1:0.1[&&NHX:S=1],2:0.1[&&NHX:S=2])1-2:0.1[&&NHX:S=2],3:0.25[&&NHX:S=3])1-2-3:0.2[&&NHX:S=2],"
+                                                            + "(7:0.1[&&NHX:S=7],(8:0.1[&&NHX:S=8],"
+                                                            + "9:0.1[&&NHX:S=9])8-9:0.1[&&NHX:S=9])7-8-9:0.1[&&NHX:S=8])"
+                                                            + "4-5-6-7-8-9:0.1[&&NHX:S=5])4-5-6:0.05[&&NHX:S=5])",
+                                                    new NHXParser() )[ 0 ];
             species8.setRooted( true );
             gene8.setRooted( true );
             Phylogeny[] p8 = sdi_unrooted.infer( gene8, species8, false, false, true, true, 10 );
@@ -10902,7 +12286,7 @@ public final class Test {
             final PhylogenyNode n2 = new PhylogenyNode( "NM_001030253" );
             SequenceDbWsTools.obtainSeqInformation( n2 );
             if ( !n2.getNodeData().getSequence().getName()
-                    .equals( "Danio rerio B-cell leukemia/lymphoma 2 (bcl2), mRNA" ) ) {
+                    .equals( "Danio rerio B-cell CLL/lymphoma 2a (bcl2a), mRNA" ) ) {
                 return false;
             }
             if ( !n2.getNodeData().getTaxonomy().getScientificName().equals( "Danio rerio" ) ) {
@@ -10954,7 +12338,6 @@ public final class Test {
                 }
                 return false;
             }
-            //
             id = SequenceAccessionTools.parseAccessorFromString( "segmented worms|gb_ADF31344" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "ADF31344" ) || !id.getSource().equals( "ncbi" ) ) {
@@ -10964,7 +12347,6 @@ public final class Test {
                 }
                 return false;
             }
-            //
             id = SequenceAccessionTools.parseAccessorFromString( "segmented worms gb_ADF31344 and more" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "ADF31344" ) || !id.getSource().equals( "ncbi" ) ) {
@@ -10974,7 +12356,6 @@ public final class Test {
                 }
                 return false;
             }
-            // 
             id = SequenceAccessionTools.parseAccessorFromString( "gb_AAA96518_1" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "AAA96518" ) || !id.getSource().equals( "ncbi" ) ) {
@@ -10984,7 +12365,6 @@ public final class Test {
                 }
                 return false;
             }
-            // 
             id = SequenceAccessionTools.parseAccessorFromString( "gb_EHB07727_1_rodents_" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "EHB07727" ) || !id.getSource().equals( "ncbi" ) ) {
@@ -10994,7 +12374,6 @@ public final class Test {
                 }
                 return false;
             }
-            // 
             id = SequenceAccessionTools.parseAccessorFromString( "dbj_BAF37827_1_turtles_" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "BAF37827" ) || !id.getSource().equals( "ncbi" ) ) {
@@ -11004,7 +12383,6 @@ public final class Test {
                 }
                 return false;
             }
-            // 
             id = SequenceAccessionTools.parseAccessorFromString( "emb_CAA73223_1_primates_" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "CAA73223" ) || !id.getSource().equals( "ncbi" ) ) {
@@ -11014,7 +12392,6 @@ public final class Test {
                 }
                 return false;
             }
-            // 
             id = SequenceAccessionTools.parseAccessorFromString( "mites|ref_XP_002434188_1" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "XP_002434188" ) || !id.getSource().equals( "refseq" ) ) {
@@ -11024,7 +12401,6 @@ public final class Test {
                 }
                 return false;
             }
-            // 
             id = SequenceAccessionTools.parseAccessorFromString( "mites_ref_XP_002434188_1_bla_XP_12345" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "XP_002434188" ) || !id.getSource().equals( "refseq" ) ) {
@@ -11034,7 +12410,6 @@ public final class Test {
                 }
                 return false;
             }
-            // 
             id = SequenceAccessionTools.parseAccessorFromString( "P4A123" );
             if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
                     || !id.getValue().equals( "P4A123" ) || !id.getSource().equals( "uniprot" ) ) {
@@ -11050,6 +12425,39 @@ public final class Test {
                 System.out.println( "provider=" + id.getSource() );
                 return false;
             }
+            id = SequenceAccessionTools.parseAccessorFromString( "N3B004Z009" );
+            if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
+                    || !id.getValue().equals( "N3B004Z009" ) || !id.getSource().equals( "uniprot" ) ) {
+                if ( id != null ) {
+                    System.out.println( "value   =" + id.getValue() );
+                    System.out.println( "provider=" + id.getSource() );
+                }
+                return false;
+            }
+            id = SequenceAccessionTools.parseAccessorFromString( "A4CAA4ZBB9" );
+            if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
+                    || !id.getValue().equals( "A4CAA4ZBB9" ) || !id.getSource().equals( "uniprot" ) ) {
+                if ( id != null ) {
+                    System.out.println( "value   =" + id.getValue() );
+                    System.out.println( "provider=" + id.getSource() );
+                }
+                return false;
+            }
+            id = SequenceAccessionTools.parseAccessorFromString( "ecoli_A4CAA4ZBB9_rt" );
+            if ( ( id == null ) || ForesterUtil.isEmpty( id.getValue() ) || ForesterUtil.isEmpty( id.getSource() )
+                    || !id.getValue().equals( "A4CAA4ZBB9" ) || !id.getSource().equals( "uniprot" ) ) {
+                if ( id != null ) {
+                    System.out.println( "value   =" + id.getValue() );
+                    System.out.println( "provider=" + id.getSource() );
+                }
+                return false;
+            }
+            id = SequenceAccessionTools.parseAccessorFromString( "Q4CAA4ZBB9" );
+            if ( id != null ) {
+                System.out.println( "value   =" + id.getValue() );
+                System.out.println( "provider=" + id.getSource() );
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace( System.out );
@@ -11157,7 +12565,7 @@ public final class Test {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
             final Phylogeny p0 = factory.create( "(((A,B,C),D),(E,(F,G)))R", new NHXParser() )[ 0 ];
             //Archaeopteryx.createApplication( p0 );
-            final Set<PhylogenyNode> ex = new HashSet<PhylogenyNode>();
+            final Set<PhylogenyNode> ex = new HashSet<>();
             ex.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             ex.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             ex.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11170,13 +12578,13 @@ public final class Test {
             final TreeSplitMatrix s0 = new TreeSplitMatrix( p0, false, ex );
             // System.out.println( s0.toString() );
             //
-            Set<PhylogenyNode> query_nodes = new HashSet<PhylogenyNode>();
+            Set<PhylogenyNode> query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11188,7 +12596,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11196,7 +12604,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
@@ -11205,7 +12613,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11214,22 +12622,20 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             if ( !s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             if ( !s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11238,16 +12644,14 @@ public final class Test {
             if ( !s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             if ( !s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11255,15 +12659,13 @@ public final class Test {
             if ( !s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
@@ -11271,8 +12673,7 @@ public final class Test {
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11281,82 +12682,71 @@ public final class Test {
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11429,7 +12819,7 @@ public final class Test {
             //                return false;
             //            }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11438,7 +12828,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11448,7 +12838,7 @@ public final class Test {
             }
             ///////////////////////////
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11457,7 +12847,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11466,7 +12856,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11475,7 +12865,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11484,7 +12874,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11493,7 +12883,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
@@ -11501,7 +12891,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11511,7 +12901,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11521,7 +12911,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11531,7 +12921,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "X" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "Y" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11553,7 +12943,7 @@ public final class Test {
         try {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
             final Phylogeny p0 = factory.create( "(((A,B,C),D),(E,(F,G)))R", new NHXParser() )[ 0 ];
-            final Set<PhylogenyNode> ex = new HashSet<PhylogenyNode>();
+            final Set<PhylogenyNode> ex = new HashSet<>();
             ex.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             ex.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             ex.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11562,13 +12952,13 @@ public final class Test {
             ex.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             ex.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             final TreeSplitMatrix s0 = new TreeSplitMatrix( p0, true, ex );
-            Set<PhylogenyNode> query_nodes = new HashSet<PhylogenyNode>();
+            Set<PhylogenyNode> query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11580,7 +12970,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11588,7 +12978,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
@@ -11597,7 +12987,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11606,7 +12996,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
@@ -11614,14 +13004,14 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             if ( !s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
@@ -11631,7 +13021,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11639,7 +13029,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11648,14 +13038,14 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
@@ -11664,7 +13054,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
@@ -11674,7 +13064,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
@@ -11682,49 +13072,49 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "C" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
             if ( s0.match( query_nodes ) ) {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "F" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "G" ) );
@@ -11732,7 +13122,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "B" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
@@ -11740,7 +13130,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11748,7 +13138,7 @@ public final class Test {
                 return false;
             }
             //
-            query_nodes = new HashSet<PhylogenyNode>();
+            query_nodes = new HashSet<>();
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "E" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "D" ) );
             query_nodes.add( PhylogenyNode.createInstanceFromNhxString( "A" ) );
@@ -11844,23 +13234,15 @@ public final class Test {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
             final Phylogeny t0_1 = factory.create( "(((A,B),C),(D,E))", new NHXParser() )[ 0 ];
             final Phylogeny[] phylogenies_1 = factory.create( "(((A,B),C),(D,E)) " + "(((C,B),A),(D,E))"
-                                                                      + "(((A,B),C),(D,E)) " + "(((A,B),C),(D,E))"
-                                                                      + "(((A,B),C),(D,E))" + "(((C,B),A),(D,E))"
-                                                                      + "(((E,B),D),(C,A))" + "(((C,B),A),(D,E))"
-                                                                      + "(((A,B),C),(D,E))" + "(((A,B),C),(D,E))",
+                    + "(((A,B),C),(D,E)) " + "(((A,B),C),(D,E))" + "(((A,B),C),(D,E))" + "(((C,B),A),(D,E))"
+                    + "(((E,B),D),(C,A))" + "(((C,B),A),(D,E))" + "(((A,B),C),(D,E))" + "(((A,B),C),(D,E))",
                                                               new NHXParser() );
             SupportCount.count( t0_1, phylogenies_1, true, false );
             final Phylogeny t0_2 = factory.create( "(((((A,B),C),D),E),(F,G))", new NHXParser() )[ 0 ];
             final Phylogeny[] phylogenies_2 = factory.create( "(((((A,B),C),D),E),(F,G))"
-                                                                      + "(((((A,B),C),D),E),((F,G),X))"
-                                                                      + "(((((A,Y),B),C),D),((F,G),E))"
-                                                                      + "(((((A,B),C),D),E),(F,G))"
-                                                                      + "(((((A,B),C),D),E),(F,G))"
-                                                                      + "(((((A,B),C),D),E),(F,G))"
-                                                                      + "(((((A,B),C),D),E),(F,G),Z)"
-                                                                      + "(((((A,B),C),D),E),(F,G))"
-                                                                      + "((((((A,B),C),D),E),F),G)"
-                                                                      + "(((((X,Y),F,G),E),((A,B),C)),D)",
+                    + "(((((A,B),C),D),E),((F,G),X))" + "(((((A,Y),B),C),D),((F,G),E))" + "(((((A,B),C),D),E),(F,G))"
+                    + "(((((A,B),C),D),E),(F,G))" + "(((((A,B),C),D),E),(F,G))" + "(((((A,B),C),D),E),(F,G),Z)"
+                    + "(((((A,B),C),D),E),(F,G))" + "((((((A,B),C),D),E),F),G)" + "(((((X,Y),F,G),E),((A,B),C)),D)",
                                                               new NHXParser() );
             SupportCount.count( t0_2, phylogenies_2, true, false );
             final PhylogenyNodeIterator it = t0_2.iteratorPostorder();
@@ -11906,8 +13288,8 @@ public final class Test {
                 return false;
             }
             final Phylogeny t0_4 = factory.create( "(((((A,B)1,C)2,D)3,E)4,F)", new NHXParser() )[ 0 ];
-            final Phylogeny[] phylogenies_4 = factory.create( "((((((A,X),C),B),D),E),F) "
-                    + "(((A,B,Z),C,Q),(((D,Y),E),F))", new NHXParser() );
+            final Phylogeny[] phylogenies_4 = factory
+                    .create( "((((((A,X),C),B),D),E),F) " + "(((A,B,Z),C,Q),(((D,Y),E),F))", new NHXParser() );
             SupportCount.count( t0_4, phylogenies_4, true, false );
             t0_4.reRoot( t0_4.getNode( "F" ).getId() );
             if ( PhylogenyMethods.getConfidenceValue( t0_4.getNode( "1" ) ) != 1 ) {
@@ -11977,8 +13359,9 @@ public final class Test {
             final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
             final Phylogeny p1 = factory.create( "(((A,B)ab:97,C)abc:57,((D,E)de:10,(F,G)fg:50,(H,I)hi:64)defghi)",
                                                  new NHXParser() )[ 0 ];
-            final Phylogeny p2 = factory
-                    .create( "(((A:0.1,B:0.3)ab:0.4,C)abc:0.5,((D,E)de,(F,G)fg,(H,I)hi:0.59)defghi)", new NHXParser() )[ 0 ];
+            final Phylogeny p2 = factory.create(
+                                                 "(((A:0.1,B:0.3)ab:0.4,C)abc:0.5,((D,E)de,(F,G)fg,(H,I)hi:0.59)defghi)",
+                                                 new NHXParser() )[ 0 ];
             if ( PhylogenyMethods.getConfidenceValue( p2.getNode( "ab" ) ) >= 0.0 ) {
                 return false;
             }
@@ -12038,7 +13421,7 @@ public final class Test {
                 return false;
             }
             final PhylogenyNode n3 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BLAGG_12345", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( !n3.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "12345" ) ) {
                 System.out.println( n3.toString() );
                 return false;
@@ -12056,62 +13439,80 @@ public final class Test {
                 return false;
             }
             final PhylogenyNode n6 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG-12345-blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BLAGG-12345-blag",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( n6.getNodeData().isHasTaxonomy() ) {
                 System.out.println( n6.toString() );
                 return false;
             }
             final PhylogenyNode n7 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG-12345_blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BL-12345_blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( n7.getNodeData().isHasTaxonomy() ) {
                 System.out.println( n7.toString() );
                 return false;
             }
             final PhylogenyNode n8 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_12345-blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BLAGG_12345-blag",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( !n8.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "12345" ) ) {
                 System.out.println( n8.toString() );
                 return false;
             }
             final PhylogenyNode n9 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_12345/blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BLAGG_12345/blag",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( !n9.getNodeData().getTaxonomy().getIdentifier().getValue().equals( "12345" ) ) {
                 System.out.println( n9.toString() );
                 return false;
             }
             final PhylogenyNode n10x = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_12X45-blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BLAG!_12X45-blag",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( n10x.getNodeData().isHasTaxonomy() ) {
                 System.out.println( n10x.toString() );
                 return false;
             }
             final PhylogenyNode n10xx = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_1YX45-blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BLAG!_1YX45-blag",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( n10xx.getNodeData().isHasTaxonomy() ) {
                 System.out.println( n10xx.toString() );
                 return false;
             }
             final PhylogenyNode n10 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_9YX45-blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+                    .createInstanceFromNhxString( "BLAGG_9YX45-blag",
+                                                  NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
             if ( !n10.getNodeData().getTaxonomy().getTaxonomyCode().equals( "9YX45" ) ) {
                 System.out.println( n10.toString() );
                 return false;
             }
+            final PhylogenyNode n10v = PhylogenyNode
+                    .createInstanceFromNhxString( "BLAGG_BPM1-blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( !n10v.getNodeData().getTaxonomy().getTaxonomyCode().equals( "BPM1" ) ) {
+                System.out.println( n10v.toString() );
+                return false;
+            }
+            final PhylogenyNode n10v2 = PhylogenyNode
+                    .createInstanceFromNhxString( "BLAGG_ABV-blag", NHXParser.TAXONOMY_EXTRACTION.PFAM_STYLE_RELAXED );
+            if ( !n10v2.getNodeData().getTaxonomy().getTaxonomyCode().equals( "ABV" ) ) {
+                System.out.println( n10v2.toString() );
+                return false;
+            }
             final PhylogenyNode n11 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_Mus_musculus", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+                    .createInstanceFromNhxString( "BLAG@_Mus_musculus", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
             if ( !n11.getNodeData().getTaxonomy().getScientificName().equals( "Mus musculus" ) ) {
                 System.out.println( n11.toString() );
                 return false;
             }
             final PhylogenyNode n12 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_Mus_musculus_musculus",
+                    .createInstanceFromNhxString( "BLA_G_Mus_musculus_musculus",
                                                   NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
             if ( !n12.getNodeData().getTaxonomy().getScientificName().equals( "Mus musculus musculus" ) ) {
                 System.out.println( n12.toString() );
                 return false;
             }
             final PhylogenyNode n13 = PhylogenyNode
-                    .createInstanceFromNhxString( "BLAG_Mus_musculus1", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+                    .createInstanceFromNhxString( "BLAaG_Mus_musculus1", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
             if ( n13.getNodeData().isHasTaxonomy() ) {
                 System.out.println( n13.toString() );
                 return false;
@@ -12140,9 +13541,9 @@ public final class Test {
                 System.out.println( n17.toString() );
                 return false;
             }
-            //
             final PhylogenyNode n18 = PhylogenyNode
-                    .createInstanceFromNhxString( "Mus_musculus_musculus_392", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+                    .createInstanceFromNhxString( "Mus_musculus_musculus_392",
+                                                  NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
             if ( !n18.getNodeData().getTaxonomy().getScientificName().equals( "Mus musculus musculus" ) ) {
                 System.out.println( n18.toString() );
                 return false;
@@ -12155,7 +13556,8 @@ public final class Test {
                 return false;
             }
             final PhylogenyNode n20 = PhylogenyNode
-                    .createInstanceFromNhxString( "Mus musculus musculus 392", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+                    .createInstanceFromNhxString( "Mus musculus musculus 392",
+                                                  NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
             if ( !n20.getNodeData().getTaxonomy().getScientificName().equals( "Mus musculus musculus" ) ) {
                 System.out.println( n20.toString() );
                 return false;
@@ -12167,6 +13569,40 @@ public final class Test {
                 System.out.println( n21.toString() );
                 return false;
             }
+            final PhylogenyNode n23 = PhylogenyNode
+                    .createInstanceFromNhxString( "9EMVE_Nematostella_vectensis",
+                                                  NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+            if ( !n23.getNodeData().getTaxonomy().getScientificName().equals( "Nematostella vectensis" ) ) {
+                System.out.println( n23.toString() );
+                return false;
+            }
+            final PhylogenyNode n24 = PhylogenyNode
+                    .createInstanceFromNhxString( "9EMVE_Nematostella", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+            if ( !n24.getNodeData().getTaxonomy().getTaxonomyCode().equals( "9EMVE" ) ) {
+                System.out.println( n24.toString() );
+                return false;
+            }
+            //
+            final PhylogenyNode n25 = PhylogenyNode
+                    .createInstanceFromNhxString( "Nematostella_vectensis_NEMVE",
+                                                  NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+            if ( !n25.getNodeData().getTaxonomy().getTaxonomyCode().equals( "NEMVE" ) ) {
+                System.out.println( n25.toString() );
+                return false;
+            }
+            final PhylogenyNode n26 = PhylogenyNode
+                    .createInstanceFromNhxString( "Nematostella_vectensis_9EMVE",
+                                                  NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+            if ( !n26.getNodeData().getTaxonomy().getScientificName().equals( "Nematostella vectensis" ) ) {
+                System.out.println( n26.toString() );
+                return false;
+            }
+            final PhylogenyNode n27 = PhylogenyNode
+                    .createInstanceFromNhxString( "Nematostella_9EMVE", NHXParser.TAXONOMY_EXTRACTION.AGGRESSIVE );
+            if ( !n27.getNodeData().getTaxonomy().getTaxonomyCode().equals( "9EMVE" ) ) {
+                System.out.println( n27.toString() );
+                return false;
+            }
         }
         catch ( final Exception e ) {
             e.printStackTrace( System.out );
@@ -12238,9 +13674,77 @@ public final class Test {
         return true;
     }
 
+    private static boolean testPhylogenyMethods() {
+        try {
+            final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance();
+            final Phylogeny t0 = factory.create( "((((A,B)ab,C)abc,D)abcd,E)r", new NHXParser() )[ 0 ];
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "A" ) ) != 0 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "B" ) ) != 0 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "ab" ) ) != 1 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "C" ) ) != 0 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "abc" ) ) != 2 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "D" ) ) != 0 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "abcd" ) ) != 3 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "E" ) ) != 0 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t0.getNode( "r" ) ) != 4 ) {
+                return false;
+            }
+            final Phylogeny t1 = factory.create( "((((A,B)ab,C)abc,D)abcd,E,((((((X)1)2)3)4)5)6)r",
+                                                 new NHXParser() )[ 0 ];
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "r" ) ) != 7 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "X" ) ) != 0 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "6" ) ) != 6 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "5" ) ) != 5 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "4" ) ) != 4 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "3" ) ) != 3 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "2" ) ) != 2 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "1" ) ) != 1 ) {
+                return false;
+            }
+            if ( PhylogenyMethods.calculateLevel( t1.getNode( "abcd" ) ) != 3 ) {
+                return false;
+            }
+        }
+        catch ( final Exception e ) {
+            e.printStackTrace( System.out );
+            return false;
+        }
+        return true;
+    }
+
     private static boolean testUniprotEntryRetrieval() {
         try {
-            final SequenceDatabaseEntry entry = SequenceDbWsTools.obtainUniProtEntry( "P12345", 200 );
+            final SequenceDatabaseEntry entry = SequenceDbWsTools.obtainUniProtEntry( "P12345", 5000 );
             if ( !entry.getAccession().equals( "P12345" ) ) {
                 return false;
             }
@@ -12259,6 +13763,16 @@ public final class Test {
             if ( !entry.getTaxonomyIdentifier().equals( "9986" ) ) {
                 return false;
             }
+            if ( entry.getMolecularSequence() == null ) {
+                return false;
+            }
+            if ( !entry.getMolecularSequence().getMolecularSequenceAsString()
+                    .startsWith( "MALLHSARVLSGVASAFHPGLAAAASARASSWWAHVEMGPPDPILGVTEAYKRDTNSKKMNLGVGAYRDDNGKPYVLPSVRKAEAQIAAKGLDKEYLPIGGLAEFCRASAELALGENSEV" )
+                    || !entry.getMolecularSequence().getMolecularSequenceAsString().endsWith( "LAHAIHQVTK" ) ) {
+                System.out.println( "got: " + entry.getMolecularSequence().getMolecularSequenceAsString() );
+                System.out.println( "expected something else." );
+                return false;
+            }
         }
         catch ( final IOException e ) {
             System.out.println();
@@ -12266,6 +13780,10 @@ public final class Test {
             e.printStackTrace( System.out );
             return true;
         }
+        catch ( final NullPointerException f ) {
+            f.printStackTrace( System.out );
+            return false;
+        }
         catch ( final Exception e ) {
             return false;
         }
@@ -12455,60 +13973,4 @@ public final class Test {
         }
         return true;
     }
-
-    private static boolean testWabiTxSearch() {
-        try {
-            String result = "";
-            result = TxSearch.searchSimple( "nematostella" );
-            result = TxSearch.getTxId( "nematostella" );
-            if ( !result.equals( "45350" ) ) {
-                return false;
-            }
-            result = TxSearch.getTxName( "45350" );
-            if ( !result.equals( "Nematostella" ) ) {
-                return false;
-            }
-            result = TxSearch.getTxId( "nematostella vectensis" );
-            if ( !result.equals( "45351" ) ) {
-                return false;
-            }
-            result = TxSearch.getTxName( "45351" );
-            if ( !result.equals( "Nematostella vectensis" ) ) {
-                return false;
-            }
-            result = TxSearch.getTxId( "Bacillus subtilis subsp. subtilis str. N170" );
-            if ( !result.equals( "536089" ) ) {
-                return false;
-            }
-            result = TxSearch.getTxName( "536089" );
-            if ( !result.equals( "Bacillus subtilis subsp. subtilis str. N170" ) ) {
-                return false;
-            }
-            final List<String> queries = new ArrayList<String>();
-            queries.add( "Campylobacter coli" );
-            queries.add( "Escherichia coli" );
-            queries.add( "Arabidopsis" );
-            queries.add( "Trichoplax" );
-            queries.add( "Samanea saman" );
-            queries.add( "Kluyveromyces marxianus" );
-            queries.add( "Bacillus subtilis subsp. subtilis str. N170" );
-            queries.add( "Bornavirus parrot/PDD/2008" );
-            final List<RANKS> ranks = new ArrayList<RANKS>();
-            ranks.add( RANKS.SUPERKINGDOM );
-            ranks.add( RANKS.KINGDOM );
-            ranks.add( RANKS.FAMILY );
-            ranks.add( RANKS.GENUS );
-            ranks.add( RANKS.TRIBE );
-            result = TxSearch.searchLineage( queries, ranks );
-            result = TxSearch.searchParam( "Homo sapiens", TAX_NAME_CLASS.ALL, TAX_RANK.SPECIES, 10, true );
-            result = TxSearch.searchParam( "Samanea saman", TAX_NAME_CLASS.SCIENTIFIC_NAME, TAX_RANK.ALL, 10, true );
-        }
-        catch ( final Exception e ) {
-            System.out.println();
-            System.out.println( "the following might be due to absence internet connection:" );
-            e.printStackTrace( System.out );
-            return false;
-        }
-        return true;
-    }
 }