         sdkRequest.shopperConfiguration.shippingDetails = shippingDetails
     }
     
-    private func gotoPaymentScreen(sdkRequest: BSSdkRequest, returningShopper: Bool = false, tapExistingCc: Bool = false, hideCurrency: Bool = false){
-        isReturningShopper = returningShopper
+    private func gotoPaymentScreen(tapExistingCc: Bool = false){
         let paymentTypeHelper = BSPaymentTypeScreenUITestHelper(app: app)
         
         // set switches and amounts in merchant checkout screen
-        setMerchantCheckoutScreen(sdkRequest: sdkRequest, returningShopper: returningShopper, hideCurrency: hideCurrency)
+        setMerchantCheckoutScreen(sdkRequest: sdkRequest, returningShopper: isReturningShopper)
         
         // click "Checkout" button
         app.buttons["CheckoutButton"].tap()

        super.tearDown()
    }
    
    
    
    /* -------------------------------- Returning shopper tests ---------------------------------------- */
    

    }
    
    
    private func gotoShippingScreen(fillInDetails: Bool = true) -> BSShippingScreenUITestHelper{
        
        let paymentHelper = BSPaymentScreenUITestHelper(app:app, waitForElementToExistFunc: waitForElementToExist, waitForElementToDisappear: waitForEllementToDisappear)
        if (fillInDetails){
