add service/shipmentInsertionCalcSwitcher, some renaming and first tests