diff --git a/Gemfile b/Gemfile
index 911a870912d..e8c19b918b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -125,7 +125,7 @@ group :test do
   gem 'rails-controller-testing', '>= 1.0.4'
   gem 'rspec-retry'
   gem 'shoulda-matchers', '~> 4.0', require: false
-  gem 'webdrivers', '~> 4.0'
+  gem 'webdrivers', '~> 5.2.0'
   gem 'webmock'
   gem 'zonebie'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ea60c8462b..489960208c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -692,10 +692,10 @@ GEM
       openssl (~> 2.2)
       safety_net_attestation (~> 0.4.0)
       tpm-key_attestation (~> 0.10.0)
-    webdrivers (4.7.0)
+    webdrivers (5.2.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (> 3.141, < 5.0)
+      selenium-webdriver (~> 4.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -830,7 +830,7 @@ DEPENDENCIES
   valid_email (>= 0.1.3)
   view_component (~> 2.51.0)
   webauthn (~> 2.1)
-  webdrivers (~> 4.0)
+  webdrivers (~> 5.2.0)
   webmock
   xmldsig (~> 0.6)
   xmlenc (~> 0.7, >= 0.7.1)
diff --git a/app/assets/stylesheets/components/_troubleshooting-options.scss b/app/assets/stylesheets/components/_troubleshooting-options.scss
index bca9f50329a..b6eaca8b84c 100644
--- a/app/assets/stylesheets/components/_troubleshooting-options.scss
+++ b/app/assets/stylesheets/components/_troubleshooting-options.scss
@@ -5,7 +5,7 @@
     margin-bottom: 0;
   }
 
-  &::before {
+  &.troubleshooting-options--divider::before {
     @include u-margin-bottom(4);
     background-color: color('secondary');
     content: '';
@@ -13,10 +13,6 @@
     height: 4px;
     width: 5rem;
   }
-
-  & + &::before {
-    content: none;
-  }
 }
 
 .troubleshooting-options__heading {
diff --git a/app/controllers/account_reset/pending_controller.rb b/app/controllers/account_reset/pending_controller.rb
index 76d1c856900..77ca7da3f05 100644
--- a/app/controllers/account_reset/pending_controller.rb
+++ b/app/controllers/account_reset/pending_controller.rb
@@ -14,9 +14,7 @@ def confirm; end
 
     def cancel
       analytics.pending_account_reset_cancelled
-      irs_attempts_api_tracker.account_reset_cancel_request(
-        success: true,
-      )
+      irs_attempts_api_tracker.account_reset_cancel_request
       AccountReset::CancelRequestForUser.new(current_user).call
     end
 
diff --git a/app/controllers/idv/gpo_controller.rb b/app/controllers/idv/gpo_controller.rb
index 9349eae4872..3bd309ce65b 100644
--- a/app/controllers/idv/gpo_controller.rb
+++ b/app/controllers/idv/gpo_controller.rb
@@ -47,7 +47,7 @@ def step_indicator_current_step
 
     def update_tracking
       analytics.idv_gpo_address_letter_requested(resend: resend_requested?)
-      irs_attempts_api_tracker.idv_gpo_letter_requested(success: true, resend: resend_requested?)
+      irs_attempts_api_tracker.idv_gpo_letter_requested(resend: resend_requested?)
       create_user_event(:gpo_mail_sent, current_user)
 
       ProofingComponent.create_or_find_by(user: current_user).update(address_check: 'gpo_letter')
diff --git a/app/controllers/idv/personal_key_controller.rb b/app/controllers/idv/personal_key_controller.rb
index 5e2ca39ee67..c0da6b28a8b 100644
--- a/app/controllers/idv/personal_key_controller.rb
+++ b/app/controllers/idv/personal_key_controller.rb
@@ -65,7 +65,7 @@ def personal_key
 
     def generate_personal_key
       cacher = Pii::Cacher.new(current_user, user_session)
-      irs_attempts_api_tracker.idv_personal_key_generated(success: true)
+      irs_attempts_api_tracker.idv_personal_key_generated
       idv_session.profile.encrypt_recovery_pii(cacher.fetch)
     end
 
diff --git a/app/controllers/sign_up/email_confirmations_controller.rb b/app/controllers/sign_up/email_confirmations_controller.rb
index 86a31240db4..21e66b4399e 100644
--- a/app/controllers/sign_up/email_confirmations_controller.rb
+++ b/app/controllers/sign_up/email_confirmations_controller.rb
@@ -22,7 +22,6 @@ def clear_setup_piv_cac_from_sign_in
     def process_successful_confirmation
       process_valid_confirmation_token
       request_id = params.fetch(:_request_id, '')
-      Funnel::Registration::ConfirmEmail.call(@user.id)
       redirect_to sign_up_enter_password_url(
         request_id: request_id, confirmation_token: @confirmation_token,
       )
diff --git a/app/controllers/sign_up/passwords_controller.rb b/app/controllers/sign_up/passwords_controller.rb
index a5c73987b96..a2ee1b15e65 100644
--- a/app/controllers/sign_up/passwords_controller.rb
+++ b/app/controllers/sign_up/passwords_controller.rb
@@ -56,7 +56,6 @@ def process_successful_password_creation
       ).call
       @user.email_addresses.take.update(confirmed_at: now)
 
-      Funnel::Registration::AddPassword.call(@user.id)
       sign_in_and_redirect_user
     end
 
diff --git a/app/forms/edit_phone_form.rb b/app/forms/edit_phone_form.rb
index f014de1462e..4e3b615fdd4 100644
--- a/app/forms/edit_phone_form.rb
+++ b/app/forms/edit_phone_form.rb
@@ -33,6 +33,10 @@ def default_phone_configuration?
     phone_configuration == user.default_phone_configuration
   end
 
+  def one_phone_configured?
+    user.phone_configurations.count == 1
+  end
+
   private
 
   attr_writer :delivery_preference, :make_default_number
diff --git a/app/forms/register_user_email_form.rb b/app/forms/register_user_email_form.rb
index 9c6eafc259d..a375438425c 100644
--- a/app/forms/register_user_email_form.rb
+++ b/app/forms/register_user_email_form.rb
@@ -95,7 +95,6 @@ def process_successful_submission(request_id, instructions)
     self.success = true
     user.accepted_terms_at = Time.zone.now
     user.save!
-    Funnel::Registration::Create.call(user.id)
     SendSignUpEmailConfirmation.new(user).call(
       request_id: email_request_id(request_id),
       instructions: instructions,
diff --git a/app/javascript/packages/components/troubleshooting-options.spec.tsx b/app/javascript/packages/components/troubleshooting-options.spec.tsx
index 59f2c95132b..491e1e982e1 100644
--- a/app/javascript/packages/components/troubleshooting-options.spec.tsx
+++ b/app/javascript/packages/components/troubleshooting-options.spec.tsx
@@ -81,4 +81,24 @@ describe('TroubleshootingOptions', () => {
     const tag = getByText('components.troubleshooting_options.new_feature');
     expect(tag.classList.contains('text-uppercase')).to.eq(true);
   });
+
+  it('renders with expected classes', () => {
+    const { container } = render(<TroubleshootingOptions {...DEFAULT_PROPS} />);
+
+    const element = container.firstElementChild!;
+
+    expect(element.classList.contains('troubleshooting-options')).to.be.true();
+    expect(element.classList.contains('troubleshooting-options--divider')).to.be.true();
+  });
+
+  context('with divider disabled', () => {
+    it('renders with expected classes', () => {
+      const { container } = render(<TroubleshootingOptions {...DEFAULT_PROPS} divider={false} />);
+
+      const element = container.firstElementChild!;
+
+      expect(element.classList.contains('troubleshooting-options')).to.be.true();
+      expect(element.classList.contains('troubleshooting-options--divider')).to.be.false();
+    });
+  });
 });
diff --git a/app/javascript/packages/components/troubleshooting-options.tsx b/app/javascript/packages/components/troubleshooting-options.tsx
index fab09c66ff0..8f5ed3bd90b 100644
--- a/app/javascript/packages/components/troubleshooting-options.tsx
+++ b/app/javascript/packages/components/troubleshooting-options.tsx
@@ -19,6 +19,8 @@ interface TroubleshootingOptionsProps {
   options: TroubleshootingOption[];
 
   isNewFeatures?: boolean;
+
+  divider?: boolean;
 }
 
 function TroubleshootingOptions({
@@ -26,6 +28,7 @@ function TroubleshootingOptions({
   heading,
   options,
   isNewFeatures,
+  divider = true,
 }: TroubleshootingOptionsProps) {
   const { t } = useI18n();
 
@@ -33,10 +36,13 @@ function TroubleshootingOptions({
     return null;
   }
 
+  const classes = ['troubleshooting-options', divider && 'troubleshooting-options--divider']
+    .filter(Boolean)
+    .join(' ');
   const HeadingTag = headingTag;
 
   return (
-    <section className="troubleshooting-options">
+    <section className={classes}>
       {isNewFeatures && (
         <span className="usa-tag bg-accent-cool-darker text-uppercase display-inline-block">
           {t('components.troubleshooting_options.new_feature')}
diff --git a/app/javascript/packages/document-capture/components/document-capture-troubleshooting-options.tsx b/app/javascript/packages/document-capture/components/document-capture-troubleshooting-options.tsx
index fd287e8f018..f20577f8689 100644
--- a/app/javascript/packages/document-capture/components/document-capture-troubleshooting-options.tsx
+++ b/app/javascript/packages/document-capture/components/document-capture-troubleshooting-options.tsx
@@ -85,6 +85,7 @@ function DocumentCaptureTroubleshootingOptions({
           heading={formatHTML(t('idv.troubleshooting.headings.are_you_near'), {
             wbr: 'wbr',
           })}
+          divider={false}
           options={[
             {
               url: '#location',
diff --git a/app/jobs/reports/deleted_user_accounts_report.rb b/app/jobs/reports/deleted_user_accounts_report.rb
index ca82eac7776..53b8fc391df 100644
--- a/app/jobs/reports/deleted_user_accounts_report.rb
+++ b/app/jobs/reports/deleted_user_accounts_report.rb
@@ -20,7 +20,7 @@ def perform(_date)
         issuers = report_hash['issuers']
         report = deleted_user_accounts_data_for_issuers(issuers)
         emails.each do |email|
-          UserMailer.deleted_user_accounts_report(
+          ReportMailer.deleted_user_accounts_report(
             email: email,
             name: name,
             issuers: issuers,
diff --git a/app/jobs/reports/query_helpers.rb b/app/jobs/reports/query_helpers.rb
index 89964cad7fe..54d76f05dad 100644
--- a/app/jobs/reports/query_helpers.rb
+++ b/app/jobs/reports/query_helpers.rb
@@ -7,20 +7,5 @@ def quote(value)
         ActiveRecord::Base.connection.quote(value)
       end
     end
-
-    # Wrapper around PG::Result#stream_each, runs a query and yields each row to the block
-    # as it is returned from the DB
-    # @param [String] SQL query
-    # @yieldparam [Hash] row
-    def stream_query(query)
-      ActiveRecord::Base.logger.debug(query) # using send_query skips ActiveRecord logging
-      connection = ActiveRecord::Base.connection.raw_connection
-      connection.send_query(query)
-      connection.set_single_row_mode
-      connection.get_result.stream_each do |row|
-        yield row
-      end
-      connection.get_result
-    end
   end
 end
diff --git a/app/mailers/report_mailer.rb b/app/mailers/report_mailer.rb
new file mode 100644
index 00000000000..b6a42e29364
--- /dev/null
+++ b/app/mailers/report_mailer.rb
@@ -0,0 +1,17 @@
+class ReportMailer < ActionMailer::Base
+  include Mailable
+
+  before_action :attach_images
+
+  def sps_over_quota_limit(email)
+    mail(to: email, subject: t('report_mailer.sps_over_quota_limit.subject'))
+  end
+
+  def deleted_user_accounts_report(email:, name:, issuers:, data:)
+    @name = name
+    @issuers = issuers
+    @data = data
+    attachments['deleted_user_accounts.csv'] = data
+    mail(to: email, subject: t('report_mailer.deleted_accounts_report.subject'))
+  end
+end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 09ba0c4a311..4d533bfb4cc 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -197,18 +197,6 @@ def add_email_associated_with_another_account(email)
     mail(to: email, subject: t('mailer.email_reuse_notice.subject'))
   end
 
-  def sps_over_quota_limit(email)
-    mail(to: email, subject: t('user_mailer.sps_over_quota_limit.subject'))
-  end
-
-  def deleted_user_accounts_report(email:, name:, issuers:, data:)
-    @name = name
-    @issuers = issuers
-    @data = data
-    attachments['deleted_user_accounts.csv'] = data
-    mail(to: email, subject: t('user_mailer.deleted_accounts_report.subject'))
-  end
-
   def account_verified(user, email_address, date_time:, sp_name:, disavowal_token:)
     return unless email_should_receive_nonessential_notifications?(email_address.email)
 
diff --git a/app/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window.rb b/app/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window.rb
index 1efccde96f3..bd844c31efb 100644
--- a/app/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window.rb
+++ b/app/services/db/monthly_sp_auth_count/total_monthly_auth_counts_within_iaa_window.rb
@@ -33,14 +33,19 @@ def call(issuer:, iaa:, iaa_start_date:, iaa_end_date:)
 
           with_retries(
             max_tries: 3,
-            rescue: [PG::TRSerializationFailure, PG::UnableToSend],
+            rescue: [
+              ActiveRecord::SerializationFailure,
+              PG::ConnectionBad,
+              PG::TRSerializationFailure,
+              PG::UnableToSend,
+            ],
             handler: proc do
               ial_to_year_month_to_users = temp_copy
               ActiveRecord::Base.connection.reconnect!
             end,
           ) do
             Reports::BaseReport.transaction_with_timeout do
-              stream_query(query) do |row|
+              ActiveRecord::Base.connection.execute(query).each do |row|
                 user_id = row['user_id']
                 year_month = row['year_month']
                 auth_count = row['auth_count']
@@ -116,10 +121,6 @@ def build_queries(issuer:, months:)
           SQL
         end
       end
-
-      def default_call
-        yield
-      end
     end
   end
 end
diff --git a/app/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa.rb b/app/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa.rb
index a8748d0a167..6a752f6fdf4 100644
--- a/app/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa.rb
+++ b/app/services/db/monthly_sp_auth_count/unique_monthly_auth_counts_by_iaa.rb
@@ -29,14 +29,19 @@ def call(key:, issuers:, start_date:, end_date:)
 
           with_retries(
             max_tries: 3,
-            rescue: [PG::TRSerializationFailure, PG::UnableToSend],
+            rescue: [
+              ActiveRecord::SerializationFailure,
+              PG::ConnectionBad,
+              PG::TRSerializationFailure,
+              PG::UnableToSend,
+            ],
             handler: proc do
               ial_to_year_month_to_users = temp_copy
               ActiveRecord::Base.connection.reconnect!
             end,
           ) do
             Reports::BaseReport.transaction_with_timeout do
-              stream_query(query) do |row|
+              ActiveRecord::Base.connection.execute(query).each do |row|
                 user_id = row['user_id']
                 year_month = row['year_month']
                 auth_count = row['auth_count']
diff --git a/app/services/db/service_provider_quota_limit/notify_if_any_sp_over_quota_limit.rb b/app/services/db/service_provider_quota_limit/notify_if_any_sp_over_quota_limit.rb
index b192a53b099..04f836ac0f5 100644
--- a/app/services/db/service_provider_quota_limit/notify_if_any_sp_over_quota_limit.rb
+++ b/app/services/db/service_provider_quota_limit/notify_if_any_sp_over_quota_limit.rb
@@ -5,7 +5,7 @@ def self.call
         return unless Db::ServiceProviderQuotaLimit::AnySpOverQuotaLimit.call
         email_list = IdentityConfig.store.sps_over_quota_limit_notify_email_list
         email_list.each do |email|
-          UserMailer.sps_over_quota_limit(email).deliver_now_or_later
+          ReportMailer.sps_over_quota_limit(email).deliver_now_or_later
         end
       end
     end
diff --git a/app/services/funnel/registration/add_mfa.rb b/app/services/funnel/registration/add_mfa.rb
index 8246c52e636..8be49424caf 100644
--- a/app/services/funnel/registration/add_mfa.rb
+++ b/app/services/funnel/registration/add_mfa.rb
@@ -3,23 +3,11 @@ module Registration
     class AddMfa
       def self.call(user_id, mfa_method, analytics)
         now = Time.zone.now
-        funnel = RegistrationLog.find_by(user_id: user_id)
-        return if funnel.blank? || funnel.second_mfa.present?
+        funnel = RegistrationLog.where(user_id: user_id).first_or_create(submitted_at: now)
+        return if funnel.registered_at.present?
 
-        if funnel.first_mfa.present?
-          params = {
-            second_mfa: mfa_method,
-          }
-        else
-          params = {
-            first_mfa: mfa_method,
-            first_mfa_at: now,
-            registered_at: now,
-          }
-          analytics.user_registration_user_fully_registered(mfa_method: mfa_method)
-        end
-
-        funnel.update!(params)
+        analytics.user_registration_user_fully_registered(mfa_method: mfa_method)
+        funnel.update!(registered_at: now)
       end
     end
   end
diff --git a/app/services/funnel/registration/add_password.rb b/app/services/funnel/registration/add_password.rb
deleted file mode 100644
index d136df17ee3..00000000000
--- a/app/services/funnel/registration/add_password.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Funnel
-  module Registration
-    class AddPassword
-      # rubocop:disable Rails/SkipsModelValidations
-      def self.call(user_id)
-        RegistrationLog.where(user_id: user_id).update_all(password_at: Time.zone.now)
-      end
-      # rubocop:enable Rails/SkipsModelValidations
-    end
-  end
-end
diff --git a/app/services/funnel/registration/confirm_email.rb b/app/services/funnel/registration/confirm_email.rb
deleted file mode 100644
index d287fd284a6..00000000000
--- a/app/services/funnel/registration/confirm_email.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Funnel
-  module Registration
-    class ConfirmEmail
-      # rubocop:disable Rails/SkipsModelValidations
-      def self.call(user_id)
-        RegistrationLog.where(user_id: user_id).update_all(confirmed_at: Time.zone.now)
-      end
-      # rubocop:enable Rails/SkipsModelValidations
-    end
-  end
-end
diff --git a/app/services/funnel/registration/create.rb b/app/services/funnel/registration/create.rb
deleted file mode 100644
index 6ae8ba3dca3..00000000000
--- a/app/services/funnel/registration/create.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Funnel
-  module Registration
-    class Create
-      def self.call(user_id)
-        user = User.find(user_id)
-        return unless user
-        RegistrationLog.create(user_id: user_id, submitted_at: user.created_at)
-      end
-    end
-  end
-end
diff --git a/app/services/funnel/registration/range_submitted_count.rb b/app/services/funnel/registration/range_submitted_count.rb
deleted file mode 100644
index acdbef32ca8..00000000000
--- a/app/services/funnel/registration/range_submitted_count.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Funnel
-  module Registration
-    class RangeSubmittedCount
-      def self.call(start, finish)
-        RegistrationLog.where('? < submitted_at AND submitted_at < ?', start, finish).count
-      end
-    end
-  end
-end
diff --git a/app/services/funnel/registration/total_submitted_count.rb b/app/services/funnel/registration/total_submitted_count.rb
deleted file mode 100644
index dff10d6df5e..00000000000
--- a/app/services/funnel/registration/total_submitted_count.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Funnel
-  module Registration
-    class TotalSubmittedCount
-      def self.call
-        RegistrationLog.count
-      end
-    end
-  end
-end
diff --git a/app/services/idv/steps/in_person/ssn_step.rb b/app/services/idv/steps/in_person/ssn_step.rb
index 6d2eb2238a9..cb2f3491032 100644
--- a/app/services/idv/steps/in_person/ssn_step.rb
+++ b/app/services/idv/steps/in_person/ssn_step.rb
@@ -10,7 +10,6 @@ def call
           flow_session[:pii_from_user][:ssn] = ssn
 
           @flow.irs_attempts_api_tracker.idv_ssn_submitted(
-            success: true,
             ssn: ssn,
           )
 
diff --git a/app/services/idv/steps/ssn_step.rb b/app/services/idv/steps/ssn_step.rb
index a96927adb17..454bdd075ef 100644
--- a/app/services/idv/steps/ssn_step.rb
+++ b/app/services/idv/steps/ssn_step.rb
@@ -11,7 +11,6 @@ def call
         flow_session[:pii_from_doc][:ssn] = ssn
 
         @flow.irs_attempts_api_tracker.idv_ssn_submitted(
-          success: true,
           ssn: ssn,
         )
 
diff --git a/app/services/irs_attempts_api/tracker_events.rb b/app/services/irs_attempts_api/tracker_events.rb
index d6dc43c5833..891994bb98f 100644
--- a/app/services/irs_attempts_api/tracker_events.rb
+++ b/app/services/irs_attempts_api/tracker_events.rb
@@ -14,12 +14,10 @@ def account_reset_account_deleted(success:, failure_reason: nil)
       )
     end
 
-    # @param [Boolean] success True if account reset request is cancelled
     # A user cancels the request to delete their account before 24 hour period
-    def account_reset_cancel_request(success:)
+    def account_reset_cancel_request
       track_event(
         :account_reset_cancel_request,
-        success: success,
       )
     end
 
@@ -53,12 +51,10 @@ def forgot_password_email_rate_limited(email:)
 
     # Tracks when the user has requested a forgot password email
     # @param [String] email The submitted email address
-    # @param [Boolean] success True if the forgot password email was sent
-    def forgot_password_email_sent(email:, success:)
+    def forgot_password_email_sent(email:)
       track_event(
         :forgot_password_email_sent,
         email: email,
-        success: success,
       )
     end
 
@@ -126,13 +122,11 @@ def idv_document_upload_submitted(
       )
     end
 
-    # @param [Boolean] success
     # @param [String] resend
     # The Address validation letter has been requested by user
-    def idv_gpo_letter_requested(success:, resend:)
+    def idv_gpo_letter_requested(resend:)
       track_event(
         :idv_gpo_letter_requested,
-        success: success,
         resend: resend,
       )
     end
@@ -164,12 +158,10 @@ def idv_password_entered(success:)
       )
     end
 
-    # @param [Boolean] success
     # Personal Key got generated for user
-    def idv_personal_key_generated(success:)
+    def idv_personal_key_generated
       track_event(
         :idv_personal_key_generated,
-        success: success,
       )
     end
 
@@ -272,13 +264,11 @@ def idv_reproof
       )
     end
 
-    # @param [Boolean] success
     # @param [String] ssn
     # User entered in SSN number during Identity verification
-    def idv_ssn_submitted(success:, ssn:)
+    def idv_ssn_submitted(ssn:)
       track_event(
         :idv_ssn_submitted,
-        success: success,
         ssn: ssn,
       )
     end
diff --git a/app/services/request_password_reset.rb b/app/services/request_password_reset.rb
index d7de35d0fa4..b97790da680 100644
--- a/app/services/request_password_reset.rb
+++ b/app/services/request_password_reset.rb
@@ -31,7 +31,7 @@ def send_reset_password_instructions
       event = PushNotification::RecoveryActivatedEvent.new(user: user)
       PushNotification::HttpPush.deliver(event)
 
-      irs_attempts_api_tracker.forgot_password_email_sent(email: email, success: true)
+      irs_attempts_api_tracker.forgot_password_email_sent(email: email)
     end
   end
 
diff --git a/app/views/accounts/_phone.html.erb b/app/views/accounts/_phone.html.erb
index 2536b162cc7..a9eaf9bb540 100644
--- a/app/views/accounts/_phone.html.erb
+++ b/app/views/accounts/_phone.html.erb
@@ -10,7 +10,7 @@
       <div class="grid-row grid-gap-2">
         <div class="grid-col-fill">
           <%= PhoneFormatter.format(phone_configuration.phone) %>
-          <% if current_user.default_phone_configuration == phone_configuration %>
+          <% if current_user.default_phone_configuration == phone_configuration && MfaContext.new(current_user).phone_configurations.count > 1 %>
             (<%= I18n.t('account.index.default') %>)
           <% end %>
         </div>
diff --git a/app/views/report_mailer/deleted_user_accounts_report.html.erb b/app/views/report_mailer/deleted_user_accounts_report.html.erb
new file mode 100644
index 00000000000..d42d276ab12
--- /dev/null
+++ b/app/views/report_mailer/deleted_user_accounts_report.html.erb
@@ -0,0 +1,2 @@
+<%= t('report_mailer.deleted_accounts_report.name') %>: <%= @name %><br>
+<%= t('report_mailer.deleted_accounts_report.issuers') %>: <%= @issuers.join(',') %><br>
diff --git a/app/views/user_mailer/sps_over_quota_limit.html.erb b/app/views/report_mailer/sps_over_quota_limit.html.erb
similarity index 100%
rename from app/views/user_mailer/sps_over_quota_limit.html.erb
rename to app/views/report_mailer/sps_over_quota_limit.html.erb
diff --git a/app/views/user_mailer/deleted_user_accounts_report.html.erb b/app/views/user_mailer/deleted_user_accounts_report.html.erb
deleted file mode 100644
index 26567104a37..00000000000
--- a/app/views/user_mailer/deleted_user_accounts_report.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= t('user_mailer.deleted_accounts_report.name') %>: <%= @name %><br>
-<%= t('user_mailer.deleted_accounts_report.issuers') %>: <%= @issuers.join(',') %><br>
diff --git a/app/views/users/edit_phone/_make_default_number.html.erb b/app/views/users/edit_phone/_make_default_number.html.erb
index 0b68b2faf71..1f553071e31 100644
--- a/app/views/users/edit_phone/_make_default_number.html.erb
+++ b/app/views/users/edit_phone/_make_default_number.html.erb
@@ -1,16 +1,25 @@
 <div class="margin-bottom-4">
   <fieldset class="margin-0 padding-0 border-0">
     <legend class="margin-bottom-1">
-      <%= t('two_factor_authentication.otp_make_default_number.title') %>
+      <% if @edit_phone_form.one_phone_configured? %>
+        <%= t('two_factor_authentication.otp_make_default_number.one_number_title') %>
+      <% else %>
+        <%= t('two_factor_authentication.otp_make_default_number.title') %>
+      <% end %>
     </legend>
-    <p class="margin-top-0 margin-bottom-2" id="otp_make_default_number_instruction">
-      <%= t('two_factor_authentication.otp_make_default_number.instruction') %>
+    <p class="margin-top-0 margin-bottom-2">
+      <% if @edit_phone_form.one_phone_configured? %>
+        <%= t('two_factor_authentication.otp_make_default_number.one_number_instruction') %>
+      <% else %>
+        <%= t('two_factor_authentication.otp_make_default_number.instruction') %>
+      <% end %>
     </p>
     <%= check_box_tag(
           'edit_phone_form[make_default_number]',
           :otp_make_default_number,
           @edit_phone_form.default_phone_configuration?,
           class: 'usa-checkbox__input usa-checkbox__input--bordered',
+          disabled: @edit_phone_form.one_phone_configured?,
         ) %>
     <label
       class="usa-checkbox__label"
diff --git a/config/locales/report_mailer/en.yml b/config/locales/report_mailer/en.yml
new file mode 100644
index 00000000000..83c71f05bfa
--- /dev/null
+++ b/config/locales/report_mailer/en.yml
@@ -0,0 +1,11 @@
+---
+en:
+  report_mailer:
+    deleted_accounts_report:
+      issuers: Issuers
+      name: Name
+      subject: Deleted accounts report
+    sps_over_quota_limit:
+      help: ''
+      info: There are SPs that have gone over their quota limit.
+      subject: Some SPs have reached their quota limit
diff --git a/config/locales/report_mailer/es.yml b/config/locales/report_mailer/es.yml
new file mode 100644
index 00000000000..b968c7ad435
--- /dev/null
+++ b/config/locales/report_mailer/es.yml
@@ -0,0 +1,11 @@
+---
+es:
+  report_mailer:
+    deleted_accounts_report:
+      issuers: Emisores
+      name: Nombre
+      subject: Informe de cuentas eliminadas
+    sps_over_quota_limit:
+      help: ''
+      info: Hay SP que han superado su límite de cuota.
+      subject: Algunos SP han alcanzado su límite de cuota.
diff --git a/config/locales/report_mailer/fr.yml b/config/locales/report_mailer/fr.yml
new file mode 100644
index 00000000000..04ff53162af
--- /dev/null
+++ b/config/locales/report_mailer/fr.yml
@@ -0,0 +1,11 @@
+---
+fr:
+  report_mailer:
+    deleted_accounts_report:
+      issuers: Émetteurs
+      name: Nom
+      subject: Rapport sur les comptes supprimés
+    sps_over_quota_limit:
+      help: ''
+      info: Certains SP ont dépassé leur limite de quota.
+      subject: Certains SP ont atteint leur limite de quota
diff --git a/config/locales/two_factor_authentication/en.yml b/config/locales/two_factor_authentication/en.yml
index 73fa14a6e52..24a5d123f76 100644
--- a/config/locales/two_factor_authentication/en.yml
+++ b/config/locales/two_factor_authentication/en.yml
@@ -88,9 +88,12 @@ en:
       voice: Phone call
       voice_unsupported: We are unable to call phone numbers in %{location}.
     otp_make_default_number:
-      instruction: Please check the box below if you want this to be the default phone
-        number you receive text messages or phone calls.
+      instruction: Make this phone number the default number where you receive text
+        message or phone calls.
       label: Default phone number
+      one_number_instruction: You must have more than one phone number added to select
+        a default phone number.
+      one_number_title: This is your default number
       title: Make this your default phone number?
     personal_key_fallback:
       question: Don’t have your personal key?
diff --git a/config/locales/two_factor_authentication/es.yml b/config/locales/two_factor_authentication/es.yml
index 120bf3596c9..7ff3718ed30 100644
--- a/config/locales/two_factor_authentication/es.yml
+++ b/config/locales/two_factor_authentication/es.yml
@@ -95,10 +95,12 @@ es:
       voice: Llamada telefónica
       voice_unsupported: No podemos llamar a números de teléfono en %{location}.
     otp_make_default_number:
-      instruction: Marque la casilla a continuación si desea que este sea el teléfono
-        predeterminado número que recibe mensajes de texto o llamadas
-        telefónicas.
+      instruction: Establece este número de teléfono como predeterminado para que
+        recibas en él mensajes de texto o llamadas telefónicas.
       label: Número de teléfono predeterminado
+      one_number_instruction: Debes tener más de un número de teléfono agregado para
+        seleccionar un número de teléfono predeterminado.
+      one_number_title: Este es tu número predeterminado
       title: '¿Es este tu número de teléfono predeterminado?'
     personal_key_fallback:
       question: '¿No tiene su clave personal?'
diff --git a/config/locales/two_factor_authentication/fr.yml b/config/locales/two_factor_authentication/fr.yml
index ed826d49d4d..90486aacf94 100644
--- a/config/locales/two_factor_authentication/fr.yml
+++ b/config/locales/two_factor_authentication/fr.yml
@@ -99,10 +99,12 @@ fr:
       voice_unsupported: Il nous est impossible d’appeler des numéros de téléphone
         dans le %{location}.
     otp_make_default_number:
-      instruction: Veuillez cocher la case ci-dessous si vous voulez que ce soit le
-        téléphone par défaut. numéro que vous recevez des messages texte ou des
-        appels téléphoniques.
+      instruction: Faites de ce numéro de téléphone le numéro par défaut où vous
+        recevez des messages texte ou des appels téléphoniques.
       label: Numéro de téléphone par défaut
+      one_number_instruction: Vous devez avoir ajouté plus d’un numéro de téléphone
+        pour pouvoir sélectionner un numéro de téléphone par défaut.
+      one_number_title: Il s’agit de votre numéro par défaut
       title: Faites-en votre numéro de téléphone par défaut?
     personal_key_fallback:
       question: Vous n’avez pas votre clé personnelle?
diff --git a/config/locales/user_mailer/en.yml b/config/locales/user_mailer/en.yml
index a52e4c1bfae..270586b2ef7 100644
--- a/config/locales/user_mailer/en.yml
+++ b/config/locales/user_mailer/en.yml
@@ -56,10 +56,6 @@ en:
       link_text: Go to %{app_name}
       reset_password_html: If you can’t remember your password, go to %{app_name} to reset it.
     contact_link_text: contact us
-    deleted_accounts_report:
-      issuers: Issuers
-      name: Name
-      subject: Deleted accounts report
     doc_auth_link:
       message: You’ve requested to verify your identity on a desktop computer.  Please
         sign in to %{sp_link}
@@ -254,7 +250,3 @@ en:
         in with this email address, you can ignore this message.
       link_text: Go to %{app_name}
       reset_password_html: If you can’t remember your password, go to %{app_name} to reset it.
-    sps_over_quota_limit:
-      help: ''
-      info: There are SPs that have gone over their quota limit.
-      subject: Some SPs have reached their quota limit
diff --git a/config/locales/user_mailer/es.yml b/config/locales/user_mailer/es.yml
index 17e7c551856..76a2fc813a0 100644
--- a/config/locales/user_mailer/es.yml
+++ b/config/locales/user_mailer/es.yml
@@ -59,10 +59,6 @@ es:
       link_text: Ir a %{app_name}
       reset_password_html: Si no recuerda su contraseña, vaya a %{app_name} para restablecerla.
     contact_link_text: Contáctenos
-    deleted_accounts_report:
-      issuers: Emisores
-      name: Nombre
-      subject: Informe de cuentas eliminadas
     doc_auth_link:
       message: Ha solicitado verificar su identidad en una computadora de escritorio.
         Inicie sesión en %{sp_link}
@@ -266,7 +262,3 @@ es:
         una sesión con este email, puede ignorar este mensaje.
       link_text: Ir a %{app_name}
       reset_password_html: Si no recuerda su contraseña, vaya a %{app_name} para restablecerla.
-    sps_over_quota_limit:
-      help: ''
-      info: Hay SP que han superado su límite de cuota.
-      subject: Algunos SP han alcanzado su límite de cuota.
diff --git a/config/locales/user_mailer/fr.yml b/config/locales/user_mailer/fr.yml
index 43d23d50a34..332c52f5c9f 100644
--- a/config/locales/user_mailer/fr.yml
+++ b/config/locales/user_mailer/fr.yml
@@ -61,10 +61,6 @@ fr:
       reset_password_html: Si vous ne vous souvenez plus de votre mot de passe, allez
         à %{app_name} pour le réinitialiser.
     contact_link_text: communiquez avec nous
-    deleted_accounts_report:
-      issuers: Émetteurs
-      name: Nom
-      subject: Rapport sur les comptes supprimés
     doc_auth_link:
       message: Vous avez demandé à vérifier votre identité sur un ordinateur de
         bureau. Veuillez vous connecter à %{sp_link}
@@ -281,7 +277,3 @@ fr:
       link_text: Allez à %{app_name}
       reset_password_html: Si vous ne vous souvenez plus de votre mot de passe, allez
         à %{app_name} pour le réinitialiser.
-    sps_over_quota_limit:
-      help: ''
-      info: Certains SP ont dépassé leur limite de quota.
-      subject: Certains SP ont atteint leur limite de quota
diff --git a/spec/controllers/account_reset/pending_controller_spec.rb b/spec/controllers/account_reset/pending_controller_spec.rb
index d296969afb7..c0ebf384666 100644
--- a/spec/controllers/account_reset/pending_controller_spec.rb
+++ b/spec/controllers/account_reset/pending_controller_spec.rb
@@ -18,21 +18,13 @@
   end
 
   describe '#cancel' do
-    it 'cancels the account reset request' do
-      account_reset_request = AccountResetRequest.create(user: user, requested_at: 1.hour.ago)
-
-      post :cancel
-
-      expect(account_reset_request.reload.cancelled_at).to_not be_nil
-    end
-
-    it 'logs the cancellation in attempts api' do
+    it 'cancels the account reset request and logs the cancellation event' do
       stub_attempts_tracker
 
       account_reset_request = AccountResetRequest.create(user: user, requested_at: 1.hour.ago)
 
       expect(@irs_attempts_api_tracker).to receive(:track_event).
-        with(:account_reset_cancel_request, success: true)
+        with(:account_reset_cancel_request)
 
       post :cancel
 
diff --git a/spec/controllers/idv/forgot_password_controller_spec.rb b/spec/controllers/idv/forgot_password_controller_spec.rb
index e472730ff49..41f994ecd51 100644
--- a/spec/controllers/idv/forgot_password_controller_spec.rb
+++ b/spec/controllers/idv/forgot_password_controller_spec.rb
@@ -30,18 +30,16 @@
       stub_analytics
       stub_attempts_tracker
       allow(@analytics).to receive(:track_event)
-      allow(@irs_attempts_api_tracker).to receive(:track_event)
     end
 
-    it 'tracks analytics events' do
+    it 'tracks appropriate events' do
+      expect(@irs_attempts_api_tracker).to receive(:forgot_password_email_sent).with(
+        email: user.email,
+      )
+
       post :update
 
       expect(@analytics).to have_received(:track_event).with('IdV: forgot password confirmed')
-      expect(@irs_attempts_api_tracker).to have_received(:track_event).with(
-        :forgot_password_email_sent,
-        email: user.email,
-        success: true,
-      )
     end
   end
 end
diff --git a/spec/controllers/idv/gpo_controller_spec.rb b/spec/controllers/idv/gpo_controller_spec.rb
index 8d88b9b4933..69b6c04aad8 100644
--- a/spec/controllers/idv/gpo_controller_spec.rb
+++ b/spec/controllers/idv/gpo_controller_spec.rb
@@ -105,7 +105,7 @@
 
       it 'logs attempts api tracking' do
         expect(@irs_attempts_api_tracker).to receive(:idv_gpo_letter_requested).
-          with(success: true, resend: false)
+          with(resend: false)
 
         put :create
       end
@@ -132,7 +132,7 @@
 
       it 'logs attempts api tracking' do
         expect(@irs_attempts_api_tracker).to receive(:idv_gpo_letter_requested).
-          with(success: true, resend: true)
+          with(resend: true)
 
         put :create
       end
diff --git a/spec/controllers/idv/personal_key_controller_spec.rb b/spec/controllers/idv/personal_key_controller_spec.rb
index 83a666bf588..6aeafc66b1b 100644
--- a/spec/controllers/idv/personal_key_controller_spec.rb
+++ b/spec/controllers/idv/personal_key_controller_spec.rb
@@ -114,9 +114,7 @@ def index
 
     it 'logs when user generates personal key' do
       idv_session.personal_key = nil
-      expect(@irs_attempts_api_tracker).to receive(:idv_personal_key_generated).with(
-        success: true,
-      )
+      expect(@irs_attempts_api_tracker).to receive(:idv_personal_key_generated)
       get :show
     end
 
diff --git a/spec/controllers/users/backup_code_setup_controller_spec.rb b/spec/controllers/users/backup_code_setup_controller_spec.rb
index 585f7d56af3..9c1b6be6b8a 100644
--- a/spec/controllers/users/backup_code_setup_controller_spec.rb
+++ b/spec/controllers/users/backup_code_setup_controller_spec.rb
@@ -2,11 +2,12 @@
 
 describe Users::BackupCodeSetupController do
   it 'creates backup codes and logs expected events' do
-    user = build(:user, :signed_up)
+    user = create(:user, :signed_up)
     stub_sign_in(user)
-    stub_analytics
+    analytics = stub_analytics
     stub_attempts_tracker
 
+    Funnel::Registration::AddMfa.call(user.id, 'phone', analytics)
     expect(PushNotification::HttpPush).to receive(:deliver).
       with(PushNotification::RecoveryInformationChangedEvent.new(user: user))
     expect(@analytics).to receive(:track_event).
diff --git a/spec/controllers/users/reset_passwords_controller_spec.rb b/spec/controllers/users/reset_passwords_controller_spec.rb
index ec678220a08..93255438def 100644
--- a/spec/controllers/users/reset_passwords_controller_spec.rb
+++ b/spec/controllers/users/reset_passwords_controller_spec.rb
@@ -403,7 +403,8 @@
 
     context 'user exists' do
       let(:email) { 'test@example.com' }
-      let!(:user) { create(:user, :signed_up, email: email) }
+      let(:email_param) { { email: email } }
+      let!(:user) { create(:user, :signed_up, **email_param) }
       let(:analytics_hash) do
         {
           success: true,
@@ -422,12 +423,11 @@
 
       it 'sends password reset email to user and tracks event' do
         expect(@irs_attempts_api_tracker).to receive(:forgot_password_email_sent).with(
-          email: email,
-          success: true,
+          **email_param,
         )
 
         expect do
-          put :create, params: { password_reset_email_form: { email: email } }
+          put :create, params: { password_reset_email_form: email_param }
         end.to change { ActionMailer::Base.deliveries.count }.by(1)
 
         expect(@analytics).to have_received(:track_event).
@@ -464,7 +464,6 @@
       it 'sends password reset email to user and tracks event' do
         expect(@irs_attempts_api_tracker).to receive(:forgot_password_email_sent).with(
           email: user.email,
-          success: true,
         )
 
         expect { put :create, params: params }.
@@ -499,7 +498,6 @@
           with('Password Reset: Email Submitted', analytics_hash)
         expect(@irs_attempts_api_tracker).to receive(:forgot_password_email_sent).with(
           email: user.email,
-          success: true,
         )
 
         params = { password_reset_email_form: { email: user.email } }
diff --git a/spec/controllers/users/webauthn_setup_controller_spec.rb b/spec/controllers/users/webauthn_setup_controller_spec.rb
index c5b85d9ef3a..388d6d53b6c 100644
--- a/spec/controllers/users/webauthn_setup_controller_spec.rb
+++ b/spec/controllers/users/webauthn_setup_controller_spec.rb
@@ -76,6 +76,7 @@
       end
 
       it 'tracks the submission' do
+        Funnel::Registration::AddMfa.call(user.id, 'phone', @analytics)
         result = {
           enabled_mfa_methods_count: 3,
           mfa_method_counts: {
@@ -196,6 +197,7 @@
           }
         end
         it 'should log expected events' do
+          Funnel::Registration::AddMfa.call(user.id, 'phone', @analytics)
           expect(@analytics).to receive(:track_event).with(
             'Multi-Factor Authentication Setup',
             {
@@ -277,10 +279,7 @@
             :mfa_enroll_webauthn_platform, success: true
           )
 
-          registration_log = Funnel::Registration::Create.call(user.id)
           patch :confirm, params: params
-
-          expect(registration_log.reload.first_mfa).to eq 'webauthn_platform'
         end
       end
 
diff --git a/spec/features/idv/analytics_spec.rb b/spec/features/idv/analytics_spec.rb
index a3de7c77b89..59f6413ab7d 100644
--- a/spec/features/idv/analytics_spec.rb
+++ b/spec/features/idv/analytics_spec.rb
@@ -24,16 +24,18 @@
       'IdV: doc auth image upload form submitted' => { success: true, errors: {}, attempts: nil, remaining_attempts: 3, user_id: nil, flow_path: 'standard' },
       'IdV: doc auth image upload vendor pii validation' => { success: true, errors: {}, user_id: nil, remaining_attempts: 3, flow_path: 'standard' },
       'IdV: doc auth verify_document_status submitted' => { success: true, errors: {}, remaining_attempts: 3, flow_path: 'standard', step: 'verify_document_status', step_count: 1 },
-      'IdV: doc auth document_capture submitted' => { success: false, errors: { front_image: ['Please fill in this field.'], back_image: ['Please fill in this field.'] }, is_fallback_link: false, error_details: { front_image: [:blank], back_image: [:blank] }, flow_path: 'standard', step: 'document_capture', step_count: 1 },
+      'IdV: doc auth document_capture submitted' => { success: true, errors: {}, flow_path: 'standard', step: 'document_capture', step_count: 1 },
       'IdV: doc auth ssn visited' => { flow_path: 'standard', step: 'ssn', step_count: 1 },
       'IdV: doc auth ssn submitted' => { success: true, errors: {}, flow_path: 'standard', step: 'ssn', step_count: 1 },
       'IdV: doc auth verify visited' => { flow_path: 'standard', step: 'verify', step_count: 1 },
       'IdV: doc auth verify submitted' => { success: true, errors: {}, flow_path: 'standard', step: 'verify', step_count: 1 },
       'IdV: doc auth verify_wait visited' => { flow_path: 'standard', step: 'verify_wait', step_count: 1 },
-      'IdV: doc auth optional verify_wait submitted' => { success: true, errors: {}, address_edited: false, proofing_results: { exception: nil, transaction_id: 'resolution-mock-transaction-id-123', reference: 'aaa-bbb-ccc', timed_out: false, context: { should_proof_state_id: true, stages: { resolution: { client: 'ResolutionMock', errors: {}, exception: nil, success: true, timed_out: false, transaction_id: 'resolution-mock-transaction-id-123', reference: 'aaa-bbb-ccc' }, state_id: { client: 'StateIdMock', errors: {}, success: true, timed_out: false, exception: nil, transaction_id: 'state-id-mock-transaction-id-456', state: 'MT', state_id_jurisdiction: 'ND' } } } }, ssn_is_unique: true, step: 'verify_wait_step_show' },
+      'IdV: doc auth optional verify_wait submitted' => { success: true, errors: {}, address_edited: false, proofing_results: { exception: nil, timed_out: false, context: { should_proof_state_id: true, stages: { resolution: { vendor_name: 'ResolutionMock', errors: {}, exception: nil, success: true, timed_out: false, transaction_id: 'resolution-mock-transaction-id-123', reference: 'aaa-bbb-ccc', can_pass_with_additional_verification: false, attributes_requiring_additional_verification: [] }, state_id: { vendor_name: 'StateIdMock', errors: {}, success: true, timed_out: false, exception: nil, transaction_id: 'state-id-mock-transaction-id-456', verified_attributes: [], state: 'MT', state_id_jurisdiction: 'ND' } } } }, ssn_is_unique: true, step: 'verify_wait_step_show' },
       'IdV: phone of record visited' => {},
       'IdV: phone confirmation form' => { success: true, errors: {}, phone_type: :mobile, types: [:fixed_or_mobile], carrier: 'Test Mobile Carrier', country_code: 'US', area_code: '202' },
       'IdV: phone confirmation vendor' => { success: true, errors: {}, vendor: { exception: nil, vendor_name: 'AddressMock', transaction_id: 'address-mock-transaction-id-123', timed_out: false, reference: '' }, new_phone_added: false },
+      'IdV: review info visited' => {},
+      'IdV: review complete' => { success: true },
       'IdV: final resolution' => { success: true },
       'IdV: personal key visited' => {},
       'IdV: personal key submitted' => {},
@@ -57,15 +59,23 @@
       'IdV: doc auth image upload form submitted' => { success: true, errors: {}, attempts: nil, remaining_attempts: 3, user_id: nil, flow_path: 'standard' },
       'IdV: doc auth image upload vendor pii validation' => { success: true, errors: {}, user_id: nil, remaining_attempts: 3, flow_path: 'standard' },
       'IdV: doc auth verify_document_status submitted' => { success: true, errors: {}, remaining_attempts: 3, flow_path: 'standard', step: 'verify_document_status', step_count: 1 },
-      'IdV: doc auth document_capture submitted' => { success: false, errors: { front_image: ['Please fill in this field.'], back_image: ['Please fill in this field.'] }, is_fallback_link: false, error_details: { front_image: [:blank], back_image: [:blank] }, flow_path: 'standard', step: 'document_capture', step_count: 1 },
+      'IdV: doc auth document_capture submitted' => { success: true, errors: {}, flow_path: 'standard', step: 'document_capture', step_count: 1 },
       'IdV: doc auth ssn visited' => { flow_path: 'standard', step: 'ssn', step_count: 1 },
       'IdV: doc auth ssn submitted' => { success: true, errors: {}, flow_path: 'standard', step: 'ssn', step_count: 1 },
       'IdV: doc auth verify visited' => { flow_path: 'standard', step: 'verify', step_count: 1 },
       'IdV: doc auth verify submitted' => { success: true, errors: {}, flow_path: 'standard', step: 'verify', step_count: 1 },
       'IdV: doc auth verify_wait visited' => { flow_path: 'standard', step: 'verify_wait', step_count: 1 },
-      'IdV: doc auth optional verify_wait submitted' => { success: true, errors: {}, address_edited: false, proofing_results: { exception: nil, transaction_id: 'resolution-mock-transaction-id-123', reference: 'aaa-bbb-ccc', timed_out: false, context: { should_proof_state_id: true, stages: { resolution: { client: 'ResolutionMock', errors: {}, exception: nil, success: true, timed_out: false, transaction_id: 'resolution-mock-transaction-id-123', reference: 'aaa-bbb-ccc' }, state_id: { client: 'StateIdMock', errors: {}, success: true, timed_out: false, exception: nil, transaction_id: 'state-id-mock-transaction-id-456', state: 'MT', state_id_jurisdiction: 'ND' } } } }, ssn_is_unique: true, step: 'verify_wait_step_show' },
+      'IdV: doc auth optional verify_wait submitted' => { success: true, errors: {}, address_edited: false, proofing_results: { exception: nil, timed_out: false, context: { should_proof_state_id: true, stages: { resolution: { vendor_name: 'ResolutionMock', errors: {}, exception: nil, success: true, timed_out: false, transaction_id: 'resolution-mock-transaction-id-123', reference: 'aaa-bbb-ccc', can_pass_with_additional_verification: false, attributes_requiring_additional_verification: [] }, state_id: { vendor_name: 'StateIdMock', errors: {}, success: true, timed_out: false, exception: nil, transaction_id: 'state-id-mock-transaction-id-456', verified_attributes: [], state: 'MT', state_id_jurisdiction: 'ND' } } } }, ssn_is_unique: true, step: 'verify_wait_step_show' },
       'IdV: phone of record visited' => {},
-      'IdV: USPS address letter requested' => { enqueued_at: Time.zone.now },
+      'IdV: USPS address letter requested' => { resend: false },
+      'IdV: review info visited' => {},
+      'IdV: USPS address letter enqueued' => { enqueued_at: Time.zone.now, resend: false },
+      'IdV: review complete' => { success: true },
+      'IdV: final resolution' => { success: true },
+      'IdV: personal key visited' => {},
+      'Frontend: IdV: show personal key modal' => {},
+      'IdV: personal key submitted' => {},
+      'IdV: come back later visited' => {},
     }
   end
   let(:in_person_path_events) do
@@ -145,8 +155,8 @@
     end
 
     it 'records all of the events' do
-      happy_path_events.each do |event, _attributes|
-        expect(fake_analytics).to have_logged_event(event)
+      happy_path_events.each do |event, attributes|
+        expect(fake_analytics).to have_logged_event(event, attributes)
       end
     end
   end
@@ -163,11 +173,13 @@
       complete_verify_step
       enter_gpo_flow
       gpo_step
+      complete_review_step(user)
+      acknowledge_and_confirm_personal_key
     end
 
     it 'records all of the events' do
-      gpo_path_events.each do |event, _attributes|
-        expect(fake_analytics).to have_logged_event(event)
+      gpo_path_events.each do |event, attributes|
+        expect(fake_analytics).to have_logged_event(event, attributes)
       end
     end
   end
diff --git a/spec/features/phone/default_phone_selection_spec.rb b/spec/features/phone/default_phone_selection_spec.rb
index 575317f9b13..0061da6534a 100644
--- a/spec/features/phone/default_phone_selection_spec.rb
+++ b/spec/features/phone/default_phone_selection_spec.rb
@@ -20,6 +20,11 @@
           expiration: TwoFactorAuthenticatable::DIRECT_OTP_VALID_FOR_MINUTES,
         )
       end
+
+      it 'does not indicate that it is the default number on the account page ' do
+        sign_in_before_2fa(user)
+        expect(page).not_to have_content t('account.index.default')
+      end
     end
 
     context 'when the user creates a new default phone number' do
diff --git a/spec/features/phone/edit_phone_spec.rb b/spec/features/phone/edit_phone_spec.rb
index 80e30d9cd26..d5fdc9ec499 100644
--- a/spec/features/phone/edit_phone_spec.rb
+++ b/spec/features/phone/edit_phone_spec.rb
@@ -20,4 +20,18 @@
 
     expect(page).to have_content('The page you were looking for doesn’t exist')
   end
+
+  context 'with only one phone number' do
+    it 'does not allow you to check default phone number if only one number is set up' do
+      user = create(:user, :signed_up)
+      phone_configuration = user.phone_configurations.first
+      sign_in_and_2fa_user(user)
+
+      visit(manage_phone_path(id: phone_configuration.id))
+      expect(page).to have_field(
+        t('two_factor_authentication.otp_make_default_number.label'),
+        disabled: true,
+      )
+    end
+  end
 end
diff --git a/spec/features/visitors/sign_up_with_email_spec.rb b/spec/features/visitors/sign_up_with_email_spec.rb
index 02a9f046ac0..c15a8108f45 100644
--- a/spec/features/visitors/sign_up_with_email_spec.rb
+++ b/spec/features/visitors/sign_up_with_email_spec.rb
@@ -8,7 +8,6 @@
     expect(page).to have_content t('notices.signed_up_but_unconfirmed.first_paragraph_start')
     expect(page).to have_content t('notices.signed_up_but_unconfirmed.first_paragraph_end')
     expect(page).to have_content email
-    expect(Funnel::Registration::TotalSubmittedCount.call).to eq(1)
     expect(Funnel::Registration::TotalRegisteredCount.call).to eq(0)
   end
 
@@ -54,7 +53,6 @@
     visit sign_up_email_path
     sign_up_and_2fa_ial1_user
 
-    expect(Funnel::Registration::TotalSubmittedCount.call).to eq(1)
     expect(Funnel::Registration::TotalRegisteredCount.call).to eq(1)
     expect(current_path).to eq account_path
   end
diff --git a/spec/forms/edit_phone_form_spec.rb b/spec/forms/edit_phone_form_spec.rb
index 156d94eec04..6cf09f75093 100644
--- a/spec/forms/edit_phone_form_spec.rb
+++ b/spec/forms/edit_phone_form_spec.rb
@@ -11,7 +11,7 @@
     }
   end
 
-  subject { described_class.new(user, phone_configuration) }
+  subject { EditPhoneForm.new(user, phone_configuration) }
 
   describe '#submit' do
     context 'when delivery_preference is not voice or sms' do
@@ -107,4 +107,25 @@
       end
     end
   end
+
+  describe '#one_phone_configured?' do
+    context 'when editing a form with only one number set up' do
+      let(:user) { create(:user, :signed_up) }
+      let(:phone_configuration) { user.phone_configurations.first }
+
+      it 'recognizes it as the only method set up' do
+        expect(subject.one_phone_configured?).to eq(true)
+      end
+    end
+
+    context 'when editing a form with multiple numbers set up' do
+      before do
+        create(:phone_configuration, user: user, made_default_at: Time.zone.now)
+      end
+
+      it 'recognizes that there are multiple phone methods set up' do
+        expect(user.phone_configurations.count).to eq(2)
+      end
+    end
+  end
 end
diff --git a/spec/jobs/reports/deleted_user_accounts_report_spec.rb b/spec/jobs/reports/deleted_user_accounts_report_spec.rb
index cd8099a2ef8..c7457c8555e 100644
--- a/spec/jobs/reports/deleted_user_accounts_report_spec.rb
+++ b/spec/jobs/reports/deleted_user_accounts_report_spec.rb
@@ -11,7 +11,7 @@
   subject { described_class.new }
 
   it 'is does not send out an email with nothing configured' do
-    expect(UserMailer).to_not receive(:deleted_user_accounts_report)
+    expect(ReportMailer).to_not receive(:deleted_user_accounts_report)
 
     subject.perform(Time.zone.today)
   end
@@ -29,10 +29,10 @@
     allow(IdentityConfig.store).to receive(:deleted_user_accounts_report_configs).and_return(
       [{ 'name' => name, 'issuers' => [issuer], 'emails' => [email] }],
     )
-    allow(UserMailer).to receive(:deleted_user_accounts_report).and_call_original
+    allow(ReportMailer).to receive(:deleted_user_accounts_report).and_call_original
 
     report = "#{last_authenticated_at},#{uuid}\r\n"
-    expect(UserMailer).to receive(:deleted_user_accounts_report).with(
+    expect(ReportMailer).to receive(:deleted_user_accounts_report).with(
       email: email, name: name, issuers: [issuer], data: report,
     )
 
diff --git a/spec/jobs/reports/query_helpers_spec.rb b/spec/jobs/reports/query_helpers_spec.rb
index 14d57d7cca3..178a0d6c939 100644
--- a/spec/jobs/reports/query_helpers_spec.rb
+++ b/spec/jobs/reports/query_helpers_spec.rb
@@ -17,25 +17,4 @@
       expect(quote([1, 2, 3])).to eq('(1, 2, 3)')
     end
   end
-
-  describe '#stream_query' do
-    let!(:users) do
-      3.times.map { create(:user) }
-    end
-
-    it 'streams responses to a block' do
-      query = <<-SQL
-        SELECT id
-        FROM users
-      SQL
-
-      ids = []
-
-      stream_query(query) do |row|
-        ids << row['id']
-      end
-
-      expect(ids).to match_array(users.map(&:id))
-    end
-  end
 end
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index 6717486e9d1..702974eb2a7 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -107,19 +107,6 @@ def add_email_associated_with_another_account
     UserMailer.add_email_associated_with_another_account(email_address)
   end
 
-  def sps_over_quota_limit
-    UserMailer.sps_over_quota_limit(email_address)
-  end
-
-  def deleted_user_accounts_report
-    UserMailer.deleted_user_accounts_report(
-      email: email_address,
-      name: 'my name',
-      issuers: %w[issuer1 issuer2],
-      data: 'data',
-    )
-  end
-
   def account_verified
     UserMailer.account_verified(
       user,
diff --git a/spec/mailers/report_mailer_spec.rb b/spec/mailers/report_mailer_spec.rb
new file mode 100644
index 00000000000..7d437fd327f
--- /dev/null
+++ b/spec/mailers/report_mailer_spec.rb
@@ -0,0 +1,56 @@
+require 'rails_helper'
+
+describe ReportMailer, type: :mailer do
+  let(:user) { build(:user) }
+  let(:email_address) { user.email_addresses.first }
+
+  describe '#sps_over_quota_limit' do
+    let(:mail) { ReportMailer.sps_over_quota_limit(email_address.email) }
+
+    it_behaves_like 'a system email'
+
+    it 'sends to the current email' do
+      expect(mail.to).to eq [email_address.email]
+    end
+
+    it 'renders the subject' do
+      expect(mail.subject).to eq t('report_mailer.sps_over_quota_limit.subject')
+    end
+
+    it 'renders the body' do
+      expect(mail.html_part.body).
+        to have_content(strip_tags(t('report_mailer.sps_over_quota_limit.info')))
+    end
+  end
+
+  describe 'deleted_user_accounts_report' do
+    let(:mail) do
+      ReportMailer.deleted_user_accounts_report(
+        email: email_address.email,
+        name: 'my name',
+        issuers: %w[issuer1 issuer2],
+        data: 'data',
+      )
+    end
+
+    it_behaves_like 'a system email'
+
+    it 'sends to the current email' do
+      expect(mail.to).to eq [email_address.email]
+    end
+
+    it 'renders the subject' do
+      expect(mail.subject).to eq t('report_mailer.deleted_accounts_report.subject')
+    end
+
+    it 'renders the body' do
+      expect(mail.html_part.body).to have_content('my name')
+      expect(mail.html_part.body).to have_content('issuer1')
+      expect(mail.html_part.body).to have_content('issuer2')
+    end
+  end
+
+  def strip_tags(str)
+    ActionController::Base.helpers.strip_tags(str)
+  end
+end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 01f264015bf..9db9a85694b 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -433,52 +433,6 @@ def expect_email_body_to_have_help_and_contact_links
     end
   end
 
-  describe '#sps_over_quota_limit' do
-    let(:mail) { UserMailer.sps_over_quota_limit(email_address.email) }
-
-    it_behaves_like 'a system email'
-
-    it 'sends to the current email' do
-      expect(mail.to).to eq [email_address.email]
-    end
-
-    it 'renders the subject' do
-      expect(mail.subject).to eq t('user_mailer.sps_over_quota_limit.subject')
-    end
-
-    it 'renders the body' do
-      expect(mail.html_part.body).
-        to have_content(strip_tags(t('user_mailer.sps_over_quota_limit.info')))
-    end
-  end
-
-  describe 'deleted_user_accounts_report' do
-    let(:mail) do
-      UserMailer.deleted_user_accounts_report(
-        email: email_address.email,
-        name: 'my name',
-        issuers: %w[issuer1 issuer2],
-        data: 'data',
-      )
-    end
-
-    it_behaves_like 'a system email'
-
-    it 'sends to the current email' do
-      expect(mail.to).to eq [email_address.email]
-    end
-
-    it 'renders the subject' do
-      expect(mail.subject).to eq t('user_mailer.deleted_accounts_report.subject')
-    end
-
-    it 'renders the body' do
-      expect(mail.html_part.body).to have_content('my name')
-      expect(mail.html_part.body).to have_content('issuer1')
-      expect(mail.html_part.body).to have_content('issuer2')
-    end
-  end
-
   describe '#account_verified' do
     disavowal_token = 'i_am_disavowal_token'
     let(:sp_name) { '' }
diff --git a/spec/services/funnel/registration/add_mfa_spec.rb b/spec/services/funnel/registration/add_mfa_spec.rb
index 375a3a596c0..4bdd14b5331 100644
--- a/spec/services/funnel/registration/add_mfa_spec.rb
+++ b/spec/services/funnel/registration/add_mfa_spec.rb
@@ -6,34 +6,17 @@
 
   let(:user_id) do
     user = create(:user)
-    user_id = user.id
-    Funnel::Registration::Create.call(user_id)
-    user_id
+    user.id
   end
   let(:funnel) { RegistrationLog.all.first }
 
-  it 'adds an 1st mfa' do
-    subject.call(user_id, 'phone', analytics)
-
-    expect(funnel.first_mfa).to eq('phone')
-    expect(funnel.first_mfa_at).to be_present
-  end
-
-  it 'adds a 2nd mfa' do
-    subject.call(user_id, 'phone', analytics)
-    subject.call(user_id, 'backup_codes', analytics)
-
-    expect(funnel.first_mfa).to eq('phone')
-    expect(funnel.first_mfa_at).to be_present
-    expect(funnel.second_mfa).to eq('backup_codes')
+  it 'shows user is not fully registered with no mfa' do
+    expect(funnel&.registered_at).to_not be_present
   end
 
-  it 'does not add a 3rd mfa' do
+  it 'shows user is fully registered after adding an mfa' do
     subject.call(user_id, 'phone', analytics)
-    subject.call(user_id, 'backup_codes', analytics)
-    subject.call(user_id, 'auth_app', analytics)
 
-    expect(funnel.first_mfa).to eq('phone')
-    expect(funnel.second_mfa).to eq('backup_codes')
+    expect(funnel.registered_at).to be_present
   end
 end
diff --git a/spec/services/funnel/registration/add_password_spec.rb b/spec/services/funnel/registration/add_password_spec.rb
deleted file mode 100644
index 77ce021ef13..00000000000
--- a/spec/services/funnel/registration/add_password_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'rails_helper'
-
-describe Funnel::Registration::AddPassword do
-  subject { described_class }
-
-  it 'sets the password_at' do
-    user = create(:user)
-    user_id = user.id
-    Funnel::Registration::Create.call(user_id)
-
-    expect(funnel.password_at).to be_nil
-
-    subject.call(user_id)
-    expect(funnel.password_at).to be_present
-  end
-
-  def funnel
-    RegistrationLog.all.first
-  end
-end
diff --git a/spec/services/funnel/registration/confirm_email_spec.rb b/spec/services/funnel/registration/confirm_email_spec.rb
deleted file mode 100644
index 4ec5a4aa3f6..00000000000
--- a/spec/services/funnel/registration/confirm_email_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'rails_helper'
-
-describe Funnel::Registration::ConfirmEmail do
-  subject { described_class }
-
-  it 'sets the confirmed_at' do
-    user = create(:user)
-    user_id = user.id
-    Funnel::Registration::Create.call(user_id)
-
-    expect(funnel.confirmed_at).to be_nil
-
-    subject.call(user_id)
-    expect(funnel.confirmed_at).to be_present
-  end
-
-  def funnel
-    RegistrationLog.all.first
-  end
-end
diff --git a/spec/services/funnel/registration/range_registered_count_spec.rb b/spec/services/funnel/registration/range_registered_count_spec.rb
index 259f473a8ed..271fb357b69 100644
--- a/spec/services/funnel/registration/range_registered_count_spec.rb
+++ b/spec/services/funnel/registration/range_registered_count_spec.rb
@@ -52,8 +52,6 @@ def register_user(year, month, day)
     travel_to Date.new(year, month, day) do
       user = create(:user)
       user_id = user.id
-      Funnel::Registration::Create.call(user_id)
-      Funnel::Registration::AddPassword.call(user_id)
       Funnel::Registration::AddMfa.call(user_id, 'backup_codes', analytics)
     end
   end
diff --git a/spec/services/funnel/registration/range_submitted_count_spec.rb b/spec/services/funnel/registration/range_submitted_count_spec.rb
deleted file mode 100644
index 44b25fa2309..00000000000
--- a/spec/services/funnel/registration/range_submitted_count_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'rails_helper'
-
-describe Funnel::Registration::RangeSubmittedCount do
-  subject { described_class }
-
-  let(:start) { '2019-01-01 00:00:00' }
-  let(:finish) { '2019-12-31 23:59:50' }
-
-  it 'returns 0 when there are no records' do
-    expect(subject.call(start, finish)).to eq(0)
-  end
-
-  it 'returns 1 when the record is mid range' do
-    submit_user(2019, 6, 1)
-
-    expect(subject.call(start, finish)).to eq(1)
-  end
-
-  it 'returns 1 when the record is in same month is upper range' do
-    submit_user(2019, 12, 30)
-
-    expect(subject.call(start, finish)).to eq(1)
-  end
-
-  it 'returns 1 when the record is in same month is lower range' do
-    submit_user(2019, 1, 2)
-
-    expect(subject.call(start, finish)).to eq(1)
-  end
-
-  it 'returns 0 when the record is lower than lower range' do
-    submit_user(2018, 12, 31)
-
-    expect(subject.call(start, finish)).to eq(0)
-  end
-
-  it 'returns 0 when the record is higher than higher range' do
-    submit_user(2020, 1, 2)
-
-    expect(subject.call(start, finish)).to eq(0)
-  end
-
-  it 'returns 2 when 2 records are in range' do
-    submit_user(2019, 1, 2)
-    submit_user(2019, 12, 30)
-
-    expect(subject.call(start, finish)).to eq(2)
-  end
-
-  def submit_user(year, month, day)
-    travel_to Date.new(year, month, day) do
-      user = create(:user)
-      user_id = user.id
-      Funnel::Registration::Create.call(user_id)
-    end
-  end
-end
diff --git a/spec/services/funnel/registration/total_registered_count_spec.rb b/spec/services/funnel/registration/total_registered_count_spec.rb
index 03641f68a88..89c8e13578b 100644
--- a/spec/services/funnel/registration/total_registered_count_spec.rb
+++ b/spec/services/funnel/registration/total_registered_count_spec.rb
@@ -11,12 +11,8 @@
   it 'returns 0 until the user is fully registered' do
     user = create(:user)
     user_id = user.id
-    Funnel::Registration::Create.call(user_id)
-
     expect(Funnel::Registration::TotalRegisteredCount.call).to eq(0)
 
-    Funnel::Registration::AddPassword.call(user_id)
-
     expect(Funnel::Registration::TotalRegisteredCount.call).to eq(0)
 
     Funnel::Registration::AddMfa.call(user_id, 'phone', analytics)
@@ -40,8 +36,6 @@
   def register_user
     user = create(:user)
     user_id = user.id
-    Funnel::Registration::Create.call(user_id)
-    Funnel::Registration::AddPassword.call(user_id)
     Funnel::Registration::AddMfa.call(user_id, 'backup_codes', analytics)
   end
 end
diff --git a/spec/services/funnel/registration/total_submitted_count_spec.rb b/spec/services/funnel/registration/total_submitted_count_spec.rb
deleted file mode 100644
index 43f750d1567..00000000000
--- a/spec/services/funnel/registration/total_submitted_count_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'rails_helper'
-
-describe Funnel::Registration::TotalSubmittedCount do
-  subject { described_class }
-
-  it 'returns 0' do
-    expect(subject.call).to eq(0)
-  end
-
-  it 'returns 1' do
-    user = create(:user)
-    Funnel::Registration::Create.call(user.id)
-
-    expect(subject.call).to eq(1)
-  end
-
-  it 'returns 2' do
-    Funnel::Registration::Create.call(create(:user).id)
-    Funnel::Registration::Create.call(create(:user).id)
-
-    expect(subject.call).to eq(2)
-  end
-end
diff --git a/spec/services/idv/steps/ssn_step_spec.rb b/spec/services/idv/steps/ssn_step_spec.rb
index 56f440d3de6..91f07ae521a 100644
--- a/spec/services/idv/steps/ssn_step_spec.rb
+++ b/spec/services/idv/steps/ssn_step_spec.rb
@@ -66,7 +66,6 @@
 
       it 'logs attempts api event' do
         expect(attempts_api).to receive(:idv_ssn_submitted).with(
-          success: true,
           ssn: ssn,
         )
         step.call
diff --git a/spec/services/request_password_reset_spec.rb b/spec/services/request_password_reset_spec.rb
index 6bf0ded0f38..4037bb41bed 100644
--- a/spec/services/request_password_reset_spec.rb
+++ b/spec/services/request_password_reset_spec.rb
@@ -39,7 +39,6 @@
         ).perform
         user = User.find_with_email(email)
         expect(user).to be_present
-        expect(RegistrationLog.first.user_id).to eq(user.id)
       end
     end
 
@@ -75,10 +74,10 @@
         subject
       end
 
-      it 'calls irs tracking method forgot_password_email_sent ' do
+      it 'calls irs tracking method forgot_password_email_sent' do
         subject
 
-        expect(irs_attempts_api_tracker).to have_received(:forgot_password_email_sent)
+        expect(irs_attempts_api_tracker).to have_received(:forgot_password_email_sent).once
       end
     end
 
@@ -142,22 +141,24 @@
     end
 
     context 'when two users have the same email address' do
-      let(:email) { 'aaa@test.com' }
+      let(:email_param) { { email: 'aaa@test.com' } }
 
       before do
-        @user_unconfirmed = create(:user, email: email, confirmed_at: nil)
-        @user_confirmed = create(:user, email: email, confirmed_at: Time.zone.now)
+        @user_unconfirmed = create(:user, **email_param, confirmed_at: nil)
+        @user_confirmed = create(:user, **email_param, confirmed_at: Time.zone.now)
       end
 
       it 'always finds the user with the confirmed email address' do
         form = RequestPasswordReset.new(
-          email: email,
+          **email_param,
           irs_attempts_api_tracker: irs_attempts_api_tracker,
         )
         form.perform
 
         expect(form.send(:user)).to eq(@user_confirmed)
-        expect(irs_attempts_api_tracker).to have_received(:forgot_password_email_sent)
+        expect(irs_attempts_api_tracker).to have_received(:forgot_password_email_sent).with(
+          email_param,
+        )
       end
     end
 
diff --git a/spec/services/service_provider_quota_limit/notify_if_any_sp_over_quota_limit_spec.rb b/spec/services/service_provider_quota_limit/notify_if_any_sp_over_quota_limit_spec.rb
index cc7837e4477..ee0ed0462bf 100644
--- a/spec/services/service_provider_quota_limit/notify_if_any_sp_over_quota_limit_spec.rb
+++ b/spec/services/service_provider_quota_limit/notify_if_any_sp_over_quota_limit_spec.rb
@@ -11,7 +11,7 @@
     end
 
     it 'notifies the emails in the email list' do
-      expect(UserMailer).to receive(:sps_over_quota_limit).with(email).and_call_original
+      expect(ReportMailer).to receive(:sps_over_quota_limit).with(email).and_call_original
 
       subject.call
     end
@@ -23,7 +23,7 @@
     end
 
     it 'does not notify the emails in the email list' do
-      expect(UserMailer).to_not receive(:sps_over_quota_limit).with(email).and_call_original
+      expect(ReportMailer).to_not receive(:sps_over_quota_limit).with(email).and_call_original
 
       subject.call
     end
diff --git a/spec/support/features/session_helper.rb b/spec/support/features/session_helper.rb
index 6adb25c976a..d98d38b7a89 100644
--- a/spec/support/features/session_helper.rb
+++ b/spec/support/features/session_helper.rb
@@ -129,7 +129,6 @@ def fill_in_password_and_submit(password)
 
     def sign_up
       user = create(:user, :unconfirmed)
-      Funnel::Registration::Create.call(user.id)
       confirm_last_user
       user
     end