Tidying of OntologyIRIShortFormProvider and test cases