Issue #86: Fixing more tests.