Use generic task
fix test