added further testcases
added partial support for valuesets
added filtering within retrieves