Junit fixes for Issue #142