More validation tests and tweaks to the SPARQL