Clean up checkout test logic a bit