Small fixes to rdf export to fix unit tests