Various junit fixes
34 files changed