Refined checkout process and updated tests