Fixed SaveQuery test and renamed to SaveQuerySimpleSearch()