Further junit fixes.