AbstractQuery.class : review and test