More test clean up. Issue #142