Fixing cache issue where query key is getting modified. we now store the original query in a different object
Adding a few in code comments
reorganizing tests folder
deleting tests file from root folder