Added additional Query tests