Removing deprecated calls to junit