Issue #542: Fix the tests.