Bump JUnit version
Improve reliability of shrinkMaxSizeEvicts test