Renamed Taxonomy to TaxonomyNode, fixed tests