         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()

    // temp- for testing the tests
    func testBillingInputs() {
        
        let sdkRequest = prepareSdkRequest(fullBilling: true, withShipping: false, withEmail: true)
        
        gotoPaymentScreen(sdkRequest: sdkRequest)
       
        let paymentHelper = BSPaymentScreenUITestHelper(app:app, waitForElementToExistFunc: waitForElementToExist, waitForElementToDisappear: waitForEllementToDisappear)
        
        // check cc line visibility

     Also, it verifies that after changing to different currencies
     and back to the origin one, the amount remains the same
     */
    func testCurrencyChangesInShippingScreen(){
        testCurrencyChanges(withShipping: true)
    }
    
    /* -------------------------------- New shopper tests ---------------------------------------- */
    
    func testFlowFullBillingNoShippingNoEmail() {
        
        setUpForSdk(fullBilling: true, withShipping: false, withEmail: false)

        let paymentHelper = BSPaymentScreenUITestHelper(app:app, waitForElementToExistFunc: waitForElementToExist, waitForElementToDisappear: waitForEllementToDisappear)

        fillBillingDetails(paymentHelper: paymentHelper, ccn: "4111 1111 1111 1111", exp: "1126", cvv: "333", billingDetails: getDummyBillingDetails())
