added new queries to matcher and data to tester