Issue #86: Fixing system fallback tests.