Issue #11. More test cases.