Fix up to use updated rdflib; also fix ROSRS test cases to use returned URI properly