Issue #35: Enhanced test cases.