Upgrade junit3 to junit4