junit  and other fix.
2 files changed