Issue #88: Fix tests.