Switched more modules to junit5
28 files changed