New QueryBuilder, new Cursor, and new Test Case