changed getCriteria() to return a JSONObject
Kisitu - WIP : fixing failing tests due change in the getCriteria() method signature