Upgrade for junit