Add method echeanceToProduct
Refactor mock