test fixes
junit upgrade