Issue #274: Fix tests.