fix Query tests