Fixed up SPARQL
Fixed some build issues and restored tests project