Fix types for SPARQL Data references
Fix some test numbers