Minor sqlquery test cleanup