makes final tweaks to checkout flow.
Fixes broken tests.
Merge pull request #202 from MarcGarreau/tweaks-to-checkout-flow

Tweaks to checkout flow