diff --git a/app/models/validations/financial_validations.rb b/app/models/validations/financial_validations.rb
index 761886cfa..45befd9ad 100644
--- a/app/models/validations/financial_validations.rb
+++ b/app/models/validations/financial_validations.rb
@@ -53,17 +53,17 @@ module Validations::FinancialValidations
   def validate_tshortfall(record)
     return unless record.startdate
 
-    if record.collection_start_year <= 2021
-      cannot_have_outstanding_amount = record.has_hbrentshortfall? &&
-        (record.benefits_unknown? ||
-          record.receives_no_benefits? ||
-          record.receives_universal_credit_but_no_housing_benefit?)
-    else
-      cannot_have_outstanding_amount = record.has_hbrentshortfall? &&
-        (record.benefits_unknown? ||
-          record.receives_no_benefits? ||
-          record.tenant_refuses_to_say_benefits?)
-    end
+    cannot_have_outstanding_amount = if record.collection_start_year <= 2021
+                                       record.has_hbrentshortfall? &&
+                                         (record.benefits_unknown? ||
+                                           record.receives_no_benefits? ||
+                                           record.receives_universal_credit_but_no_housing_benefit?)
+                                     else
+                                       record.has_hbrentshortfall? &&
+                                         (record.benefits_unknown? ||
+                                           record.receives_no_benefits? ||
+                                           record.tenant_refuses_to_say_benefits?)
+                                     end
 
     if cannot_have_outstanding_amount
       record.errors.add :tshortfall, I18n.t("validations.financial.hbrentshortfall.outstanding_no_benefits")
diff --git a/db/migrate/20220613123730_add_export_fields.rb b/db/migrate/20220613123730_add_export_fields.rb
index e1157f186..eb2a03f84 100644
--- a/db/migrate/20220613123730_add_export_fields.rb
+++ b/db/migrate/20220613123730_add_export_fields.rb
@@ -7,7 +7,7 @@ class AddExportFields < ActiveRecord::Migration[7.0]
       t.rename :tenant_code, :tenancycode
       t.rename :previous_postcode_known, :ppcodenk
       t.rename :shelteredaccom, :sheltered
-      t.remove :tenancy_code
+      t.remove :tenancy_code, type: :string
     end
   end
 end
diff --git a/spec/fixtures/exports/case_logs.csv b/spec/fixtures/exports/case_logs.csv
index 28d2c5806..95e47a3d6 100644
--- a/spec/fixtures/exports/case_logs.csv
+++ b/spec/fixtures/exports/case_logs.csv
@@ -1,2 +1,2 @@
 status,tenancycode,age1,sex1,ethnic,national,prevten,ecstat1,hhmemb,age2,sex2,ecstat2,age3,sex3,ecstat3,age4,sex4,ecstat4,age5,sex5,ecstat5,age6,sex6,ecstat6,age7,sex7,ecstat7,age8,sex8,ecstat8,homeless,underoccupation_benefitcap,leftreg,reservist,illness,preg_occ,startertenancy,tenancylength,tenancy,ppostcode_full,rsnvac,unittype_gn,beds,offered,wchair,earnings,incfreq,benefits,period,layear,waityear,postcode_full,reasonpref,cbl,chr,cap,reasonother,housingneeds_a,housingneeds_b,housingneeds_c,housingneeds_f,housingneeds_g,housingneeds_h,illness_type_1,illness_type_2,illness_type_3,illness_type_4,illness_type_8,illness_type_5,illness_type_6,illness_type_7,illness_type_9,illness_type_10,rp_homeless,rp_insan_unsat,rp_medwel,rp_hardship,rp_dontknow,tenancyother,irproduct_other,reason,propcode,la,prevloc,hb,hbrentshortfall,mrcdate,incref,startdate,armedforces,unitletas,builtype,voiddate,renttype,needstype,lettype,totchild,totelder,totadult,nocharge,referral,brent,scharge,pscharge,supcharg,tcharge,tshortfall,chcharge,ppcodenk,has_benefits,renewal,wrent,wscharge,wpschrge,wsupchrg,wtcharge,wtshortfall,refused,housingneeds,wchchrg,newprop,relat2,relat3,relat4,relat5,relat6,relat7,relat8,lar,irproduct,joint,sheltered,hhtype,new_old,vacdays,form,owningorgid,owningorgname,hcnum,maningorgid,maningorgname,manhcnum,createddate,uploaddate
-2,BZ737,35,F,2,4,6,0,2,32,M,6,,,,,,,,,,,,,,,,,,,1,0,1,0,1,2,0,5,1,SE26RT,6,7,3,2,1,68,1,1,2,2,1,NW15TY,1,1,1,0,,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,,,4,123,E09000003,E07000105,6,1,2020-05-05 10:36:49 UTC,0,2022-02-02 10:36:49 UTC,1,2,1,2019-11-03 00:00:00 UTC,2,1,7,0,0,2,0,,200.0,50.0,40.0,35.0,325.0,12.0,,1,1,0,100.0,25.0,20.0,17.5,162.5,6.0,0,1,,2,P,,,,,,,,,,0,4,2,638,{id},{owning_org_id},DLUHC,1234,{managing_org_id},DLUHC,1234,2022-02-08 16:52:15 UTC,2022-02-08 16:52:15 UTC
+2,BZ737,35,F,2,4,6,0,2,32,M,6,,,,,,,,,,,,,,,,,,,1,0,1,0,1,2,0,5,1,SE26RT,6,7,3,2,1,68,1,1,2,2,1,NW15TY,1,1,1,2,,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,,,4,123,E09000003,E07000105,6,1,2020-05-05 10:36:49 UTC,0,2022-02-02 10:36:49 UTC,1,2,1,2019-11-03 00:00:00 UTC,2,1,7,0,0,2,0,,200.0,50.0,40.0,35.0,325.0,12.0,,1,1,0,100.0,25.0,20.0,17.5,162.5,6.0,0,1,,2,P,,,,,,,,,,0,4,2,638,{id},{owning_org_id},DLUHC,1234,{managing_org_id},DLUHC,1234,2022-02-08 16:52:15 UTC,2022-02-08 16:52:15 UTC
diff --git a/spec/requests/case_logs_controller_spec.rb b/spec/requests/case_logs_controller_spec.rb
index 13b6e4278..6a51d5d74 100644
--- a/spec/requests/case_logs_controller_spec.rb
+++ b/spec/requests/case_logs_controller_spec.rb
@@ -289,7 +289,7 @@ RSpec.describe CaseLogsController, type: :request do
                                 startdate: Time.zone.local(2022, 12, 1),
                                 tenancy: 6,
                                 managing_organisation: organisation,
-                                tenant_code: nil)
+                                tenancycode: nil)
             end
 
             it "shows case logs for multiple selected statuses and years" do