Updates to the ontology and manifest tests