Upgraded from junit 3.8 to junit 4.11.