simplified query testing and query interface a bit