Actually, here I've implemented the map of parameters, as I thought that later maybe we would like to extend the tests for queries by adding more and more parameters. Currently having map of parameters will prevent big rework later. 

What do you think?