Junit fixes. Issue #142