Add or-based test for queries
Fix test cleanup
Merge in master (new test for or-based queries