#17 Handle multiple keys with the same name
 #17 Move unnamed tests to dataProvider
Remove duplicate logic for setting the query key value