Upgrade to use junit 4.11