Added tests for nested and/or queries

These already worked, just needed to add tests for them.
Merge pull request #1634 from 10gen-interns/andor

Added tests for nested and/or queries