Issue #201: Fix tests.