Feature/ontology fix unit tests