Completed tests for all Blocks.

Todo: tests for Builder and QueryBuilder classes as well as newly refactored query builders.

Todo: tests to ensure that customised query builders and custom blocks work fine.