Fix voor JUnit dependency conflict
Merge commit 'f9b140f25b8c8679e1031aeab57bf31614dd4f89' into Scheduler