Upgrade to junit 4.12