More test case fixes. Issue #142