Fixed tests for changes in checkout process