Upgrade to jmockit 1.7