Issue #301: Fix DB Query tests.