More junit fixes. Issue#142