Added tests; updated Ontology to match DistSim