Failing of test case 16 was really just a scoping issue
Have a "multiQuery" function
fixed merge conflicts