Updated ontology and added a few simple tests