Upgrade junit tests