Issue #334: Fix tests.