Add in fix from @andrzejpolis Fixes #5384 Fixes #5386
Go to cart and then call next, to trigger hooks
Fixes #5216
Fix specs broken by e6865c6