updates primarily to the tests, and testsrunner, but also a small improvement to query delete to account for nested WhereNodes