From 37d4b9f0854d51647b936ad567439ac7db7294a0 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 9 Jun 2017 08:59:41 -0300
Subject: [PATCH] Bug 18292: Remove return 1 statements in tests

The test files do not need to return 1

Patch generated with:
perl -p -i -e "s/^1;\n//xsm" t/**/*.t

Test plan:
  git grep '^1;$' t/**/*.t
should not return any results
---
 t/00-load.t                                        |  1 -
 t/Auth_with_shibboleth.t                           |  1 -
 t/Biblio.t                                         |  1 -
 t/Biblio/TransformHtmlToXml.t                      |  1 -
 t/Boolean.t                                        |  1 -
 t/Calendar.t                                       |  1 -
 t/Charset.t                                        | 23 +++++++++++++++++++++-
 t/Circulation_barcodedecode.t                      |  1 -
 t/Images.t                                         |  1 -
 t/Koha.t                                           |  1 -
 t/Koha/Config.t                                    |  1 -
 t/Koha/Util/Normalize.t                            |  1 -
 t/Koha_MetadataRecord.t                            |  1 -
 t/Koha_Template_Plugin_Koha.t                      |  1 -
 t/Letters.t                                        |  1 -
 t/Logger.t                                         |  1 -
 t/Matcher.t                                        |  1 -
 t/Patron.t                                         |  1 -
 t/SIP/Sip.t                                        |  1 -
 t/SMS.t                                            |  1 -
 t/Search.t                                         |  1 -
 t/SocialData.t                                     |  1 -
 t/SuggestionEngine_AuthorityFile.t                 |  1 -
 t/XSLT.t                                           |  1 -
 t/db_dependent/Accounts.t                          |  1 -
 t/db_dependent/Auth_with_cas.t                     |  1 -
 t/db_dependent/Auth_with_ldap.t                    |  1 -
 t/db_dependent/Barcodes_ValueBuilder.t             |  1 -
 t/db_dependent/Biblio.t                            |  1 -
 t/db_dependent/Circulation/Branch.t                |  1 -
 t/db_dependent/Circulation/CheckIfIssuedToPatron.t |  1 -
 t/db_dependent/Circulation/CheckValidBarcode.t     |  1 -
 .../Circulation/GetPendingOnSiteCheckouts.t        |  1 -
 t/db_dependent/Circulation/IsItemIssued.t          |  1 -
 t/db_dependent/Circulation/MarkIssueReturned.t     |  1 -
 .../Circulation/NoIssuesChargeGuarantees.t         |  1 -
 t/db_dependent/Circulation/Returns.t               |  1 -
 t/db_dependent/Circulation/StoreLastBorrower.t     |  1 -
 t/db_dependent/Circulation/SwitchOnSiteCheckouts.t |  1 -
 t/db_dependent/Circulation/TooMany.t               |  1 -
 t/db_dependent/Circulation/dateexpiry.t            |  1 -
 t/db_dependent/Circulation/transfers.t             |  1 -
 t/db_dependent/Clubs.t                             |  1 -
 t/db_dependent/Context.t                           |  1 -
 t/db_dependent/DecreaseLoanHighHolds.t             |  1 -
 t/db_dependent/Exporter/Record.t                   |  1 -
 t/db_dependent/Filter_MARC_ViewPolicy.t            |  1 -
 t/db_dependent/Hold.t                              |  1 -
 t/db_dependent/Holidays.t                          |  1 -
 t/db_dependent/ILSDI_Services.t                    |  1 -
 t/db_dependent/Items/MoveItemFromBiblio.t          |  1 -
 t/db_dependent/Items_DelItemCheck.t                |  1 -
 t/db_dependent/Koha/BiblioUtils.t                  |  1 -
 t/db_dependent/Koha/Biblios.t                      |  1 -
 t/db_dependent/Koha/Checkouts.t                    |  1 -
 t/db_dependent/Koha/Cities.t                       |  1 -
 t/db_dependent/Koha/CsvProfiles.t                  |  1 -
 .../Koha/Filter/EmbedItemsAvailability.t           |  1 -
 t/db_dependent/Koha/IssuingRules.t                 |  1 -
 t/db_dependent/Koha/Item/Transfers.t               |  1 -
 t/db_dependent/Koha/Items.t                        |  1 -
 t/db_dependent/Koha/Libraries.t                    |  1 -
 t/db_dependent/Koha/MarcSubfieldStructures.t       |  1 -
 t/db_dependent/Koha/News.t                         |  1 -
 t/db_dependent/Koha/Notices.t                      |  1 -
 t/db_dependent/Koha/Objects.t                      |  1 -
 t/db_dependent/Koha/Patron/Attribute/Types.t       |  1 -
 t/db_dependent/Koha/Patron/Attributes.t            |  1 -
 t/db_dependent/Koha/Patron/Categories.t            |  1 -
 t/db_dependent/Koha/Patron/Images.t                |  1 -
 t/db_dependent/Koha/Patron/Messages.t              |  1 -
 t/db_dependent/Koha/Patron/Modifications.t         |  1 -
 t/db_dependent/Koha/Patrons.t                      |  1 -
 t/db_dependent/Koha/Ratings.t                      |  1 -
 t/db_dependent/Koha/Reviews.t                      |  1 -
 t/db_dependent/Koha/SMS_Providers.t                |  1 -
 t/db_dependent/Koha/Suggestions.t                  |  1 -
 t/db_dependent/Koha_Elasticsearch.t                |  2 --
 t/db_dependent/Koha_Elasticsearch_Indexer.t        |  2 --
 t/db_dependent/Koha_Misc_Files.t                   |  1 -
 .../Koha_SearchEngine_Elasticsearch_Search.t       |  1 -
 t/db_dependent/Labels/t_Layout.t                   |  1 -
 t/db_dependent/Labels/t_Profile.t                  |  1 -
 t/db_dependent/Labels/t_Template.t                 |  1 -
 t/db_dependent/Members/GetAllIssues.t              |  1 -
 t/db_dependent/Members/GetPendingIssues.t          |  1 -
 t/db_dependent/Members/IssueSlip.t                 |  1 -
 t/db_dependent/Passwordrecovery.t                  |  1 -
 t/db_dependent/Patron/Borrower_Discharge.t         |  1 -
 t/db_dependent/Patron/Borrower_PrevCheckout.t      |  1 -
 t/db_dependent/Patron/Housebound.t                 |  1 -
 t/db_dependent/Patron/HouseboundProfiles.t         |  1 -
 t/db_dependent/Patron/HouseboundRoles.t            |  1 -
 t/db_dependent/Patron/HouseboundVisits.t           |  1 -
 t/db_dependent/PatronLists.t                       |  1 -
 t/db_dependent/Patrons.t                           |  1 -
 t/db_dependent/QueryParser.t                       |  1 -
 t/db_dependent/RefundLostItemFeeRule.t             |  1 -
 t/db_dependent/Reserves/GetReserveFee.t            |  1 -
 t/db_dependent/Reserves/MultiplePerRecord.t        |  1 -
 t/db_dependent/RotatingCollections.t               |  1 -
 t/db_dependent/SIP/SIPServer.t                     |  1 -
 t/db_dependent/Search.t                            |  1 -
 t/db_dependent/Serials/ReNewSubscription.t         |  1 -
 t/db_dependent/Template/Plugin/Categories.t        |  1 -
 t/db_dependent/Templates.t                         |  1 -
 t/db_dependent/Utils/Datatables_Members.t          |  2 --
 t/db_dependent/Utils/Datatables_Virtualshelves.t   |  1 -
 t/db_dependent/api/v1/cities.t                     |  1 -
 t/db_dependent/db_structure.t                      |  1 -
 t/db_dependent/www/auth_values_input_www.t         |  1 -
 t/db_dependent/www/batch.t                         |  1 -
 t/db_dependent/www/history.t                       |  1 -
 t/db_dependent/www/search_utf8.t                   |  1 -
 114 files changed, 22 insertions(+), 117 deletions(-)

diff --git a/t/00-load.t b/t/00-load.t
index 460018cc8c..a76531e8d8 100644
--- a/t/00-load.t
+++ b/t/00-load.t
@@ -109,4 +109,3 @@ sub is_testable {
 
 done_testing();
 
-1;
diff --git a/t/Auth_with_shibboleth.t b/t/Auth_with_shibboleth.t
index ab03248d0f..60bde6896c 100644
--- a/t/Auth_with_shibboleth.t
+++ b/t/Auth_with_shibboleth.t
@@ -321,4 +321,3 @@ sub reset_config {
     return 1;
 }
 
-1;
diff --git a/t/Biblio.t b/t/Biblio.t
index 1bf7895d00..8fd388ffcb 100755
--- a/t/Biblio.t
+++ b/t/Biblio.t
@@ -193,4 +193,3 @@ warnings_like { $ret = UpdateTotalIssues() }
 
 ok( !defined $ret, 'UpdateTotalIssues returns carped warning if biblio record does not exist');
 
-1;
diff --git a/t/Biblio/TransformHtmlToXml.t b/t/Biblio/TransformHtmlToXml.t
index 909fec3d9d..c95c120422 100644
--- a/t/Biblio/TransformHtmlToXml.t
+++ b/t/Biblio/TransformHtmlToXml.t
@@ -77,4 +77,3 @@ subtest "->TransformHtmlToXml (NORMARC) tests" => sub {
     run_tests('NORMARC');
 };
 
-1;
diff --git a/t/Boolean.t b/t/Boolean.t
index 7ca05f1c15..2c5434bd3f 100755
--- a/t/Boolean.t
+++ b/t/Boolean.t
@@ -37,4 +37,3 @@ warning_like { $result = true_p([]) }
              'Invalid boolean (reference) raises warning';
 is( $result, undef, 'recognizes a reference as not a boolean' );
 
-1;
diff --git a/t/Calendar.t b/t/Calendar.t
index 076eb8d71a..d5b8967cbf 100755
--- a/t/Calendar.t
+++ b/t/Calendar.t
@@ -330,4 +330,3 @@ my $holiday_for_another_branch = DateTime->new(
     is ( $cal->is_holiday($holiday_for_another_branch), 1, 'Holiday defined for CPL should be defined as an holiday' );
 }
 
-1;
diff --git a/t/Charset.t b/t/Charset.t
index 143c2081fe..fa22425d68 100755
--- a/t/Charset.t
+++ b/t/Charset.t
@@ -71,4 +71,25 @@ ok( Encode::is_utf8($record->subfield('100','a')) &&
 
 is( nsb_clean("˜Leœ Moyen Âge"), "Le Moyen Âge", "nsb_clean removes ˜ and œ" );
 
-1;
+subtest 'SetMarcUnicodeFlag' => sub {
+    plan tests => 2;
+    # TODO This should be done in MARC::Record
+    my $leader                  = '012345678X0             ';
+    my $expected_marc21_leader  = '012345678a0             '; # position 9 of leader must be 'a'
+    my $expected_unimarc_leader = '012345678X0             '; # position 9 of leader must not be changed
+    # Note that position 9 of leader should be blank for UNIMARC, but as it is not related to encoding
+    # we do not want to change it
+
+    t::lib::Mocks::mock_preference( 'marcflavour', 'MARC21' );
+    my $marc21_record = MARC::Record->new;
+    $marc21_record->leader($leader);
+    SetMarcUnicodeFlag( $marc21_record, C4::Context->preference('marcflavour') );
+    is( $marc21_record->leader, $expected_marc21_leader, 'Leader 9 for MARC21 mush be "a"' );
+
+    t::lib::Mocks::mock_preference( 'marcflavour',             'UNIMARC' );
+    t::lib::Mocks::mock_preference( 'UNIMARCField100Language', 'fre' );
+    my $unimarc_record = MARC::Record->new;
+    $unimarc_record->leader($leader);
+    SetMarcUnicodeFlag( $unimarc_record, C4::Context->preference('marcflavour') );
+    is( $unimarc_record->leader, $expected_unimarc_leader, 'Leader 9 for UNIMARC must be blank' );
+};
diff --git a/t/Circulation_barcodedecode.t b/t/Circulation_barcodedecode.t
index eff962421f..8715661178 100644
--- a/t/Circulation_barcodedecode.t
+++ b/t/Circulation_barcodedecode.t
@@ -61,4 +61,3 @@ foreach my $filter (@filters) {
 #  ~ T, P or X followed by numeric characters
 #  ~ No checkdigit
 
-1;
diff --git a/t/Images.t b/t/Images.t
index 02bcd82a45..338a9030fa 100644
--- a/t/Images.t
+++ b/t/Images.t
@@ -69,4 +69,3 @@ is( $imagenumbers[1], 3, 'imagenumber is 3' );
 
 is( $imagenumbers[4], undef, 'imagenumber undef' );
 
-1;
diff --git a/t/Koha.t b/t/Koha.t
index dd0e4a4473..b8d4346757 100755
--- a/t/Koha.t
+++ b/t/Koha.t
@@ -151,4 +151,3 @@ ok($@ eq '', 'NormalizeISSN does not throw exception when parsing invalid ISSN')
 is($issns[0], 'abc', 'Original ISSN passed through even if invalid');
 is(scalar(@issns), 1, 'zero additional variations returned of invalid ISSN');
 
-1;
diff --git a/t/Koha/Config.t b/t/Koha/Config.t
index 2363fdaf19..2ae3c25640 100644
--- a/t/Koha/Config.t
+++ b/t/Koha/Config.t
@@ -59,4 +59,3 @@ subtest 'read_from_file() tests' => sub {
     is( $result, undef, 'Returns undef on error confition' );
 };
 
-1;
diff --git a/t/Koha/Util/Normalize.t b/t/Koha/Util/Normalize.t
index 7480c230bf..317ad8cbf8 100644
--- a/t/Koha/Util/Normalize.t
+++ b/t/Koha/Util/Normalize.t
@@ -82,4 +82,3 @@ subtest 'lower_case() normalizer' => sub {
         'The \'lower_case\' normalizer only makes characters lower-case' );
 };
 
-1;
diff --git a/t/Koha_MetadataRecord.t b/t/Koha_MetadataRecord.t
index 48d9c40bd6..0c2c53e304 100755
--- a/t/Koha_MetadataRecord.t
+++ b/t/Koha_MetadataRecord.t
@@ -141,4 +141,3 @@ subtest "new() tests" => sub {
     is( $metadata_record, undef, 'record object mandatory')
 };
 
-1;
diff --git a/t/Koha_Template_Plugin_Koha.t b/t/Koha_Template_Plugin_Koha.t
index 6bbe99f8a4..e0e5ed2ea4 100644
--- a/t/Koha_Template_Plugin_Koha.t
+++ b/t/Koha_Template_Plugin_Koha.t
@@ -76,4 +76,3 @@ subtest "Koha::Template::Plugin::Koha::Version tests" => sub {
 
 };
 
-1;
diff --git a/t/Letters.t b/t/Letters.t
index fb1158bf52..35a4b74a2a 100755
--- a/t/Letters.t
+++ b/t/Letters.t
@@ -64,4 +64,3 @@ t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 1);
 $letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
 is( ref($letter), 'HASH');
 
-1;
diff --git a/t/Logger.t b/t/Logger.t
index cef4ea193c..1a1d412666 100644
--- a/t/Logger.t
+++ b/t/Logger.t
@@ -74,4 +74,3 @@ sub mytempfile {
     return $fn;
 }
 
-1;
diff --git a/t/Matcher.t b/t/Matcher.t
index 30d1b90fd0..55b5a87cf4 100755
--- a/t/Matcher.t
+++ b/t/Matcher.t
@@ -311,4 +311,3 @@ sub get_authors_matchpoint {
     return $matchpoint;
 }
 
-1;
diff --git a/t/Patron.t b/t/Patron.t
index be66f9d58e..e8a144cc22 100755
--- a/t/Patron.t
+++ b/t/Patron.t
@@ -324,4 +324,3 @@ subtest 'Set tests' => sub {
     is( $patron->privacy,             '667789',                           'privacy field set ok' );
 };
 
-1;
diff --git a/t/SIP/Sip.t b/t/SIP/Sip.t
index f6702779d7..e7e06709d2 100755
--- a/t/SIP/Sip.t
+++ b/t/SIP/Sip.t
@@ -55,4 +55,3 @@ warning_is { $invalidTest = C4::SIP::Sip::Checksum::verify_cksum("1234567") }
             'verify_cksum prints the expected warning for an invalid checksum';
 is($invalidTest, 0, "Checksum: 1234567 is invalid as expected");
 
-1;
diff --git a/t/SMS.t b/t/SMS.t
index fca44b4d1f..21dc75bbb8 100755
--- a/t/SMS.t
+++ b/t/SMS.t
@@ -60,4 +60,3 @@ $send_sms = C4::SMS->send_sms({
 });
 is( $send_sms, 1, 'send_sms returns 1' );
 
-1;
diff --git a/t/Search.t b/t/Search.t
index 5c3541983d..42d75922c1 100755
--- a/t/Search.t
+++ b/t/Search.t
@@ -160,4 +160,3 @@ subtest "_build_initial_query tests" => sub {
 };
 
 
-1;
diff --git a/t/SocialData.t b/t/SocialData.t
index cf1d5ff65a..df14a50132 100644
--- a/t/SocialData.t
+++ b/t/SocialData.t
@@ -72,4 +72,3 @@ is( $report->{'without'}->[0]->{'original'},
 is( $report->{'without'}->[0]->{'isbn'}, '9780596526740',
     'testing get_report' );
 
-1;
diff --git a/t/SuggestionEngine_AuthorityFile.t b/t/SuggestionEngine_AuthorityFile.t
index 96ca44d98f..8bb1140465 100755
--- a/t/SuggestionEngine_AuthorityFile.t
+++ b/t/SuggestionEngine_AuthorityFile.t
@@ -59,4 +59,3 @@ is_deeply($result, [ { 'search' => 'an=1234', 'relevance' => 1, 'label' => 'Cook
 
 done_testing();
 
-1;
diff --git a/t/XSLT.t b/t/XSLT.t
index aefa4df531..e23ec8dad5 100755
--- a/t/XSLT.t
+++ b/t/XSLT.t
@@ -75,4 +75,3 @@ my $matching_string = q{<syspref name="singleBranchMode">0</syspref>};
 my $sysprefs_xml = C4::XSLT::get_xslt_sysprefs();
 ok( $sysprefs_xml =~ m/$matching_string/, 'singleBranchMode has a value of 0');
 
-1;
diff --git a/t/db_dependent/Accounts.t b/t/db_dependent/Accounts.t
index fcc63d3101..be2b26571f 100644
--- a/t/db_dependent/Accounts.t
+++ b/t/db_dependent/Accounts.t
@@ -478,4 +478,3 @@ subtest 'balance' => sub {
     $patron->delete;
 };
 
-1;
diff --git a/t/db_dependent/Auth_with_cas.t b/t/db_dependent/Auth_with_cas.t
index ab21233991..a58300ac1d 100755
--- a/t/db_dependent/Auth_with_cas.t
+++ b/t/db_dependent/Auth_with_cas.t
@@ -67,4 +67,3 @@ is(C4::Auth_with_cas::_url_with_get_params($cgi, 'intranet'),
 
 $dbh->rollback;
 
-1;
diff --git a/t/db_dependent/Auth_with_ldap.t b/t/db_dependent/Auth_with_ldap.t
index cf4b700e26..1a1c3d048f 100755
--- a/t/db_dependent/Auth_with_ldap.t
+++ b/t/db_dependent/Auth_with_ldap.t
@@ -503,4 +503,3 @@ sub is_admin_bind {
 
 $schema->storage->txn_rollback();
 
-1;
diff --git a/t/db_dependent/Barcodes_ValueBuilder.t b/t/db_dependent/Barcodes_ValueBuilder.t
index 38b181f64e..a116b45565 100644
--- a/t/db_dependent/Barcodes_ValueBuilder.t
+++ b/t/db_dependent/Barcodes_ValueBuilder.t
@@ -77,4 +77,3 @@ is($scr, undef, 'annual javascript');
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Biblio.t b/t/db_dependent/Biblio.t
index 08e09a1798..572bc0a300 100755
--- a/t/db_dependent/Biblio.t
+++ b/t/db_dependent/Biblio.t
@@ -389,4 +389,3 @@ subtest 'deletedbiblio_metadata' => sub {
     is( $moved, $biblionumber, 'Found in deletedbiblio_metadata' );
 };
 
-1;
diff --git a/t/db_dependent/Circulation/Branch.t b/t/db_dependent/Circulation/Branch.t
index 9a040d1076..6b5511596b 100644
--- a/t/db_dependent/Circulation/Branch.t
+++ b/t/db_dependent/Circulation/Branch.t
@@ -276,4 +276,3 @@ is($messages->{NeedsTransfer},undef,"AddReturn respects branch item return polic
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/CheckIfIssuedToPatron.t b/t/db_dependent/Circulation/CheckIfIssuedToPatron.t
index f74327ffa8..4e21c41a87 100644
--- a/t/db_dependent/Circulation/CheckIfIssuedToPatron.t
+++ b/t/db_dependent/Circulation/CheckIfIssuedToPatron.t
@@ -131,4 +131,3 @@ is( $check_if_issued, 1, 'CheckIfIssuedToPatron returns true' );
 
 $dbh->rollback();
 
-1;
diff --git a/t/db_dependent/Circulation/CheckValidBarcode.t b/t/db_dependent/Circulation/CheckValidBarcode.t
index 39cad00514..505955f013 100644
--- a/t/db_dependent/Circulation/CheckValidBarcode.t
+++ b/t/db_dependent/Circulation/CheckValidBarcode.t
@@ -84,4 +84,3 @@ is( $check_valid_barcode, 0, 'CheckValidBarcode with an invalid barcode returns
 
 $dbh->rollback();
 
-1;
diff --git a/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t b/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t
index 3d28e505c2..d47f38ac7c 100644
--- a/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t
+++ b/t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t
@@ -82,4 +82,3 @@ is( scalar @$onsite_checkouts, 1, "There is 1 pending on-site checkout" );
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/IsItemIssued.t b/t/db_dependent/Circulation/IsItemIssued.t
index 8a8ccf634a..7a30da9409 100644
--- a/t/db_dependent/Circulation/IsItemIssued.t
+++ b/t/db_dependent/Circulation/IsItemIssued.t
@@ -93,4 +93,3 @@ is(
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/MarkIssueReturned.t b/t/db_dependent/Circulation/MarkIssueReturned.t
index a3428ebfb8..7fc7f14d47 100644
--- a/t/db_dependent/Circulation/MarkIssueReturned.t
+++ b/t/db_dependent/Circulation/MarkIssueReturned.t
@@ -58,4 +58,3 @@ unlike ( $@, qr<Fatal error: the patron \(\d+\) .* AnonymousPatron>, );
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
index dc2c8803e3..1fc8aa0d5e 100644
--- a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
+++ b/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t
@@ -65,4 +65,3 @@ is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/Returns.t b/t/db_dependent/Circulation/Returns.t
index 4135d66fa2..e6406b388e 100644
--- a/t/db_dependent/Circulation/Returns.t
+++ b/t/db_dependent/Circulation/Returns.t
@@ -330,4 +330,3 @@ subtest 'Handle ids duplication' => sub {
     is( Koha::Checkouts->find( $issue_id )->issue_id, $issue_id, 'The issues entry should not have been removed' );
 };
 
-1;
diff --git a/t/db_dependent/Circulation/StoreLastBorrower.t b/t/db_dependent/Circulation/StoreLastBorrower.t
index 7d62474492..15d0906c97 100644
--- a/t/db_dependent/Circulation/StoreLastBorrower.t
+++ b/t/db_dependent/Circulation/StoreLastBorrower.t
@@ -141,4 +141,3 @@ subtest 'Test StoreLastBorrower' => sub {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t b/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t
index 48c2a60eef..3397e23ab8 100644
--- a/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t
+++ b/t/db_dependent/Circulation/SwitchOnSiteCheckouts.t
@@ -161,4 +161,3 @@ is( exists $impossible->{TOO_MANY}, '', 'Specific case 2 - Switch is allowed' );
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/TooMany.t b/t/db_dependent/Circulation/TooMany.t
index 428c08b22e..7ce7e8e5fb 100644
--- a/t/db_dependent/Circulation/TooMany.t
+++ b/t/db_dependent/Circulation/TooMany.t
@@ -413,4 +413,3 @@ sub teardown {
     $dbh->do(q|DELETE FROM issuingrules|);
 }
 
-1;
diff --git a/t/db_dependent/Circulation/dateexpiry.t b/t/db_dependent/Circulation/dateexpiry.t
index 57f306e1f7..dbb7e0bda6 100644
--- a/t/db_dependent/Circulation/dateexpiry.t
+++ b/t/db_dependent/Circulation/dateexpiry.t
@@ -120,4 +120,3 @@ sub calc_date_due {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Circulation/transfers.t b/t/db_dependent/Circulation/transfers.t
index 5abe5e5a9b..df634370e3 100644
--- a/t/db_dependent/Circulation/transfers.t
+++ b/t/db_dependent/Circulation/transfers.t
@@ -194,4 +194,3 @@ cmp_deeply(
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Clubs.t b/t/db_dependent/Clubs.t
index ab39a6d466..ee0f83b2c5 100755
--- a/t/db_dependent/Clubs.t
+++ b/t/db_dependent/Clubs.t
@@ -231,4 +231,3 @@ is( $patron->get_enrollable_clubs->count,
 is( $club->club_enrollments->count, 1, 'There is 1 enrollment for club' );
 
 $schema->storage->txn_rollback();
-1;
diff --git a/t/db_dependent/Context.t b/t/db_dependent/Context.t
index 9325c72fc0..5a75acd315 100755
--- a/t/db_dependent/Context.t
+++ b/t/db_dependent/Context.t
@@ -149,4 +149,3 @@ sub TransformVersionToNum {
     $version =~ s/XXX$/999/;
     return $version;
 }
-1;
diff --git a/t/db_dependent/DecreaseLoanHighHolds.t b/t/db_dependent/DecreaseLoanHighHolds.t
index d4faaa3317..00d1b9fd67 100755
--- a/t/db_dependent/DecreaseLoanHighHolds.t
+++ b/t/db_dependent/DecreaseLoanHighHolds.t
@@ -190,4 +190,3 @@ ok( $needsconfirmation->{HIGHHOLDS}, "High holds checkout needs confirmation" );
 ok( !$needsconfirmation->{HIGHHOLDS}, "High holds checkout does not need confirmation" );
 
 $schema->storage->txn_rollback();
-1;
diff --git a/t/db_dependent/Exporter/Record.t b/t/db_dependent/Exporter/Record.t
index b3ef6c1469..ac10cbfe04 100644
--- a/t/db_dependent/Exporter/Record.t
+++ b/t/db_dependent/Exporter/Record.t
@@ -213,4 +213,3 @@ subtest 'export without record_type' => sub {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Filter_MARC_ViewPolicy.t b/t/db_dependent/Filter_MARC_ViewPolicy.t
index bd684b666a..64759fa5bb 100644
--- a/t/db_dependent/Filter_MARC_ViewPolicy.t
+++ b/t/db_dependent/Filter_MARC_ViewPolicy.t
@@ -206,4 +206,3 @@ subtest 'Koha::Filter::MARC::ViewPolicy intranet tests' => sub {
     $schema->storage->txn_rollback();
 };
 
-1;
diff --git a/t/db_dependent/Hold.t b/t/db_dependent/Hold.t
index 71ce265ebb..6c51f54e5e 100755
--- a/t/db_dependent/Hold.t
+++ b/t/db_dependent/Hold.t
@@ -172,4 +172,3 @@ subtest "delete() tests" => sub {
     $schema->storage->txn_rollback();
  };
 
-1;
diff --git a/t/db_dependent/Holidays.t b/t/db_dependent/Holidays.t
index 360bfda385..70c71d4bdf 100755
--- a/t/db_dependent/Holidays.t
+++ b/t/db_dependent/Holidays.t
@@ -203,4 +203,3 @@ sub _add_exception {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/ILSDI_Services.t b/t/db_dependent/ILSDI_Services.t
index 88e8181d04..7677db0f04 100644
--- a/t/db_dependent/ILSDI_Services.t
+++ b/t/db_dependent/ILSDI_Services.t
@@ -198,4 +198,3 @@ subtest 'GetPatronInfo/GetBorrowerAttributes test for extended patron attributes
     $schema->storage->txn_rollback;
 };
 
-1;
diff --git a/t/db_dependent/Items/MoveItemFromBiblio.t b/t/db_dependent/Items/MoveItemFromBiblio.t
index 29078ca793..d1a9e823ec 100644
--- a/t/db_dependent/Items/MoveItemFromBiblio.t
+++ b/t/db_dependent/Items/MoveItemFromBiblio.t
@@ -95,4 +95,3 @@ is( $get_item_level_hold_2->{biblionumber}, $to_biblio->{biblionumber},   'MoveI
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Items_DelItemCheck.t b/t/db_dependent/Items_DelItemCheck.t
index 20b3b11d14..57514d0491 100644
--- a/t/db_dependent/Items_DelItemCheck.t
+++ b/t/db_dependent/Items_DelItemCheck.t
@@ -167,4 +167,3 @@ is( $test_item->{itemnumber}, undef,
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/BiblioUtils.t b/t/db_dependent/Koha/BiblioUtils.t
index b247d8bbbd..85bf9217b9 100755
--- a/t/db_dependent/Koha/BiblioUtils.t
+++ b/t/db_dependent/Koha/BiblioUtils.t
@@ -57,4 +57,3 @@ is( $subtitles[1], 'Another Test Record Subtitle', 'Got second subtitle correctl
 
 $schema->storage->txn_rollback();
 
-1;
diff --git a/t/db_dependent/Koha/Biblios.t b/t/db_dependent/Koha/Biblios.t
index 59defcf6b3..9f6a14a872 100644
--- a/t/db_dependent/Koha/Biblios.t
+++ b/t/db_dependent/Koha/Biblios.t
@@ -82,4 +82,3 @@ subtest 'subscriptions' => sub {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Checkouts.t b/t/db_dependent/Koha/Checkouts.t
index 89b0126fba..c8ec4c52fa 100644
--- a/t/db_dependent/Koha/Checkouts.t
+++ b/t/db_dependent/Koha/Checkouts.t
@@ -105,4 +105,3 @@ is( Koha::Checkouts->search->count, $nb_of_checkouts + 1, 'Delete should have de
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Cities.t b/t/db_dependent/Koha/Cities.t
index 941dd75304..9947d3b917 100644
--- a/t/db_dependent/Koha/Cities.t
+++ b/t/db_dependent/Koha/Cities.t
@@ -56,4 +56,3 @@ is( Koha::Cities->search->count, $nb_of_cities + 1, 'Delete should have deleted
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/CsvProfiles.t b/t/db_dependent/Koha/CsvProfiles.t
index 8b021b1738..e5d02b2151 100644
--- a/t/db_dependent/Koha/CsvProfiles.t
+++ b/t/db_dependent/Koha/CsvProfiles.t
@@ -55,4 +55,3 @@ is( Koha::CsvProfiles->search->count, $nb_of_csv_profiles + 1, 'Delete should ha
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Filter/EmbedItemsAvailability.t b/t/db_dependent/Koha/Filter/EmbedItemsAvailability.t
index 8f250dd554..ca70fb1aad 100755
--- a/t/db_dependent/Koha/Filter/EmbedItemsAvailability.t
+++ b/t/db_dependent/Koha/Filter/EmbedItemsAvailability.t
@@ -150,4 +150,3 @@ subtest 'EmbedItemsAvailability tests' => sub {
     $schema->storage->txn_rollback();
 };
 
-1;
diff --git a/t/db_dependent/Koha/IssuingRules.t b/t/db_dependent/Koha/IssuingRules.t
index 2285be10f0..392cdecd24 100644
--- a/t/db_dependent/Koha/IssuingRules.t
+++ b/t/db_dependent/Koha/IssuingRules.t
@@ -250,4 +250,3 @@ sub _row_match {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Item/Transfers.t b/t/db_dependent/Koha/Item/Transfers.t
index 635c9a42a4..b49f78091a 100644
--- a/t/db_dependent/Koha/Item/Transfers.t
+++ b/t/db_dependent/Koha/Item/Transfers.t
@@ -66,4 +66,3 @@ is( $retrieved_transfer_1->itemnumber, $new_transfer_1->itemnumber, 'Find a tran
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Items.t b/t/db_dependent/Koha/Items.t
index fd445b54af..0864825034 100644
--- a/t/db_dependent/Koha/Items.t
+++ b/t/db_dependent/Koha/Items.t
@@ -123,4 +123,3 @@ is( Koha::Items->search->count, $nb_of_items + 1, 'Delete should have deleted th
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Libraries.t b/t/db_dependent/Koha/Libraries.t
index 8126b8cca7..483c7c874a 100644
--- a/t/db_dependent/Koha/Libraries.t
+++ b/t/db_dependent/Koha/Libraries.t
@@ -87,4 +87,3 @@ $retrieved_category_2->delete;
 is( Koha::LibraryCategories->search->count, $nb_of_categories + 2, 'Delete should have deleted the library category' );
 
 $schema->storage->txn_rollback;
-1;
diff --git a/t/db_dependent/Koha/MarcSubfieldStructures.t b/t/db_dependent/Koha/MarcSubfieldStructures.t
index b61837a615..b7ff4549d5 100644
--- a/t/db_dependent/Koha/MarcSubfieldStructures.t
+++ b/t/db_dependent/Koha/MarcSubfieldStructures.t
@@ -54,4 +54,3 @@ is( Koha::MarcSubfieldStructures->search->count, $nb_of_fields + 1, 'Delete shou
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/News.t b/t/db_dependent/Koha/News.t
index bc5c5c9f34..e1b56f5f3f 100644
--- a/t/db_dependent/Koha/News.t
+++ b/t/db_dependent/Koha/News.t
@@ -56,4 +56,3 @@ is( Koha::News->search->count, $nb_of_news + 1, 'Delete should have deleted the
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Notices.t b/t/db_dependent/Koha/Notices.t
index 3f90f9fe85..dc9646f4b8 100644
--- a/t/db_dependent/Koha/Notices.t
+++ b/t/db_dependent/Koha/Notices.t
@@ -68,4 +68,3 @@ is( Koha::Notice::Templates->search->count,
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Objects.t b/t/db_dependent/Koha/Objects.t
index f5f9472299..c05afc3f2d 100644
--- a/t/db_dependent/Koha/Objects.t
+++ b/t/db_dependent/Koha/Objects.t
@@ -214,4 +214,3 @@ subtest 'Exceptions' => sub {
 };
 
 $schema->storage->txn_rollback;
-1;
diff --git a/t/db_dependent/Koha/Patron/Attribute/Types.t b/t/db_dependent/Koha/Patron/Attribute/Types.t
index d125dbe7f5..06aca19af5 100644
--- a/t/db_dependent/Koha/Patron/Attribute/Types.t
+++ b/t/db_dependent/Koha/Patron/Attribute/Types.t
@@ -336,4 +336,3 @@ subtest 'search() with branch limits tests' => sub {
     $schema->storage->txn_rollback;
 };
 
-1;
diff --git a/t/db_dependent/Koha/Patron/Attributes.t b/t/db_dependent/Koha/Patron/Attributes.t
index cbb02b929a..044f317aa2 100644
--- a/t/db_dependent/Koha/Patron/Attributes.t
+++ b/t/db_dependent/Koha/Patron/Attributes.t
@@ -275,4 +275,3 @@ subtest 'type() tests' => sub {
     $schema->storage->txn_rollback;
 };
 
-1;
diff --git a/t/db_dependent/Koha/Patron/Categories.t b/t/db_dependent/Koha/Patron/Categories.t
index 574d458574..6a0171f359 100644
--- a/t/db_dependent/Koha/Patron/Categories.t
+++ b/t/db_dependent/Koha/Patron/Categories.t
@@ -115,4 +115,3 @@ is( Koha::Patron::Categories->search->count, $nb_of_categories + 2, 'upperagelim
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Patron/Images.t b/t/db_dependent/Koha/Patron/Images.t
index ab0341b680..86f705d567 100644
--- a/t/db_dependent/Koha/Patron/Images.t
+++ b/t/db_dependent/Koha/Patron/Images.t
@@ -51,4 +51,3 @@ is( Koha::Patron::Images->search->count, $nb_of_images, 'Delete should have dele
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Patron/Messages.t b/t/db_dependent/Koha/Patron/Messages.t
index fc69c0f040..a64327dd06 100644
--- a/t/db_dependent/Koha/Patron/Messages.t
+++ b/t/db_dependent/Koha/Patron/Messages.t
@@ -93,4 +93,3 @@ sub get_nb_of_logactions {
     return scalar( @{ C4::Log::GetLogs( undef, undef, undef, ['MEMBERS'] ) } );
 }
 
-1;
diff --git a/t/db_dependent/Koha/Patron/Modifications.t b/t/db_dependent/Koha/Patron/Modifications.t
index af6df4cd17..53664f5542 100755
--- a/t/db_dependent/Koha/Patron/Modifications.t
+++ b/t/db_dependent/Koha/Patron/Modifications.t
@@ -370,4 +370,3 @@ subtest 'pending_count() and pending() tests' => sub {
     $schema->storage->txn_rollback;
 };
 
-1;
diff --git a/t/db_dependent/Koha/Patrons.t b/t/db_dependent/Koha/Patrons.t
index ef34199788..d1ef1ca04e 100644
--- a/t/db_dependent/Koha/Patrons.t
+++ b/t/db_dependent/Koha/Patrons.t
@@ -906,4 +906,3 @@ is( Koha::Patrons->search->count, $nb_of_patrons + 1, 'Delete should have delete
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Ratings.t b/t/db_dependent/Koha/Ratings.t
index cc2c5cc4e4..00229e0d82 100755
--- a/t/db_dependent/Koha/Ratings.t
+++ b/t/db_dependent/Koha/Ratings.t
@@ -57,4 +57,3 @@ is( Koha::Ratings->search( { biblionumber => $biblionumber } )->count, 0, 'Delet
 
 is( int(Koha::Ratings->search( { biblionumber => $biblionumber } )->get_avg_rating), 0, 'get_avg_rating should return 0 if no rating exist' );
 
-1;
diff --git a/t/db_dependent/Koha/Reviews.t b/t/db_dependent/Koha/Reviews.t
index da164f782b..91f86fe31f 100644
--- a/t/db_dependent/Koha/Reviews.t
+++ b/t/db_dependent/Koha/Reviews.t
@@ -70,4 +70,3 @@ is( Koha::Reviews->search->count, $nb_of_reviews + 2, 'Delete should have delete
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/SMS_Providers.t b/t/db_dependent/Koha/SMS_Providers.t
index 407363bddb..a469d77649 100644
--- a/t/db_dependent/Koha/SMS_Providers.t
+++ b/t/db_dependent/Koha/SMS_Providers.t
@@ -72,4 +72,3 @@ is( Koha::SMS::Providers->search->count,
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha/Suggestions.t b/t/db_dependent/Koha/Suggestions.t
index e29f2af558..5dc7a2f09d 100644
--- a/t/db_dependent/Koha/Suggestions.t
+++ b/t/db_dependent/Koha/Suggestions.t
@@ -57,4 +57,3 @@ is( Koha::Suggestions->search->count, $nb_of_suggestions + 1, 'Delete should hav
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Koha_Elasticsearch.t b/t/db_dependent/Koha_Elasticsearch.t
index ef95a03155..05785e7535 100644
--- a/t/db_dependent/Koha_Elasticsearch.t
+++ b/t/db_dependent/Koha_Elasticsearch.t
@@ -151,5 +151,3 @@ subtest 'get_fixer_rules() tests' => sub {
     $schema->storage->txn_rollback;
 
 };
-
-1;
diff --git a/t/db_dependent/Koha_Elasticsearch_Indexer.t b/t/db_dependent/Koha_Elasticsearch_Indexer.t
index e08d6c0a1a..9a525bfab0 100644
--- a/t/db_dependent/Koha_Elasticsearch_Indexer.t
+++ b/t/db_dependent/Koha_Elasticsearch_Indexer.t
@@ -122,5 +122,3 @@ subtest '_convert_marc_to_json() tests' => sub {
 
     $schema->storage->txn_rollback;
 };
-
-1;
diff --git a/t/db_dependent/Koha_Misc_Files.t b/t/db_dependent/Koha_Misc_Files.t
index 6a51126b7c..18fbab0ea1 100755
--- a/t/db_dependent/Koha_Misc_Files.t
+++ b/t/db_dependent/Koha_Misc_Files.t
@@ -87,4 +87,3 @@ is(scalar @{$mf_b_221->GetFilesInfo()}, 0, "GetFilesInfo() result count after De
 
 $dbh->rollback;
 
-1;
diff --git a/t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t b/t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
index f83bd8d11c..5c37200485 100644
--- a/t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
+++ b/t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t
@@ -103,4 +103,3 @@ subtest 'build_query tests' => sub {
         'holdingbranch not added to facets if DisplayLibraryFacets=home' );
 };
 
-1;
diff --git a/t/db_dependent/Labels/t_Layout.t b/t/db_dependent/Labels/t_Layout.t
index 87db848701..54be026ba7 100644
--- a/t/db_dependent/Labels/t_Layout.t
+++ b/t/db_dependent/Labels/t_Layout.t
@@ -109,4 +109,3 @@ is($updated_layout->get_text_wrap_cols(label_width => 180, left_text_margin => 1
 my $del_results = $updated_layout->delete();
 ok( ! defined($del_results) , "Layout->delete() success");
 
-1;
diff --git a/t/db_dependent/Labels/t_Profile.t b/t/db_dependent/Labels/t_Profile.t
index e918ca419b..fec46e5ad5 100644
--- a/t/db_dependent/Labels/t_Profile.t
+++ b/t/db_dependent/Labels/t_Profile.t
@@ -95,4 +95,3 @@ is_deeply($updated_profile, $saved_profile, "Updated layout object verify succes
 my $del_results = $updated_profile->delete();
 ok($del_results ne -1, "Profile->delete() success");
 
-1;
diff --git a/t/db_dependent/Labels/t_Template.t b/t/db_dependent/Labels/t_Template.t
index 0eb6871425..8cf4cd65cf 100644
--- a/t/db_dependent/Labels/t_Template.t
+++ b/t/db_dependent/Labels/t_Template.t
@@ -135,4 +135,3 @@ foreach my $key (keys %{$expect_conv}) {
 my $del_results = $updated_template->delete();
 ok($del_results ne -1, "Template->delete() success");
 
-1;
diff --git a/t/db_dependent/Members/GetAllIssues.t b/t/db_dependent/Members/GetAllIssues.t
index e6d15eeb93..643320169c 100644
--- a/t/db_dependent/Members/GetAllIssues.t
+++ b/t/db_dependent/Members/GetAllIssues.t
@@ -112,4 +112,3 @@ is( $issues->[0]->{itemnumber}, $itemnumber3, '' );
 
 $schema->storage->txn_begin;
 
-1;
diff --git a/t/db_dependent/Members/GetPendingIssues.t b/t/db_dependent/Members/GetPendingIssues.t
index b2319d14b4..56e06965b0 100644
--- a/t/db_dependent/Members/GetPendingIssues.t
+++ b/t/db_dependent/Members/GetPendingIssues.t
@@ -128,4 +128,3 @@ is( @$issues, 0,
 
 $schema->storage->txn_begin;
 
-1;
diff --git a/t/db_dependent/Members/IssueSlip.t b/t/db_dependent/Members/IssueSlip.t
index c22cb5a446..c7a2f7e1f1 100644
--- a/t/db_dependent/Members/IssueSlip.t
+++ b/t/db_dependent/Members/IssueSlip.t
@@ -405,4 +405,3 @@ subtest 'bad calls' => sub {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Passwordrecovery.t b/t/db_dependent/Passwordrecovery.t
index 893e025c46..f11893fcdd 100755
--- a/t/db_dependent/Passwordrecovery.t
+++ b/t/db_dependent/Passwordrecovery.t
@@ -194,4 +194,3 @@ ok( scalar @$letters == 2, "[SendPasswordRecoveryEmail] UPDATE == ON sends a new
 
 $schema->storage->txn_rollback();
 
-1;
diff --git a/t/db_dependent/Patron/Borrower_Discharge.t b/t/db_dependent/Patron/Borrower_Discharge.t
index d5e3e2de7d..ddc6835886 100644
--- a/t/db_dependent/Patron/Borrower_Discharge.t
+++ b/t/db_dependent/Patron/Borrower_Discharge.t
@@ -128,4 +128,3 @@ is( ref(Koha::Patron::Discharge::request({ borrowernumber => $patron->{borrowern
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Patron/Borrower_PrevCheckout.t b/t/db_dependent/Patron/Borrower_PrevCheckout.t
index 3ff2094505..956f58a171 100644
--- a/t/db_dependent/Patron/Borrower_PrevCheckout.t
+++ b/t/db_dependent/Patron/Borrower_PrevCheckout.t
@@ -442,4 +442,3 @@ map {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Patron/Housebound.t b/t/db_dependent/Patron/Housebound.t
index 095096457b..b5024bc4df 100755
--- a/t/db_dependent/Patron/Housebound.t
+++ b/t/db_dependent/Patron/Housebound.t
@@ -36,4 +36,3 @@ is(
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Patron/HouseboundProfiles.t b/t/db_dependent/Patron/HouseboundProfiles.t
index 05d63929c6..0a24cf5083 100644
--- a/t/db_dependent/Patron/HouseboundProfiles.t
+++ b/t/db_dependent/Patron/HouseboundProfiles.t
@@ -72,4 +72,3 @@ is(
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Patron/HouseboundRoles.t b/t/db_dependent/Patron/HouseboundRoles.t
index c8898b93b0..090ca63e01 100644
--- a/t/db_dependent/Patron/HouseboundRoles.t
+++ b/t/db_dependent/Patron/HouseboundRoles.t
@@ -85,4 +85,3 @@ isa_ok(Koha::Patrons->search_housebound_deliverers->next, "Koha::Patron");
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Patron/HouseboundVisits.t b/t/db_dependent/Patron/HouseboundVisits.t
index e6f8245ee2..eee3f00613 100644
--- a/t/db_dependent/Patron/HouseboundVisits.t
+++ b/t/db_dependent/Patron/HouseboundVisits.t
@@ -86,4 +86,3 @@ isa_ok( $result->chooser, "Koha::Patron");
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/PatronLists.t b/t/db_dependent/PatronLists.t
index e7f4f875a4..63fbc23e8b 100755
--- a/t/db_dependent/PatronLists.t
+++ b/t/db_dependent/PatronLists.t
@@ -102,4 +102,3 @@ ok( !@lists, 'DelPatronList works' );
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Patrons.t b/t/db_dependent/Patrons.t
index 40f770d6f4..a1c7ad9829 100755
--- a/t/db_dependent/Patrons.t
+++ b/t/db_dependent/Patrons.t
@@ -105,4 +105,3 @@ foreach my $b ( $patrons->as_list() ) {
 
 $schema->storage->txn_rollback();
 
-1;
diff --git a/t/db_dependent/QueryParser.t b/t/db_dependent/QueryParser.t
index a8d7bdc796..58120d7dd2 100644
--- a/t/db_dependent/QueryParser.t
+++ b/t/db_dependent/QueryParser.t
@@ -68,4 +68,3 @@ sub get_default_search_class {
     return $default_search_class;
 }
 
-1;
diff --git a/t/db_dependent/RefundLostItemFeeRule.t b/t/db_dependent/RefundLostItemFeeRule.t
index 2a8a759077..84a373a008 100755
--- a/t/db_dependent/RefundLostItemFeeRule.t
+++ b/t/db_dependent/RefundLostItemFeeRule.t
@@ -280,4 +280,3 @@ subtest 'Koha::RefundLostItemFeeRules::should_refund() tests' => sub {
     $schema->storage->txn_rollback;
 };
 
-1;
diff --git a/t/db_dependent/Reserves/GetReserveFee.t b/t/db_dependent/Reserves/GetReserveFee.t
index 31e45bb6a6..97d870a1e7 100755
--- a/t/db_dependent/Reserves/GetReserveFee.t
+++ b/t/db_dependent/Reserves/GetReserveFee.t
@@ -222,4 +222,3 @@ sub addreserve {
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Reserves/MultiplePerRecord.t b/t/db_dependent/Reserves/MultiplePerRecord.t
index 293ab6ab86..70f26001dc 100755
--- a/t/db_dependent/Reserves/MultiplePerRecord.t
+++ b/t/db_dependent/Reserves/MultiplePerRecord.t
@@ -291,4 +291,3 @@ is( $can, 'tooManyHoldsForThisRecord', 'Third hold exceeds limit of holds per re
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/RotatingCollections.t b/t/db_dependent/RotatingCollections.t
index fe47bb853d..a5bdb4a0f8 100644
--- a/t/db_dependent/RotatingCollections.t
+++ b/t/db_dependent/RotatingCollections.t
@@ -335,4 +335,3 @@ is(
 #End transaction
 $dbh->rollback;
 
-1;
diff --git a/t/db_dependent/SIP/SIPServer.t b/t/db_dependent/SIP/SIPServer.t
index 588dde154c..4adecf95f8 100755
--- a/t/db_dependent/SIP/SIPServer.t
+++ b/t/db_dependent/SIP/SIPServer.t
@@ -75,4 +75,3 @@ subtest 'Get_timeout' => sub {
     is( C4::SIP::SIPServer::get_timeout( $server, { transport => 1 } ), 30, "Fallback again" );
 };
 
-1;
diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t
index c8cbc48171..dee0ed2c5a 100644
--- a/t/db_dependent/Search.t
+++ b/t/db_dependent/Search.t
@@ -988,4 +988,3 @@ subtest 'UNIMARC + DOM' => sub {
 # Make sure that following tests are not using our config settings
 Koha::Caches->get_instance('config')->flush_all;
 
-1;
diff --git a/t/db_dependent/Serials/ReNewSubscription.t b/t/db_dependent/Serials/ReNewSubscription.t
index a214a97aa0..1a90c51501 100644
--- a/t/db_dependent/Serials/ReNewSubscription.t
+++ b/t/db_dependent/Serials/ReNewSubscription.t
@@ -93,4 +93,3 @@ is ( $history->histenddate(), undef, 'subscription history not empty after renew
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Template/Plugin/Categories.t b/t/db_dependent/Template/Plugin/Categories.t
index 5ae4a2ffae..6ea75f8d5f 100644
--- a/t/db_dependent/Template/Plugin/Categories.t
+++ b/t/db_dependent/Template/Plugin/Categories.t
@@ -57,4 +57,3 @@ is( Koha::Template::Plugin::Categories->GetName(
 
 $schema->storage->txn_rollback;
 
-1;
diff --git a/t/db_dependent/Templates.t b/t/db_dependent/Templates.t
index 2df099ebbc..760b9f0beb 100755
--- a/t/db_dependent/Templates.t
+++ b/t/db_dependent/Templates.t
@@ -105,4 +105,3 @@ subtest 'Testing gettemplate' => sub {
     is( $template ? $template->output: '', '', 'Check output' );
 };
 
-1;
diff --git a/t/db_dependent/Utils/Datatables_Members.t b/t/db_dependent/Utils/Datatables_Members.t
index 949d959364..1d162cf6da 100644
--- a/t/db_dependent/Utils/Datatables_Members.t
+++ b/t/db_dependent/Utils/Datatables_Members.t
@@ -475,5 +475,3 @@ sub set_logged_in_user {
         '',                      ''
     );
 }
-
-1;
diff --git a/t/db_dependent/Utils/Datatables_Virtualshelves.t b/t/db_dependent/Utils/Datatables_Virtualshelves.t
index f35117faaa..2b97b6a361 100644
--- a/t/db_dependent/Utils/Datatables_Virtualshelves.t
+++ b/t/db_dependent/Utils/Datatables_Virtualshelves.t
@@ -256,4 +256,3 @@ sub _add_biblio {
     return $biblionumber;
 }
 
-1;
diff --git a/t/db_dependent/api/v1/cities.t b/t/db_dependent/api/v1/cities.t
index e6e13c6865..bf2a8f0379 100644
--- a/t/db_dependent/api/v1/cities.t
+++ b/t/db_dependent/api/v1/cities.t
@@ -376,4 +376,3 @@ sub create_user_and_session {
     return ( $user->{borrowernumber}, $session->id );
 }
 
-1;
diff --git a/t/db_dependent/db_structure.t b/t/db_dependent/db_structure.t
index 25f574acc6..41de50750c 100644
--- a/t/db_dependent/db_structure.t
+++ b/t/db_dependent/db_structure.t
@@ -61,4 +61,3 @@ for my $modules ( @modules ) {
 
 done_testing();
 
-1;
diff --git a/t/db_dependent/www/auth_values_input_www.t b/t/db_dependent/www/auth_values_input_www.t
index 265865c41c..bcb65d16d2 100644
--- a/t/db_dependent/www/auth_values_input_www.t
+++ b/t/db_dependent/www/auth_values_input_www.t
@@ -188,4 +188,3 @@ if ($id_to_del2) {
     ok($id_to_del2 ne undef, "error, link to delete not working");
 }
 
-1;
diff --git a/t/db_dependent/www/batch.t b/t/db_dependent/www/batch.t
index 30d9886e94..8704acb096 100644
--- a/t/db_dependent/www/batch.t
+++ b/t/db_dependent/www/batch.t
@@ -210,4 +210,3 @@ $agent->get("$intranet/cgi-bin/koha/tools/batch_records_ajax.pl?import_batch_id=
 $jsonresponse = decode_json $agent->content;
 is( $jsonresponse->{ aaData }[0]->{ status }, 'reverted', 'record marked as reverted' );
 
-1;
diff --git a/t/db_dependent/www/history.t b/t/db_dependent/www/history.t
index b71f7b66b5..d22ba0a12e 100644
--- a/t/db_dependent/www/history.t
+++ b/t/db_dependent/www/history.t
@@ -64,4 +64,3 @@ my $history_page          = Encode::encode('UTF-8', $agent->text());
 like( $history_page, qr/$encoded_latin_name/, "Latin characters with umlauts show correctly on the history page." );
 like( $history_page, qr/$encoded_cyrillic_name/, "Cyrillic characters with umlauts show correctly on the history page." );
 
-1;
diff --git a/t/db_dependent/www/search_utf8.t b/t/db_dependent/www/search_utf8.t
index c0d3a272ea..ff4439d780 100644
--- a/t/db_dependent/www/search_utf8.t
+++ b/t/db_dependent/www/search_utf8.t
@@ -343,4 +343,3 @@ END {
     cleanup();
 };
 
-1;
-- 
2.11.0