diff --git a/app/controllers/eis_billing/lhv_connect_transactions_controller.rb b/app/controllers/eis_billing/lhv_connect_transactions_controller.rb
index ef0863645..09688e68f 100644
--- a/app/controllers/eis_billing/lhv_connect_transactions_controller.rb
+++ b/app/controllers/eis_billing/lhv_connect_transactions_controller.rb
@@ -16,7 +16,10 @@ module EisBilling
 
       bank_statement = BankStatement.new(bank_code: Setting.registry_bank_code,
                                          iban: Setting.registry_iban)
+      bank_statement_transaction(bank_statement: bank_statement, incoming_transaction: incoming_transaction)
+    end
 
+    def bank_statement_transaction(bank_statement:, incoming_transaction:)
       ActiveRecord::Base.transaction do
         bank_statement.save!
         transaction = create_transaction(incoming_transaction: incoming_transaction, bank_statement: bank_statement)
diff --git a/app/services/eis_billing/get_invoice_number.rb b/app/services/eis_billing/get_invoice_number.rb
index 88698caa0..1ef31eeb0 100644
--- a/app/services/eis_billing/get_invoice_number.rb
+++ b/app/services/eis_billing/get_invoice_number.rb
@@ -4,8 +4,6 @@ module EisBilling
       send_request
     end
 
-    private
-
     def self.send_request
       http = EisBilling::Base.base_request(url: invoice_number_generator_url)
       http.post(invoice_number_generator_url, nil, EisBilling::Base.headers)
diff --git a/app/services/eis_billing/get_reference_number.rb b/app/services/eis_billing/get_reference_number.rb
index b6b21e655..e200a8dff 100644
--- a/app/services/eis_billing/get_reference_number.rb
+++ b/app/services/eis_billing/get_reference_number.rb
@@ -1,18 +1,16 @@
 module EisBilling
   class GetReferenceNumber < EisBilling::Base
     def self.send_request
-      send_request
+      send_it
     end
 
-    private
-
     def self.obj_data
       {
         initiator: INITIATOR,
       }
     end
 
-    def self.send_request
+    def self.send_it
       http = EisBilling::Base.base_request(url: reference_number_generator_url)
       http.post(reference_number_generator_url, obj_data.to_json, EisBilling::Base.headers)
     end
diff --git a/app/services/eis_billing/send_e_invoice.rb b/app/services/eis_billing/send_e_invoice.rb
index 906cbfe46..e2a9cfaf6 100644
--- a/app/services/eis_billing/send_e_invoice.rb
+++ b/app/services/eis_billing/send_e_invoice.rb
@@ -6,7 +6,33 @@ module EisBilling
 
     def self.send_info(invoice:, payable:)
       items = []
-      prepared_data = {
+      prepared_data = prepare_data(invoice: invoice, payable: payable)
+
+      invoice.items.each do |invoice_item|
+        items << prepare_item(invoice_item)
+      end
+
+      prepared_data[:items] = items
+
+      http = EisBilling::Base.base_request(url: e_invoice_url)
+      http.post(e_invoice_url, prepared_data.to_json, EisBilling::Base.headers)
+    end
+
+    def self.prepare_item(invoice_item)
+      {
+        description: invoice_item.description,
+        price: invoice_item.price,
+        quantity: invoice_item.quantity,
+        unit: invoice_item.unit,
+        subtotal: invoice_item.subtotal,
+        vat_rate: invoice_item.vat_rate,
+        vat_amount: invoice_item.vat_amount,
+        total: invoice_item.total,
+      }
+    end
+
+    def self.prepare_data(invoice:, payable:)
+      {
         invoice: invoice,
         vat_amount: invoice.vat_amount,
         invoice_subtotal: invoice.subtotal,
@@ -17,24 +43,6 @@ module EisBilling
         payable: payable,
         initiator: EisBilling::Base::INITIATOR,
       }
-
-      invoice.items.each do |invoice_item|
-        items << {
-          description: invoice_item.description,
-          price: invoice_item.price,
-          quantity: invoice_item.quantity,
-          unit: invoice_item.unit,
-          subtotal: invoice_item.subtotal,
-          vat_rate: invoice_item.vat_rate,
-          vat_amount: invoice_item.vat_amount,
-          total: invoice_item.total,
-        }
-      end
-
-      prepared_data[:items] = items
-
-      http = EisBilling::Base.base_request(url: e_invoice_url)
-      http.post(e_invoice_url, prepared_data.to_json, EisBilling::Base.headers)
     end
 
     def self.e_invoice_url
diff --git a/lib/tasks/eis_billing_import_data.rake b/lib/tasks/eis_billing_import_data.rake
index 7607ea476..189f11bbd 100644
--- a/lib/tasks/eis_billing_import_data.rake
+++ b/lib/tasks/eis_billing_import_data.rake
@@ -60,8 +60,8 @@ end
 
 def headers
   {
-  'Authorization' => "Bearer #{generate_token}",
-  'Content-Type' => 'application/json',
+    'Authorization' => "Bearer #{generate_token}",
+    'Content-Type' => 'application/json',
   }
 end
 
diff --git a/test/integration/admin_area/invoices_test.rb b/test/integration/admin_area/invoices_test.rb
index c0bee324d..9c831250e 100644
--- a/test/integration/admin_area/invoices_test.rb
+++ b/test/integration/admin_area/invoices_test.rb
@@ -27,16 +27,16 @@ class AdminAreaInvoicesIntegrationTest < ApplicationIntegrationTest
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       visit new_admin_invoice_path
diff --git a/test/integration/eis_billing/payment_status_test.rb b/test/integration/eis_billing/payment_status_test.rb
deleted file mode 100644
index c47da4e9c..000000000
--- a/test/integration/eis_billing/payment_status_test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'test_helper'
-
-class PaymentStatusIntegrationTest < ApplicationIntegrationTest
-  setup do
-    @invoice = invoices(:unpaid)
-    sign_in users(:api_bestnames)
-    Spy.on_instance_method(EisBilling::BaseController, :authorized).and_return(true)
-  end
-
-  def test_update_payment_status_should_create_succesfully_billing_instaces
-    if Feature.billing_system_integrated?
-      payload = {
-        "order_reference" => @invoice.number,
-        "transaction_time" => Time.zone.now - 2.minute,
-        "standing_amount" => @invoice.total,
-        "payment_state" => 'settled'
-      }
-
-      assert_difference -> { @invoice.payment_orders.count } do
-        assert_difference -> { BankTransaction.count } do
-          put eis_billing_payment_status_path,  params: payload,
-            headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
-        end
-      end
-
-      bank_transaction = BankTransaction.order(created_at: :desc).first
-      invoice_payment_order = @invoice.payment_orders.order(created_at: :desc).first
-
-      assert_equal bank_transaction.sum, @invoice.total
-      assert_equal invoice_payment_order.status, "paid"
-      assert_equal @invoice.account_activity.activity_type, "add_credit"
-
-      assert_response :ok
-    end
-  end
-
-  def test_update_payment_status_should_create_failed_payment
-    if Feature.billing_system_integrated?
-      payload = {
-        "order_reference" => @invoice.number,
-        "transaction_time" => Time.zone.now - 2.minute,
-        "standing_amount" => @invoice.total,
-        "payment_state" => 'cancelled'
-      }
-
-      assert_difference -> { @invoice.payment_orders.count } do
-        assert_difference -> { BankTransaction.count } do
-          put eis_billing_payment_status_path,  params: payload,
-            headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
-        end
-      end
-
-      bank_transaction = BankTransaction.order(created_at: :desc).first
-      invoice_payment_order = @invoice.payment_orders.order(created_at: :desc).first
-
-      assert_equal bank_transaction.sum, @invoice.total
-      assert_equal invoice_payment_order.status, "failed"
-      assert_equal @invoice.account_activity.activity_type, "add_credit"
-
-      assert_response :ok
-    end
-  end
-end
diff --git a/test/models/bank_transaction_test.rb b/test/models/bank_transaction_test.rb
index e3063b89d..8a3a664b5 100644
--- a/test/models/bank_transaction_test.rb
+++ b/test/models/bank_transaction_test.rb
@@ -18,7 +18,7 @@ class BankTransactionTest < ActiveSupport::TestCase
   def test_binds_if_this_sum_invoice_already_present
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
       create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
       another_invoice = @invoice.dup
@@ -47,7 +47,7 @@ class BankTransactionTest < ActiveSupport::TestCase
   def test_binds_if_this_sum_cancelled_invoice_already_present
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
       create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
       another_invoice = @invoice.dup
@@ -73,7 +73,7 @@ class BankTransactionTest < ActiveSupport::TestCase
   def test_marks_the_first_one_as_paid_if_same_sum
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
       create_payable_invoice(number: '2222', total: 10, reference_no: '1234567')
       another_invoice = @invoice.dup
diff --git a/test/models/billing/reference_no_test.rb b/test/models/billing/reference_no_test.rb
index 18179f3e6..15ac65dc4 100644
--- a/test/models/billing/reference_no_test.rb
+++ b/test/models/billing/reference_no_test.rb
@@ -8,7 +8,7 @@ class ReferenceNoTest < ActiveSupport::TestCase
 
   def test_generated_reference_number_conforms_to_format
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator")
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator")
         .to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {})
 
       reference_no = Billing::ReferenceNo.generate
diff --git a/test/models/invoice_test.rb b/test/models/invoice_test.rb
index a5ca4e401..d0cadb4ee 100644
--- a/test/models/invoice_test.rb
+++ b/test/models/invoice_test.rb
@@ -125,23 +125,23 @@ class InvoiceTest < ActiveSupport::TestCase
       transaction.sum = 250
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
         .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
         .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       invoice = Invoice.create_from_transaction!(transaction)
       assert_equal 250, invoice.total
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 4}\"}", headers: {})
 
       transaction.sum = 146.88
@@ -149,7 +149,7 @@ class InvoiceTest < ActiveSupport::TestCase
       assert_equal 146.88, invoice.total
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 5}\"}", headers: {})
 
       transaction.sum = 0.99
@@ -161,13 +161,13 @@ class InvoiceTest < ActiveSupport::TestCase
   def test_emails_invoice_after_creating_topup_invoice
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       registrar = registrars(:bestnames)
diff --git a/test/models/registrar_test.rb b/test/models/registrar_test.rb
index d790a0883..95b9e2538 100644
--- a/test/models/registrar_test.rb
+++ b/test/models/registrar_test.rb
@@ -146,17 +146,17 @@ class RegistrarTest < ActiveJob::TestCase
 
   def test_issues_new_invoice
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       travel_to Time.zone.parse('2010-07-05')
@@ -171,20 +171,20 @@ class RegistrarTest < ActiveJob::TestCase
 
   def test_issues_e_invoice_along_with_invoice
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
     end
-      
+
     EInvoice::Providers::TestProvider.deliveries.clear
 
     perform_enqueued_jobs do
diff --git a/test/services/send_data_to_directo_test.rb b/test/services/send_data_to_directo_test.rb
index fde9d35d3..b853a17f3 100644
--- a/test/services/send_data_to_directo_test.rb
+++ b/test/services/send_data_to_directo_test.rb
@@ -6,7 +6,7 @@ class SendDataToDirectoTest < ActiveSupport::TestCase
   end
 
   def test_should_send_data_to_billing_directo
-    stub_request(:post, "http://eis_billing_system:3000/api/v1/directo/directo").
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/directo/directo").
     to_return(status: 200, body: "ok", headers: {})
 
     res = EisBilling::SendDataToDirecto.send_request(object_data: [], monthly: true, dry: true)
diff --git a/test/system/admin_area/bank_statement_test.rb b/test/system/admin_area/bank_statement_test.rb
index fea19869b..f86e6ef53 100644
--- a/test/system/admin_area/bank_statement_test.rb
+++ b/test/system/admin_area/bank_statement_test.rb
@@ -57,17 +57,17 @@ class AdminAreaBankStatementTest < ApplicationSystemTestCase
   def test_can_bind_statement_transactions
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
         .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
       registrar = registrars(:bestnames)
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator")
         .to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response")
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response")
         .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
         .to_return(status: 200, body: "", headers: {})
 
       registrar.issue_prepayment_invoice(500)
diff --git a/test/system/admin_area/registrars_test.rb b/test/system/admin_area/registrars_test.rb
index 851d546c5..757875d1f 100644
--- a/test/system/admin_area/registrars_test.rb
+++ b/test/system/admin_area/registrars_test.rb
@@ -15,7 +15,7 @@ class AdminRegistrarsSystemTest < ApplicationSystemTestCase
 
   def test_creates_new_registrar
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/reference_number_generator").
         to_return(status: 200, body: "{\"reference_number\":\"12332\"}", headers: {})
 
       assert_nil Registrar.find_by(name: 'Acme Ltd')
diff --git a/test/system/registrar_area/add_deposits_test.rb b/test/system/registrar_area/add_deposits_test.rb
index 68841b8d4..72f51749c 100644
--- a/test/system/registrar_area/add_deposits_test.rb
+++ b/test/system/registrar_area/add_deposits_test.rb
@@ -13,16 +13,16 @@ class AddDepositsTest < ApplicationSystemTestCase
   def test_should_send_request_for_creating_invoice_to_eis_system
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       visit new_registrar_deposit_url
diff --git a/test/system/registrar_area/billing/balance_top_up_test.rb b/test/system/registrar_area/billing/balance_top_up_test.rb
index 3306ffa3e..5cb32361f 100644
--- a/test/system/registrar_area/billing/balance_top_up_test.rb
+++ b/test/system/registrar_area/billing/balance_top_up_test.rb
@@ -17,13 +17,13 @@ class BalanceTopUpTest < ApplicationSystemTestCase
   def test_creates_new_invoice
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response")
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response")
         .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice")
         .to_return(status: 200, body: "", headers: {})
 
       Setting.registry_vat_prc = 0.1
diff --git a/test/system/registrar_area/invoices/new_invoice_payment_test.rb b/test/system/registrar_area/invoices/new_invoice_payment_test.rb
index 360d115e3..29bb1560c 100644
--- a/test/system/registrar_area/invoices/new_invoice_payment_test.rb
+++ b/test/system/registrar_area/invoices/new_invoice_payment_test.rb
@@ -29,13 +29,13 @@ class NewInvoicePaymentTest < ApplicationSystemTestCase
   def test_create_new_SEB_payment
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       create_invoice_and_visit_its_page
@@ -50,13 +50,13 @@ class NewInvoicePaymentTest < ApplicationSystemTestCase
   def test_create_new_Every_Pay_payment
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       create_invoice_and_visit_its_page
diff --git a/test/system/registrar_area/invoices/new_test.rb b/test/system/registrar_area/invoices/new_test.rb
index 1ca36389d..a1b66ac47 100644
--- a/test/system/registrar_area/invoices/new_test.rb
+++ b/test/system/registrar_area/invoices/new_test.rb
@@ -19,13 +19,13 @@ class NewInvoiceTest < ApplicationSystemTestCase
   def test_create_new_invoice_with_positive_amount
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       visit registrar_invoices_path
@@ -47,13 +47,13 @@ class NewInvoiceTest < ApplicationSystemTestCase
   def test_create_new_invoice_with_comma_in_number
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       visit registrar_invoices_path
diff --git a/test/tasks/invoices/process_payments_test.rb b/test/tasks/invoices/process_payments_test.rb
index b7721db68..e368c5369 100644
--- a/test/tasks/invoices/process_payments_test.rb
+++ b/test/tasks/invoices/process_payments_test.rb
@@ -82,16 +82,16 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
 
       Spy.on_instance_method(SendEInvoiceTwoJob, :perform_now).and_return(true)
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
       assert_not @invoice.paid?
@@ -164,18 +164,18 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
   def test_credits_registrar_athout_invoice_beforehand
     if Feature.billing_system_integrated?
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}")
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
       Spy.on_instance_method(SendEInvoiceTwoJob, :perform_now).and_return(true)
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
       registrar = registrars(:bestnames)
@@ -199,17 +199,17 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase
 
   def test_topup_creates_invoice_and_send_it_as_paid
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
       registrar = registrars(:bestnames)
diff --git a/test/tasks/registrars/reload_balance_test.rb b/test/tasks/registrars/reload_balance_test.rb
index 0e7979d3d..0888fe3f4 100644
--- a/test/tasks/registrars/reload_balance_test.rb
+++ b/test/tasks/registrars/reload_balance_test.rb
@@ -22,17 +22,17 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
 
   def test_issues_invoice_when_auto_reload_is_enabled_and_threshold_reached
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
       to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
       to_return(status: 200, body: "", headers: {})
 
       reload_amount = 100
@@ -67,17 +67,17 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
 
   def test_marks_registrar_as_pending_balance_reload
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
         
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
   
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       registrar = registrar_with_auto_reload_enabled_and_threshold_reached
@@ -91,17 +91,17 @@ class ReloadBalanceTaskTest < ActiveSupport::TestCase
 
   def test_output
     if Feature.billing_system_integrated?
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
         to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
       invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "http://registry:3000/eis_billing/e_invoice_response").
+      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
         to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "http://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
         to_return(status: 200, body: "", headers: {})
 
       reload_amount = 100