Rewrote tests according to the latest sparql changes