Issue #222: Fix tests.