Remove direct dependency on junit