updated osdd ontology and refactored unit tests