Switch from junit-dep to junit