Upgrading JUnit and fixing broken tests