Upgrade to junit 4.11