Updated old junit imports