Revert rdfContainsNode and listNodesWithPredicate

From 9dd4729908db8d2f80088706592adac81a0f3016
modified tests, as expansion is now deferred