Add DSL spec to ensure CollectionQueries are built properly