Issue #10: Resolve current test failures.