JUnit version upgrade, some testcases masked.