Add ShippingPoint to invoice entries
Refactor tests