Fix shipment and differentiator specs
Fix esimator specs