Upgrade to Junit 4.