We now need to pass in the shipping charge explicitly as well as the
method. The way that the shipping discounts are persisted is also
adjusted.

As they are integration tests, not unit tests.