Squashed commit of the following:

commit f46a7caf90c5dbec94a50f6d0c6cf65872af4fa5
Author: joneshf <jones3.hardy@gmail.com>
Date:   Mon Sep 29 19:59:34 2014 -0700

    Updated tests.

    Added one to check for a block in the same notebook.
    Also made the queries a bit more complicated (so it will create a new collection).

commit 6caf944d45f7cbf292fabd3cd906963e79e7724f
Author: joneshf <jones3.hardy@gmail.com>
Date:   Mon Sep 29 19:13:34 2014 -0700

    Added some more tests.