Week #2: fix perform-query tests