Changed the test query to use new sets