Replace use of FixMyStreet::App with DB in tests.

38 files changed, 213 insertions, 224 deletions

diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t
index aaa9bca65..2d09ee85e 100644
--- a/t/app/controller/admin/bodies.t
+++ b/t/app/controller/admin/bodies.t
@@ -142,7 +142,7 @@ subtest 'check open311 configuring' => sub {
     $mech->content_contains('Council contacts configured via Open311');
     $mech->content_contains('Values updated');
 
-    my $conf = FixMyStreet::App->model('DB::Body')->find( $body->id );
+    my $conf = FixMyStreet::DB->resultset('Body')->find( $body->id );
     is $conf->endpoint, 'http://example.com/open311', 'endpoint configured';
     is $conf->api_key, 'api key', 'api key configured';
     is $conf->jurisdiction, 'mySociety', 'jurisdiction configures';
@@ -162,7 +162,7 @@ subtest 'check open311 configuring' => sub {
 
     $mech->content_contains('Values updated');
 
-    $conf = FixMyStreet::App->model('DB::Body')->find( $body->id );
+    $conf = FixMyStreet::DB->resultset('Body')->find( $body->id );
     is $conf->endpoint, 'http://example.org/open311', 'endpoint updated';
     is $conf->api_key, 'new api key', 'api key updated';
     is $conf->jurisdiction, 'open311', 'jurisdiction configures';
@@ -184,7 +184,7 @@ subtest 'check open311 configuring' => sub {
 
     $mech->content_contains('Values updated');
 
-    $conf = FixMyStreet::App->model('DB::Body')->find( $body->id );
+    $conf = FixMyStreet::DB->resultset('Body')->find( $body->id );
     ok $conf->get_extra_metadata('fetch_all_problems'), 'fetch all problems set';
 
     $mech->form_number(3);
@@ -204,7 +204,7 @@ subtest 'check open311 configuring' => sub {
 
     $mech->content_contains('Values updated');
 
-    $conf = FixMyStreet::App->model('DB::Body')->find( $body->id );
+    $conf = FixMyStreet::DB->resultset('Body')->find( $body->id );
     ok !$conf->get_extra_metadata('fetch_all_problems'), 'fetch all problems unset';
 };
 
diff --git a/t/app/controller/admin/defecttypes.t b/t/app/controller/admin/defecttypes.t
index 12ae8948c..8589062db 100644
--- a/t/app/controller/admin/defecttypes.t
+++ b/t/app/controller/admin/defecttypes.t
@@ -107,7 +107,7 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => ['oxfordshire'], }, sub {
     };
 
     subtest 'check editing a defect type' => sub {
-        my $defect = FixMyStreet::App->model('DB::DefectType')->search( {
+        my $defect = FixMyStreet::DB->resultset('DefectType')->search( {
                 name => 'A defect',
                 body_id => $body->id
             } )->first;
@@ -126,7 +126,7 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => ['oxfordshire'], }, sub {
         $mech->content_lacks('A defect');
         $mech->content_contains('Updated defect');
 
-        my $defects = FixMyStreet::App->model('DB::DefectType')->search( {
+        my $defects = FixMyStreet::DB->resultset('DefectType')->search( {
             body_id => $body->id
         } );
 
@@ -134,7 +134,7 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => ['oxfordshire'], }, sub {
     };
 
     subtest 'check adding a category to a defect' => sub {
-        my $defect = FixMyStreet::App->model('DB::DefectType')->search( {
+        my $defect = FixMyStreet::DB->resultset('DefectType')->search( {
                 name => 'Updated defect',
                 body_id => $body->id
             } )->first;
@@ -163,7 +163,7 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => ['oxfordshire'], }, sub {
     };
 
     subtest 'check removing category from a defect' => sub {
-        my $defect = FixMyStreet::App->model('DB::DefectType')->search( {
+        my $defect = FixMyStreet::DB->resultset('DefectType')->search( {
                 name => 'Updated defect',
                 body_id => $body->id
             } )->first;
@@ -191,7 +191,7 @@ FixMyStreet::override_config { ALLOWED_COBRANDS => ['oxfordshire'], }, sub {
     };
 
     subtest 'check adding codes to a defect' => sub {
-        my $defect = FixMyStreet::App->model('DB::DefectType')->search( {
+        my $defect = FixMyStreet::DB->resultset('DefectType')->search( {
                 name => 'Updated defect',
                 body_id => $body->id
             } )->first;
diff --git a/t/app/controller/admin/report_edit.t b/t/app/controller/admin/report_edit.t
index 85f83781c..438bcc241 100644
--- a/t/app/controller/admin/report_edit.t
+++ b/t/app/controller/admin/report_edit.t
@@ -24,7 +24,7 @@ my $dt = DateTime->new(
     second => 23
 );
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode           => 'SW1A 1AA',
         bodies_str         => '2504',
@@ -52,7 +52,7 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
 
 $mech->log_in_ok( $superuser->email );
 
-my $log_entries = FixMyStreet::App->model('DB::AdminLog')->search(
+my $log_entries = FixMyStreet::DB->resultset('AdminLog')->search(
     {
         object_type => 'problem',
         object_id   => $report->id
@@ -511,7 +511,7 @@ subtest 'change email to new user' => sub {
         username => 'test3@example.com'
     };
 
-    my $user3 = FixMyStreet::App->model('DB::User')->find( { email => 'test3@example.com' } );
+    my $user3 = FixMyStreet::DB->resultset('User')->find( { email => 'test3@example.com' } );
 
     ok !$user3, 'user not in database';
 
@@ -530,7 +530,7 @@ subtest 'change email to new user' => sub {
     is $log_entries->first->action, 'edit', 'log action';
     is_deeply( $mech->visible_form_values(), $new_fields, 'changed form values' );
 
-    $user3 = FixMyStreet::App->model('DB::User')->find( { email => 'test3@example.com' } );
+    $user3 = FixMyStreet::DB->resultset('User')->find( { email => 'test3@example.com' } );
 
     $report->discard_changes;
 
@@ -541,7 +541,7 @@ subtest 'change email to new user' => sub {
 subtest 'adding email to abuse list from report page' => sub {
     my $email = $report->user->email;
 
-    my $abuse = FixMyStreet::App->model('DB::Abuse')->find( { email => $email } );
+    my $abuse = FixMyStreet::DB->resultset('Abuse')->find( { email => $email } );
     $abuse->delete if $abuse;
 
     $mech->get_ok( '/admin/report_edit/' . $report->id );
@@ -552,7 +552,7 @@ subtest 'adding email to abuse list from report page' => sub {
     $mech->content_contains('User added to abuse list');
     $mech->content_contains('<small>User in abuse table</small>');
 
-    $abuse = FixMyStreet::App->model('DB::Abuse')->find( { email => $email } );
+    $abuse = FixMyStreet::DB->resultset('Abuse')->find( { email => $email } );
     ok $abuse, 'entry created in abuse table';
 
     $mech->get_ok( '/admin/report_edit/' . $report->id );
@@ -619,7 +619,7 @@ subtest "Test alert count display" => sub {
     $mech->get_ok("/admin/report_edit/$report_id");
     $mech->content_contains('Alerts: 0');
 
-    my $alert = FixMyStreet::App->model('DB::Alert')->find_or_create(
+    my $alert = FixMyStreet::DB->resultset('Alert')->find_or_create(
         {
             alert_type => 'new_updates',
             parameter => $report_id,
@@ -641,7 +641,7 @@ subtest "Test alert count display" => sub {
     $alert->delete;
 };
 
-my $report2 = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report2 = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode           => 'SW1A 1AA',
         bodies_str         => '2504',
diff --git a/t/app/controller/admin/reportextrafields.t b/t/app/controller/admin/reportextrafields.t
index 1aa4c6a42..388cc3c95 100644
--- a/t/app/controller/admin/reportextrafields.t
+++ b/t/app/controller/admin/reportextrafields.t
@@ -168,7 +168,7 @@ FixMyStreet::override_config {
     subtest 'Create and update new ReportExtraFields' => sub {
         my $extra_fields = [];
 
-        my $model = FixMyStreet::App->model('DB::ReportExtraField');
+        my $model = FixMyStreet::DB->resultset('ReportExtraField');
         is $model->count, 0, 'no ReportExtraFields yet';
 
         $mech->get_ok("/admin/reportextrafields");
@@ -298,7 +298,7 @@ FixMyStreet::override_config {
     LANGUAGES => [ 'en-gb,English,en_GB' ]
 }, sub {
     subtest "Extra fields are missing from cobrand that doesn't allow them" => sub {
-        my $object = FixMyStreet::App->model('DB::ReportExtraField')->first;
+        my $object = FixMyStreet::DB->resultset('ReportExtraField')->first;
         $object->update({ language => "", cobrand => ""});
 
         $mech->get_ok("/report/new?longitude=-1.351488&latitude=51.847235&category=" . $contact->category);
@@ -307,7 +307,7 @@ FixMyStreet::override_config {
     };
 };
 
-FixMyStreet::App->model('DB::ReportExtraField')->delete_all;
+FixMyStreet::DB->resultset('ReportExtraField')->delete_all;
 $mech->log_out_ok;
 
 subtest 'Reports are created with correct extra metadata' => sub {
@@ -315,7 +315,7 @@ subtest 'Reports are created with correct extra metadata' => sub {
         ALLOWED_COBRANDS => [ 'tester' ],
         MAPIT_URL => 'http://mapit.uk/',
     }, sub {
-        my $model = FixMyStreet::App->model('DB::ReportExtraField');
+        my $model = FixMyStreet::DB->resultset('ReportExtraField');
         my $extra_fields = $model->find_or_create({
             name => "Test extra fields",
             language => "",
diff --git a/t/app/controller/admin/search.t b/t/app/controller/admin/search.t
index f8e70cb7a..d46843799 100644
--- a/t/app/controller/admin/search.t
+++ b/t/app/controller/admin/search.t
@@ -20,7 +20,7 @@ $mech->create_contact_ok( body_id => $oxford->id, category => 'Graffiti', email
 
 my $bromley = $mech->create_body_ok(2482, 'Bromley Council');
 
-my $user3 = FixMyStreet::App->model('DB::User')->create( { email => 'test3@example.com' } );
+my $user3 = FixMyStreet::DB->resultset('User')->create( { email => 'test3@example.com' } );
 
 my $dt = DateTime->new(
     year   => 2011,
@@ -31,7 +31,7 @@ my $dt = DateTime->new(
     second => 23
 );
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode           => 'SW1A 1AA',
         bodies_str         => '2504',
@@ -68,7 +68,7 @@ subtest 'show flagged entries' => sub {
     $mech->content_contains( $report->title );
 };
 
-my $update = FixMyStreet::App->model('DB::Comment')->create(
+my $update = FixMyStreet::DB->resultset('Comment')->create(
     {
         text => 'this is an update',
         user => $user,
diff --git a/t/app/controller/admin/templates.t b/t/app/controller/admin/templates.t
index 39903deb1..e9fefbdd7 100644
--- a/t/app/controller/admin/templates.t
+++ b/t/app/controller/admin/templates.t
@@ -19,7 +19,7 @@ my $dt = DateTime->new(
     second => 23
 );
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode           => 'SW1A 1AA',
         bodies_str         => '2504',
diff --git a/t/app/controller/admin/triage.t b/t/app/controller/admin/triage.t
index 6c84d1ff4..6e134ff67 100644
--- a/t/app/controller/admin/triage.t
+++ b/t/app/controller/admin/triage.t
@@ -75,7 +75,7 @@ FixMyStreet::override_config {
         my $report_url = '/report/' . $report->id;
         $mech->get_ok($report_url);
 
-        my $alert = FixMyStreet::App->model('DB::Alert')->create(
+        my $alert = FixMyStreet::DB->resultset('Alert')->create(
             {
                 user       => $user2,
                 alert_type => 'new_updates',
diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t
index 95aac051d..e732f0edd 100644
--- a/t/app/controller/admin/users.t
+++ b/t/app/controller/admin/users.t
@@ -16,7 +16,7 @@ my $southend = $mech->create_body_ok(2607, 'Southend-on-Sea Borough Council');
 $mech->log_in_ok( $superuser->email );
 
 subtest 'search abuse' => sub {
-    my $abuse = FixMyStreet::App->model('DB::Abuse')->find_or_create( { email => $user->email } );
+    my $abuse = FixMyStreet::DB->resultset('Abuse')->find_or_create( { email => $user->email } );
     $mech->get_ok( '/admin/users?search=example' );
     $mech->content_like(qr{test\@example.com.*</td>\s*<td>.*?</td>\s*<td>User in abuse table}s);
 };
@@ -27,26 +27,26 @@ subtest 'remove user from abuse list from edit user page' => sub {
 
     $mech->click_ok('unban');
 
-    my $abuse = FixMyStreet::App->model('DB::Abuse')->find( { email => $user->email } );
+    my $abuse = FixMyStreet::DB->resultset('Abuse')->find( { email => $user->email } );
     ok !$abuse, 'record removed from abuse table';
 };
 
 subtest 'remove user with phone account from abuse list from edit user page' => sub {
     my $abuse_user = $mech->create_user_ok('01234 456789');
-    my $abuse = FixMyStreet::App->model('DB::Abuse')->find_or_create( { email => $abuse_user->phone } );
+    my $abuse = FixMyStreet::DB->resultset('Abuse')->find_or_create( { email => $abuse_user->phone } );
     $mech->get_ok( '/admin/users/' . $abuse_user->id );
     $mech->content_contains('User in abuse table');
-    my $abuse_found = FixMyStreet::App->model('DB::Abuse')->find( { email => $abuse_user->phone } );
+    my $abuse_found = FixMyStreet::DB->resultset('Abuse')->find( { email => $abuse_user->phone } );
     ok $abuse_found, 'user in abuse table';
 
     $mech->click_ok('unban');
 
-    $abuse = FixMyStreet::App->model('DB::Abuse')->find( { email => $user->phone } );
+    $abuse = FixMyStreet::DB->resultset('Abuse')->find( { email => $user->phone } );
     ok !$abuse, 'record removed from abuse table';
 };
 
 subtest 'no option to remove user already in abuse list' => sub {
-    my $abuse = FixMyStreet::App->model('DB::Abuse')->find( { email => $user->email } );
+    my $abuse = FixMyStreet::DB->resultset('Abuse')->find( { email => $user->email } );
     $abuse->delete if $abuse;
     $mech->get_ok( '/admin/users/' . $user->id );
     $mech->content_lacks('User in abuse table');
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 7318d5c65..90f043935 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -1,5 +1,4 @@
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 use FixMyStreet::Script::Alerts;
 
 my $mech = FixMyStreet::TestMech->new;
@@ -64,7 +63,7 @@ foreach my $test (
         my $type = $test->{type};
 
         my $user =
-          FixMyStreet::App->model('DB::User')
+          FixMyStreet::DB->resultset('User')
           ->find( { email => $test->{email} } );
 
         # we don't want an alert
@@ -76,12 +75,12 @@ foreach my $test (
         $mech->content_contains( $test->{content} );
 
         $user =
-          FixMyStreet::App->model('DB::User')
+          FixMyStreet::DB->resultset('User')
           ->find( { email => $test->{email} } );
 
         ok $user, 'user created for alert';
 
-        my $alert = FixMyStreet::App->model('DB::Alert')->find(
+        my $alert = FixMyStreet::DB->resultset('Alert')->find(
             {
                 user       => $user,
                 alert_type => $type,
@@ -101,7 +100,7 @@ foreach my $test (
         my ($url_token) = $url =~ m{/A/(\S+)};
         ok $url, "extracted confirm url '$url'";
 
-        my $token = FixMyStreet::App->model('DB::Token')->find(
+        my $token = FixMyStreet::DB->resultset('Token')->find(
             {
                 token => $url_token,
                 scope => 'alert'
@@ -121,7 +120,7 @@ foreach my $test (
         ($url_token) = $url =~ m{/A/(\S+)};
         ok $url_token ne $existing_token, 'sent out a new token';
 
-        $token = FixMyStreet::App->model('DB::Token')->find(
+        $token = FixMyStreet::DB->resultset('Token')->find(
             {
                 token => $url_token,
                 scope => 'alert'
@@ -135,7 +134,7 @@ foreach my $test (
         $mech->content_contains('alert created');
 
         $alert =
-          FixMyStreet::App->model('DB::Alert')->find( { id => $existing_id, } );
+          FixMyStreet::DB->resultset('Alert')->find( { id => $existing_id, } );
 
         ok $alert->confirmed, 'alert set to confirmed';
         $mech->delete_user($user);
@@ -154,7 +153,7 @@ foreach my $test (
 
         my $user = $mech->create_user_ok('test-new@example.com');
 
-        my $alert = FixMyStreet::App->model('DB::Alert')->find(
+        my $alert = FixMyStreet::DB->resultset('Alert')->find(
             {
                 user       => $user,
                 alert_type => $type
@@ -165,7 +164,7 @@ foreach my $test (
 
         $mech->get_ok( '/alert/subscribe?type=local&rznvy=' . $user->email . '&feed=area:1000:A_Location&token=' . $csrf );
 
-        $alert = FixMyStreet::App->model('DB::Alert')->find(
+        $alert = FixMyStreet::DB->resultset('Alert')->find(
             {
                 user       => $user,
                 alert_type => $type,
@@ -206,7 +205,7 @@ foreach my $test (
         $mech->clear_emails_ok;
 
         FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+            ALLOWED_COBRANDS => 'fixmystreet',
             MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->get_ok('/alert/list?pc=EH11BB');
@@ -214,7 +213,7 @@ foreach my $test (
         $mech->set_visible( [ radio => 'council:' . $body->id . ':City_of_Edinburgh' ] );
         $mech->click('alert');
 
-        my $alert = FixMyStreet::App->model('DB::Alert')->find(
+        my $alert = FixMyStreet::DB->resultset('Alert')->find(
             {
                 user       => $user,
                 alert_type => $type,
@@ -247,7 +246,7 @@ for my $test (
         my $type = $test->{type};
 
         my $user =
-          FixMyStreet::App->model('DB::User')
+          FixMyStreet::DB->resultset('User')
           ->find( { email => $test->{email} } );
 
         # we don't want an alert
@@ -257,19 +256,19 @@ for my $test (
         }
 
         my $abuse =
-          FixMyStreet::App->model('DB::Abuse')
+          FixMyStreet::DB->resultset('Abuse')
           ->find_or_create( { email => $test->{email} } );
 
         $mech->get_ok( $test->{uri} . "&token=$csrf" );
         $mech->content_contains( $test->{content} );
 
         $user =
-          FixMyStreet::App->model('DB::User')
+          FixMyStreet::DB->resultset('User')
           ->find( { email => $test->{email} } );
 
         ok $user, 'user created for alert';
 
-        $alert = FixMyStreet::App->model('DB::Alert')->find(
+        $alert = FixMyStreet::DB->resultset('Alert')->find(
             {
                 user       => $user,
                 alert_type => $type,
@@ -310,7 +309,7 @@ subtest "Test two-tier council alerts" => sub {
         },
     ) {
         FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+            ALLOWED_COBRANDS => 'fixmystreet',
             MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->get_ok( '/alert/list?pc=GL502PR' );
@@ -345,7 +344,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
     ) {
         $mech->get_ok( '/alert' );
         FixMyStreet::override_config {
-            ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+            ALLOWED_COBRANDS => 'fixmystreet',
             MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => 'EH11BB' } } );
@@ -358,7 +357,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
             my $url = $mech->get_link_from_email;
             my ($url_token) = $url =~ m{/A/(\S+)};
             $mech->clear_emails_ok;
-            my $token = FixMyStreet::App->model('DB::Token')->find( { token => $url_token, scope => 'alert' } );
+            my $token = FixMyStreet::DB->resultset('Token')->find( { token => $url_token, scope => 'alert' } );
             $mech->get_ok( $url );
             $mech->content_contains('alert created');
         } else {
@@ -449,14 +448,14 @@ subtest "Test alerts are not sent for no-text updates" => sub {
     ok $report2, "created test report - $report2_id";
 
     # Must be first
-    my $alert2 = FixMyStreet::App->model('DB::Alert')->create( {
+    my $alert2 = FixMyStreet::DB->resultset('Alert')->create( {
         parameter  => $report2_id,
         alert_type => 'new_updates',
         user       => $user2,
     } )->confirm;
     ok $alert2, 'created alert for other user';
 
-    my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->create( {
         parameter  => $report_id,
         alert_type => 'new_updates',
         user       => $user2,
@@ -492,7 +491,7 @@ subtest "Test no marked as confirmed added to alerts" => sub {
     my $report_id = $report->id;
     ok $report, "created test report - $report_id";
 
-    my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->create( {
         parameter  => $report_id,
         alert_type => 'new_updates',
         user       => $user2,
@@ -552,7 +551,7 @@ for my $test (
         my $report_id = $report->id;
         ok $report, "created test report - $report_id";
 
-        my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+        my $alert = FixMyStreet::DB->resultset('Alert')->create( {
             parameter  => $report_id,
             alert_type => 'new_updates',
             user       => $user2,
@@ -597,7 +596,7 @@ subtest "Test signature template is used from cobrand" => sub {
     my $report_id = $report->id;
     ok $report, "created test report - $report_id";
 
-    my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->create( {
         parameter  => $report_id,
         alert_type => 'new_updates',
         user       => $user1,
@@ -611,9 +610,9 @@ subtest "Test signature template is used from cobrand" => sub {
     $mech->clear_emails_ok;
     FixMyStreet::override_config {
         MAPIT_URL => 'http://mapit.uk/',
-        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+        ALLOWED_COBRANDS => 'fixmystreet',
     }, sub {
-        FixMyStreet::App->model('DB::AlertType')->email_alerts();
+        FixMyStreet::DB->resultset('AlertType')->email_alerts();
     };
 
     my $email = $mech->get_text_body_from_email;
@@ -628,9 +627,9 @@ subtest "Test signature template is used from cobrand" => sub {
     $mech->clear_emails_ok;
     FixMyStreet::override_config {
         MAPIT_URL => 'http://mapit.uk/',
-        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+        ALLOWED_COBRANDS => 'fixmystreet',
     }, sub {
-        FixMyStreet::App->model('DB::AlertType')->email_alerts();
+        FixMyStreet::DB->resultset('AlertType')->email_alerts();
     };
 
     $email = $mech->get_text_body_from_email;
@@ -686,7 +685,7 @@ for my $test (
         $alert_params->{whensubscribed} = $dt;
         $alert_params->{confirmed} = 1;
 
-        my $alert_user1 = FixMyStreet::App->model('DB::Alert')->create( $alert_params );
+        my $alert_user1 = FixMyStreet::DB->resultset('Alert')->create( $alert_params );
         ok $alert_user1, "alert created";
 
         my ($report) = $mech->create_problems_for_body(1, $body->id, 'Testing', {
@@ -703,7 +702,7 @@ for my $test (
         FixMyStreet::override_config {
             MAPIT_URL => 'http://mapit.uk/',
         }, sub {
-            FixMyStreet::App->model('DB::AlertType')->email_alerts();
+            FixMyStreet::DB->resultset('AlertType')->email_alerts();
         };
         $mech->email_count_is(0);
 
@@ -711,7 +710,7 @@ for my $test (
         FixMyStreet::override_config {
             MAPIT_URL => 'http://mapit.uk/',
         }, sub {
-            FixMyStreet::App->model('DB::AlertType')->email_alerts();
+            FixMyStreet::DB->resultset('AlertType')->email_alerts();
         };
         my $email = $mech->get_text_body_from_email;
         like $email, qr/Alert\s+test\s+for\s+non\s+public\s+reports/, 'alert contains public report';
@@ -736,7 +735,7 @@ subtest 'check new updates alerts for non public reports only go to report owner
 
     $mech->create_comment_for_problem($report, $user3, 'Anonymous User', 'This is some more update text', 't', 'confirmed', undef, { confirmed  => $r_dt->clone->add( minutes => 8 ) });
 
-    my $alert_user1 = FixMyStreet::App->model('DB::Alert')->create( {
+    my $alert_user1 = FixMyStreet::DB->resultset('Alert')->create( {
             user       => $user1,
             alert_type => 'new_updates',
             parameter  => $report->id,
@@ -746,10 +745,10 @@ subtest 'check new updates alerts for non public reports only go to report owner
     ok $alert_user1, "alert created";
 
     $mech->clear_emails_ok;
-    FixMyStreet::App->model('DB::AlertType')->email_alerts();
+    FixMyStreet::DB->resultset('AlertType')->email_alerts();
     $mech->email_count_is(0);
 
-    my $alert_user2 = FixMyStreet::App->model('DB::Alert')->create( {
+    my $alert_user2 = FixMyStreet::DB->resultset('Alert')->create( {
             user       => $user2,
             alert_type => 'new_updates',
             parameter  => $report->id,
@@ -758,13 +757,13 @@ subtest 'check new updates alerts for non public reports only go to report owner
     } );
     ok $alert_user2, "alert created";
 
-    FixMyStreet::App->model('DB::AlertType')->email_alerts();
+    FixMyStreet::DB->resultset('AlertType')->email_alerts();
     my $email = $mech->get_text_body_from_email;
     like $email, qr/This is some more update text/, 'alert contains update text';
 
     $mech->clear_emails_ok;
     $report->update( { non_public => 0 } );
-    FixMyStreet::App->model('DB::AlertType')->email_alerts();
+    FixMyStreet::DB->resultset('AlertType')->email_alerts();
     $email = $mech->get_text_body_from_email;
     like $email, qr/This is some more update text/, 'alert contains update text';
 
@@ -792,7 +791,7 @@ subtest 'check setting include dates in new updates cobrand option' => sub {
 
     my $update = $mech->create_comment_for_problem($report, $user3, 'Anonymous User', 'This is some more update text', 't', 'confirmed', undef, { confirmed  => $r_dt });
 
-    my $alert_user1 = FixMyStreet::App->model('DB::Alert')->create( {
+    my $alert_user1 = FixMyStreet::DB->resultset('Alert')->create( {
             user       => $user1,
             alert_type => 'new_updates',
             parameter  => $report->id,
@@ -803,7 +802,7 @@ subtest 'check setting include dates in new updates cobrand option' => sub {
 
 
     $mech->clear_emails_ok;
-    FixMyStreet::App->model('DB::AlertType')->email_alerts();
+    FixMyStreet::DB->resultset('AlertType')->email_alerts();
 
     my $date_in_alert = Utils::prettify_dt( $update->confirmed );
     my $email = $mech->get_text_body_from_email;
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 7f88b13c1..a9c008c9d 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -290,7 +290,7 @@ subtest 'check old problems not shown by default on around page' => sub {
     my $pins = $json->{pins};
     is scalar @$pins, 9, 'correct number of reports when no age';
 
-    my $problems = FixMyStreet::App->model('DB::Problem')->to_body( $body->id );
+    my $problems = FixMyStreet::DB->resultset('Problem')->to_body( $body->id );
     $problems->first->update( { confirmed => \"current_timestamp-'7 months'::interval" } );
 
     $json = $mech->get_ok_json( '/around?ajax=1&bbox=' . $bbox );
@@ -313,7 +313,7 @@ subtest 'check sorting by update uses lastupdate to determine age' => sub {
     my $bbox = ($params->{longitude} - 0.01) . ',' .  ($params->{latitude} - 0.01)
                 . ',' . ($params->{longitude} + 0.01) . ',' .  ($params->{latitude} + 0.01);
 
-    my $problems = FixMyStreet::App->model('DB::Problem')->to_body( $body->id );
+    my $problems = FixMyStreet::DB->resultset('Problem')->to_body( $body->id );
     $problems->first->update( { confirmed => \"current_timestamp-'7 months'::interval" } );
 
     my $json = $mech->get_ok_json( '/around?ajax=1&bbox=' . $bbox );
@@ -336,7 +336,7 @@ subtest 'check show old reports checkbox shown on around page' => sub {
         $mech->get_ok( '/around?pc=OX20+1SZ' );
         $mech->content_contains('id="show_old_reports_wrapper" class="report-list-filters hidden"');
 
-        my $problems = FixMyStreet::App->model('DB::Problem')->to_body( $body->id );
+        my $problems = FixMyStreet::DB->resultset('Problem')->to_body( $body->id );
         $problems->first->update( { confirmed => \"current_timestamp-'7 months'::interval" } );
 
         $mech->get_ok( '/around?pc=OX20+1SZ&status=all' );
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 7b74a025f..20bc5595c 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -89,7 +89,7 @@ $mech->not_logged_in_ok;
 
     # check that the user does not exist
     sub get_user {
-        FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     }
     ok !get_user(), "no user exists";
 
@@ -164,7 +164,7 @@ subtest "sign in with uppercase email" => sub {
     $mech->content_contains($test_email);
     $mech->content_lacks($uc_test_email);
 
-    my $count = FixMyStreet::App->model('DB::User')->search( { email => $uc_test_email } )->count;
+    my $count = FixMyStreet::DB->resultset('User')->search( { email => $uc_test_email } )->count;
     is $count, 0, "uppercase user wasn't created";
 };
 
@@ -188,7 +188,7 @@ FixMyStreet::override_config {
 
         ok $mech->email_count_is(0);
 
-        my $count = FixMyStreet::App->model('DB::User')->search( { email => $test_email3 } )->count;
+        my $count = FixMyStreet::DB->resultset('User')->search( { email => $test_email3 } )->count;
         is $count, 0, "no user exists";
     };
 
@@ -239,7 +239,7 @@ subtest "check logging in with token" => sub {
     $mech->log_out_ok;
     $mech->not_logged_in_ok;
 
-    my $user =  FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user =  FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     # token needs to be 18 characters
     $user->set_extra_metadata('access_token', '1234567890abcdefgh');
     $user->update();
@@ -300,7 +300,7 @@ subtest "Test two-factor authentication login" => sub {
     my $code = $auth->code;
     my $wrong_code = $auth->code(undef, time() - 120);
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     $user->password('password');
     $user->set_extra_metadata('2fa_secret', $auth->secret32);
     $user->update;
@@ -320,7 +320,7 @@ subtest "Test enforced two-factor authentication" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => 'dummy',
     }, sub {
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         $user->unset_extra_metadata('2fa_secret');
         $user->update;
 
@@ -355,7 +355,7 @@ subtest "Test enforced two-factor authentication, no password yet set" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => 'dummy',
     }, sub {
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         $user->unset_extra_metadata('2fa_secret');
         $user->update;
 
@@ -395,7 +395,7 @@ subtest "Check two-factor log in by email works" => sub {
     my $auth = Auth::GoogleAuth->new;
     my $code = $auth->code;
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     $user->set_extra_metadata('2fa_secret', $auth->secret32);
     $user->update;
 
@@ -417,7 +417,7 @@ FixMyStreet::override_config {
     ALLOWED_COBRANDS => 'expiring'
 }, sub {
     subtest 'Password expiry' => sub {
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         $user->set_extra_metadata('last_password_change', time() - 200000);
         $user->unset_extra_metadata('2fa_secret');
         $user->update;
diff --git a/t/app/controller/auth_phone.t b/t/app/controller/auth_phone.t
index dea1c3493..e5f49ed19 100644
--- a/t/app/controller/auth_phone.t
+++ b/t/app/controller/auth_phone.t
@@ -60,7 +60,7 @@ FixMyStreet::override_config {
             with_fields => { code => $code }
         }, 'submit correct code');
 
-        my $user = FixMyStreet::App->model('DB::User')->find( { phone => '+18165550100' } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { phone => '+18165550100' } );
         ok $user, "user created";
         is $mech->uri->path, '/my', "redirected to the 'my' section of site";
         $mech->logged_in_ok;
diff --git a/t/app/controller/auth_profile.t b/t/app/controller/auth_profile.t
index 4b7db19b5..e5dfe2764 100644
--- a/t/app/controller/auth_profile.t
+++ b/t/app/controller/auth_profile.t
@@ -73,7 +73,7 @@ subtest "Test change password page" => sub {
         $mech->content_contains( $test->{err}, "found expected error" );
     }
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     ok $user, "got a user";
     ok !$user->password, "user has no password";
 
@@ -133,7 +133,7 @@ subtest "Test change password page with current password" => sub {
         $mech->content_contains( $test->{err}, "found expected error" );
     }
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     ok $user, "got a user";
 
     $mech->get_ok('/auth/change_password');
@@ -186,12 +186,12 @@ subtest "Test change email page" => sub {
     $mech->get_ok($link);
     is $mech->uri->path, '/my', "redirected to /my page";
     $mech->content_contains('successfully confirmed');
-    ok(FixMyStreet::App->model('DB::User')->find( { email => $test_email2 } ), "got a user");
+    ok(FixMyStreet::DB->resultset('User')->find( { email => $test_email2 } ), "got a user");
 
     my $p = FixMyStreet::DB->resultset("Problem")->first;
     is $p->user->email, $test_email2, 'problem user updated';
 
-    my $user1 = FixMyStreet::App->model('DB::User')->create( { email => $test_email, email_verified => 1 } );
+    my $user1 = FixMyStreet::DB->resultset('User')->create( { email => $test_email, email_verified => 1 } );
     ok($user1, "created old user");
     $mech->create_problems_for_body(1, 2514, 'Title1', { user => $user1 } );
 
@@ -229,7 +229,7 @@ my $test_landline = '01214960000';
 my $test_mobile = '+61491570156';
 my $test_mobile2 = '+61491570157';
 
-my $user_mob2 = FixMyStreet::App->model('DB::User')->create( {
+my $user_mob2 = FixMyStreet::DB->resultset('User')->create( {
     phone => $test_mobile,
     phone_verified => 1,
     name => 'Aus Mobile user',
@@ -291,7 +291,7 @@ subtest "Test add/verify/change phone page" => sub {
         with_fields => { code => $code }
     }, 'submit correct code');
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { phone => $test_mobile } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { phone => $test_mobile } );
     ok $user, "user exists";
     is $user->email_verified, 1;
     is $user->email, $test_email, 'email still same';
@@ -327,9 +327,9 @@ subtest "Test change phone to existing account" => sub {
     my $code = $twilio->get_text_code;
     $mech->submit_form_ok({ with_fields => { code => $code } }, 'submit correct code');
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { phone => $test_mobile } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { phone => $test_mobile } );
     ok !$user, 'old user does not exist';
-    $user = FixMyStreet::App->model('DB::User')->find( { phone => $test_mobile2 } );
+    $user = FixMyStreet::DB->resultset('User')->find( { phone => $test_mobile2 } );
     ok $user, "new mobile user exists";
     is $user->email_verified, 1;
     is $user->email, $test_email, 'email still same';
@@ -342,7 +342,7 @@ subtest "Test change phone to existing account" => sub {
 };
 
 subtest "Test superuser can access generate token page" => sub {
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     ok $user->update({ is_superuser => 0 }), 'user not superuser';
 
     $mech->log_out_ok;
@@ -369,7 +369,7 @@ subtest "Test superuser can access generate token page" => sub {
 my $body = $mech->create_body_ok(2237, 'Oxfordshire');
 
 subtest "Test staff user can access generate token page" => sub {
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     ok $user->update({ is_superuser => 0 }), 'user not superuser';
 
     $mech->log_out_ok;
@@ -394,7 +394,7 @@ subtest "Test staff user can access generate token page" => sub {
 };
 
 subtest "Test generate token page" => sub {
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     ok $user->update({ is_superuser => 1 }), 'user set to superuser';
 
     $mech->log_out_ok;
@@ -482,7 +482,7 @@ subtest "Test enforced two-factor authentication" => sub {
         my $code = $auth->code;
 
         # Sign in with 2FA
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         $user->password('password');
         $user->set_extra_metadata('2fa_secret', $auth->secret32);
         $user->update;
diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t
index d0ee4e148..200863029 100644
--- a/t/app/controller/auth_social.t
+++ b/t/app/controller/auth_social.t
@@ -115,9 +115,9 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                 $mech->delete_user($test->{email});
             }
             if ($page eq 'my' && $state eq 'existing UID') {
-                $report->update({ user_id => FixMyStreet::App->model( 'DB::User' )->find( { email => $test->{email} } )->id });
+                $report->update({ user_id => FixMyStreet::DB->resultset( 'User' )->find( { email => $test->{email} } )->id });
             } else {
-                $report->update({ user_id => FixMyStreet::App->model( 'DB::User' )->find( { email => $test_email } )->id });
+                $report->update({ user_id => FixMyStreet::DB->resultset( 'User' )->find( { email => $test_email } )->id });
             }
 
             # Set up a mock to catch (most, see below) requests to the OAuth API
@@ -198,7 +198,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                 $mech->clear_emails_ok;
                 ok $url, "extracted confirm url '$url'";
 
-                my $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $test->{email} } );
+                my $user = FixMyStreet::DB->resultset( 'User' )->find( { email => $test->{email} } );
                 if ($page eq 'my') {
                     is $user, undef, 'No user yet exists';
                 } else {
@@ -209,7 +209,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                     }
                 }
                 $mech->get_ok( $url );
-                $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $test->{email} } );
+                $user = FixMyStreet::DB->resultset( 'User' )->find( { email => $test->{email} } );
                 if ($test->{type} eq 'facebook') {
                     is $user->facebook_id, $test->{uid}, 'User now has correct facebook ID';
                 } elsif ($test->{type} eq 'oidc') {
@@ -227,7 +227,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
                 $mech->content_contains('You have successfully signed in; please check and confirm your details are accurate');
                 $mech->logged_in_ok;
                 if ($test->{user_extras}) {
-                    my $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $test->{email} } );
+                    my $user = FixMyStreet::DB->resultset( 'User' )->find( { email => $test->{email} } );
                     for my $extra (@{ $test->{user_extras} }) {
                         my ($k, $v) = @$extra;
                         is $user->get_extra_metadata($k), $v, "User has correct $k extra field";
@@ -236,7 +236,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
             } else {
                 is $mech->uri->path, '/my', 'Successfully on /my page';
                 if ($test->{user_extras}) {
-                    my $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $test->{email} } );
+                    my $user = FixMyStreet::DB->resultset( 'User' )->find( { email => $test->{email} } );
                     for my $extra (@{ $test->{user_extras} }) {
                         my ($k, $v) = @$extra;
                         is $user->get_extra_metadata($k), $v, "User has correct $k extra field";
@@ -365,14 +365,14 @@ for my $tw_state ( 'refused', 'existing UID', 'no email' ) {
                 $mech->clear_emails_ok;
                 ok $url, "extracted confirm url '$url'";
 
-                my $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $tw_email } );
+                my $user = FixMyStreet::DB->resultset( 'User' )->find( { email => $tw_email } );
                 if ($page eq 'my') {
                     is $user, undef, 'No user yet exists';
                 } else {
                     is $user->twitter_id, undef, 'User has no twitter ID';
                 }
                 $mech->get_ok( $url );
-                $user = FixMyStreet::App->model( 'DB::User' )->find( { email => $tw_email } );
+                $user = FixMyStreet::DB->resultset( 'User' )->find( { email => $tw_email } );
                 is $user->twitter_id, $tw_uid, 'User now has correct twitter ID';
 
             } elsif ($page ne 'my') {
diff --git a/t/app/controller/contact.t b/t/app/controller/contact.t
index 5b0fd2581..d6e56e7cc 100644
--- a/t/app/controller/contact.t
+++ b/t/app/controller/contact.t
@@ -114,7 +114,7 @@ for my $test (
     subtest 'check reporting a problem displays correctly' => sub {
         my $user = $mech->create_user_ok($test->{email}, name => $test->{name});
 
-        my $problem = FixMyStreet::App->model('DB::Problem')->create(
+        my $problem = FixMyStreet::DB->resultset('Problem')->create(
             {
                 title     => $test->{title},
                 detail    => $test->{detail},
@@ -138,7 +138,7 @@ for my $test (
             my $update_user = $mech->create_user_ok($update_info->{email},
                 name => $update_info->{name});
 
-            $update = FixMyStreet::App->model('DB::Comment')->create(
+            $update = FixMyStreet::DB->resultset('Comment')->create(
                 {
                     problem_id => $update_info->{other_problem} ? $problem_main->id : $problem->id,
                     user        => $update_user,
@@ -346,7 +346,7 @@ for my $test (
             name => $test->{fields}->{name}
         );
 
-        my $older_unhidden_problem = FixMyStreet::App->model('DB::Problem')->create(
+        my $older_unhidden_problem = FixMyStreet::DB->resultset('Problem')->create(
             {
                 title     => 'Some problem or other',
                 detail    => 'More detail on the problem',
@@ -363,7 +363,7 @@ for my $test (
             }
         );
 
-        my $newer_hidden_problem = FixMyStreet::App->model('DB::Problem')->create(
+        my $newer_hidden_problem = FixMyStreet::DB->resultset('Problem')->create(
             {
                 title     => 'A hidden problem',
                 detail    => 'Shhhh secret',
@@ -557,7 +557,7 @@ subtest 'check can limit contact to abuse reports' => sub {
         is $mech->res->code, 404, 'cannot visit contact page';
         $mech->get_ok( '/contact?id=' . $problem_main->id, 'can visit for abuse report' );
 
-        my $token = FixMyStreet::App->model("DB::Token")->create({
+        my $token = FixMyStreet::DB->resultset("Token")->create({
             scope => 'moderation',
             data => { id => $problem_main->id }
         });
@@ -578,7 +578,7 @@ subtest 'check redirected to correct form for general enquiries cobrand' => sub
 
         $mech->get_ok( '/contact?id=' . $problem_main->id, 'can visit for abuse report' );
 
-        my $token = FixMyStreet::App->model("DB::Token")->create({
+        my $token = FixMyStreet::DB->resultset("Token")->create({
             scope => 'moderation',
             data => { id => $problem_main->id }
         });
diff --git a/t/app/controller/contact_enquiry.t b/t/app/controller/contact_enquiry.t
index aca4b6de4..af249ec6c 100644
--- a/t/app/controller/contact_enquiry.t
+++ b/t/app/controller/contact_enquiry.t
@@ -64,7 +64,7 @@ FixMyStreet::override_config {
     };
 
     subtest 'Enquiry can be submitted when logged out' => sub {
-        my $problems = FixMyStreet::App->model('DB::Problem')->to_body( $body->id );
+        my $problems = FixMyStreet::DB->resultset('Problem')->to_body( $body->id );
 
         $mech->get_ok( '/contact/enquiry' );
         $mech->submit_form_ok( {
@@ -94,7 +94,7 @@ FixMyStreet::override_config {
     };
 
     subtest 'Enquiry can be submitted when logged in' => sub {
-        my $problems = FixMyStreet::App->model('DB::Problem')->to_body( $body->id );
+        my $problems = FixMyStreet::DB->resultset('Problem')->to_body( $body->id );
         my $prob_user = $problems->first->user;
         $problems->delete_all;
 
@@ -129,7 +129,7 @@ FixMyStreet::override_config {
     };
 
     subtest 'User name not changed if logged out when making report' => sub {
-        my $problems = FixMyStreet::App->model('DB::Problem')->to_body( $body->id );
+        my $problems = FixMyStreet::DB->resultset('Problem')->to_body( $body->id );
         my $user = $problems->first->user;
         $problems->delete_all;
 
@@ -188,7 +188,7 @@ FixMyStreet::override_config {
     my $image_hash = '74e3362283b6ef0c48686fb0e161da4043bbcc97.jpeg';
 
     subtest "Check photo & file upload works" => sub {
-        my $problems = FixMyStreet::App->model('DB::Problem')->to_body( $body->id );
+        my $problems = FixMyStreet::DB->resultset('Problem')->to_body( $body->id );
         $problems->delete_all;
 
 
diff --git a/t/app/controller/index.t b/t/app/controller/index.t
index 3f3aed48e..56f91ded7 100644
--- a/t/app/controller/index.t
+++ b/t/app/controller/index.t
@@ -58,7 +58,7 @@ subtest "does pc, (x,y), (e,n) or (lat,lon) go to /around" => sub {
     }
 };
 
-my $problem_rs = FixMyStreet::App->model('DB::Problem');
+my $problem_rs = FixMyStreet::DB->resultset('Problem');
 my $num = $problem_rs->count;
 
 my @edinburgh_problems = $mech->create_problems_for_body(5, 2651, 'Front page');
diff --git a/t/app/controller/my.t b/t/app/controller/my.t
index 8b4a25c26..673addf0c 100644
--- a/t/app/controller/my.t
+++ b/t/app/controller/my.t
@@ -23,7 +23,7 @@ $mech->content_lacks('Another Title');
 my @update;
 my $i = 0;
 foreach ($user, $user, $other_user) {
-    $update[$i] = FixMyStreet::App->model('DB::Comment')->create({
+    $update[$i] = FixMyStreet::DB->resultset('Comment')->create({
         text => 'this is an update',
         user => $_,
         state => 'confirmed',
diff --git a/t/app/controller/photo.t b/t/app/controller/photo.t
index e1bf35fcf..8884d432c 100644
--- a/t/app/controller/photo.t
+++ b/t/app/controller/photo.t
@@ -1,5 +1,4 @@
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 use Web::Scraper;
 use Path::Tiny;
 use File::Temp 'tempdir';
diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t
index 05aed7262..b561b271a 100644
--- a/t/app/controller/questionnaire.t
+++ b/t/app/controller/questionnaire.t
@@ -1,7 +1,6 @@
 use DateTime;
 
 use FixMyStreet::TestMech;
-use FixMyStreet::App::Controller::Questionnaire;
 
 ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
 
@@ -12,7 +11,7 @@ my $report_time = $dt->ymd . ' ' . $dt->hms;
 my $sent = $dt->add( minutes => 5 );
 my $sent_time = $sent->ymd . ' ' . $sent->hms;
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode           => 'EH1 1BB',
         bodies_str         => '2651',
@@ -47,7 +46,7 @@ foreach my $state (
     subtest "questionnaire not sent for $state state" => sub {
         $report->update( { send_questionnaire => 1, state => $state } );
         $report->questionnaires->delete;
-        FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires( {
+        FixMyStreet::DB->resultset('Questionnaire')->send_questionnaires( {
             site => 'fixmystreet'
         } );
 
@@ -61,7 +60,7 @@ $report->update( { send_questionnaire => 1, state => 'confirmed' } );
 $report->questionnaires->delete;
 
 # Call the questionaire sending function...
-FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires( {
+FixMyStreet::DB->resultset('Questionnaire')->send_questionnaires( {
     site => 'fixmystreet'
 } );
 my $email = $mech->get_email;
@@ -80,12 +79,12 @@ $mech->clear_emails_ok;
 $report->discard_changes;
 is $report->send_questionnaire, 0;
 
-$token = FixMyStreet::App->model("DB::Token")->find( {
+$token = FixMyStreet::DB->resultset("Token")->find( {
     scope => 'questionnaire', token => $token
 } );
 ok $token, 'found token for questionnaire';
 
-my $questionnaire = FixMyStreet::App->model('DB::Questionnaire')->find( {
+my $questionnaire = FixMyStreet::DB->resultset('Questionnaire')->find( {
     id => $token->data
 } );
 ok $questionnaire, 'found questionnaire';
@@ -317,7 +316,7 @@ foreach my $test (
         is $questionnaire->new_state, $result;
         is $questionnaire->ever_reported, $test->{fields}{reported} eq 'Yes' ? 1 : 0;
         if ($test->{fields}{update} || $test->{comment}) {
-            my $c = FixMyStreet::App->model("DB::Comment")->find(
+            my $c = FixMyStreet::DB->resultset("Comment")->find(
                 { problem_id => $report->id }
             );
             is $c->text, $test->{fields}{update} || $test->{comment};
@@ -346,7 +345,7 @@ foreach my $test (
     };
 }
 
-my $comment = FixMyStreet::App->model('DB::Comment')->find_or_create(
+my $comment = FixMyStreet::DB->resultset('Comment')->find_or_create(
     {
         problem_id => $report->id,
         user_id    => $user->id,
@@ -436,7 +435,7 @@ FixMyStreet::override_config {
     $report->update;
     $questionnaire->delete;
 
-    FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires();
+    FixMyStreet::DB->resultset('Questionnaire')->send_questionnaires();
 
     my $email = $mech->get_email;
     my $body = $mech->get_text_body_from_email($email);
@@ -449,7 +448,7 @@ FixMyStreet::override_config {
 
     # Test already answered the ever reported question, so not shown again
     $dt = $dt->add( weeks => 4 );
-    my $questionnaire2 = FixMyStreet::App->model('DB::Questionnaire')->find_or_create(
+    my $questionnaire2 = FixMyStreet::DB->resultset('Questionnaire')->find_or_create(
         {
             problem_id => $report->id,
             whensent => $dt->ymd . ' ' . $dt->hms,
@@ -462,9 +461,9 @@ FixMyStreet::override_config {
     $mech->content_contains( 'Has this problem been fixed?' );
     $mech->content_lacks( 'ever reported' );
 
-    $token = FixMyStreet::App->model("DB::Token")->find( { scope => 'questionnaire', token => $token } );
+    $token = FixMyStreet::DB->resultset("Token")->find( { scope => 'questionnaire', token => $token } );
     ok $token, 'found token for questionnaire';
-    $questionnaire = FixMyStreet::App->model('DB::Questionnaire')->find( { id => $token->data } );
+    $questionnaire = FixMyStreet::DB->resultset('Questionnaire')->find( { id => $token->data } );
     ok $questionnaire, 'found questionnaire';
 
     $questionnaire2->delete;
@@ -479,7 +478,7 @@ FixMyStreet::override_config {
     $report->cobrand( 'fiksgatami' );
     $report->update;
     $questionnaire->delete;
-    FixMyStreet::App->model('DB::Questionnaire')->send_questionnaires();
+    FixMyStreet::DB->resultset('Questionnaire')->send_questionnaires();
     $email = $mech->get_email;
     ok $email, "got an email";
     $mech->clear_emails_ok;
diff --git a/t/app/controller/report_as_other.t b/t/app/controller/report_as_other.t
index 5f9ba7600..dab50afa1 100644
--- a/t/app/controller/report_as_other.t
+++ b/t/app/controller/report_as_other.t
@@ -1,5 +1,4 @@
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 use FixMyStreet::Script::Reports;
 
 # disable info logs for this test run
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index eb3a54963..b2e15330a 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -1,5 +1,4 @@
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 use Web::Scraper;
 use Path::Class;
 use LWP::Protocol::PSGI;
@@ -227,7 +226,7 @@ subtest "Submit a correct entry" => sub {
 
     # check that report has been created
     my $user =
-      FixMyStreet::App->model('DB::User')
+      FixMyStreet::DB->resultset('User')
       ->find( { email => 'test@example.com' } );
     ok $user, "Found a user";
 
@@ -315,7 +314,7 @@ subtest "Submit a correct entry (with location)" => sub {
 
     # check that report has been created
     my $user =
-      FixMyStreet::App->model('DB::User')
+      FixMyStreet::DB->resultset('User')
       ->find( { email => 'test-ll@example.com' } );
     ok $user, "Found a user";
 
@@ -382,7 +381,7 @@ subtest "Submit a correct entry (with location) to cobrand" => sub {
       "check imported fields are shown"
           or diag Dumper( $mech->visible_form_values ); use Data::Dumper;
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { email => 'test-ll@example.com' } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { email => 'test-ll@example.com' } );
     ok $user, "Found a user";
 
     my $report = $user->problems->first;
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 61fa821b2..6ba4fe115 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -101,7 +101,7 @@ FixMyStreet::override_config {
         $mech->get_ok("/report/$report_id");
         $mech->submit_form_ok({ button => 'save', with_fields => { non_public => 1 } });
         $report->discard_changes;
-        my $alert = FixMyStreet::App->model('DB::Alert')->find(
+        my $alert = FixMyStreet::DB->resultset('Alert')->find(
             { user => $user, alert_type => 'new_updates', confirmed => 1, }
         );
 
@@ -118,7 +118,7 @@ FixMyStreet::override_config {
         $mech->get_ok("/report/$report_id");
         $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Action scheduled', include_update => undef } });
         $report->discard_changes;
-        my $alert = FixMyStreet::App->model('DB::Alert')->find(
+        my $alert = FixMyStreet::DB->resultset('Alert')->find(
             { user => $user, alert_type => 'new_updates', confirmed => 1, }
         );
 
@@ -290,7 +290,7 @@ FixMyStreet::override_config {
       $mech->get_ok("/report/$report_id");
       $mech->submit_form_ok({ button => 'save', with_fields => { state => 'Investigating', public_update => "We're investigating.", include_update => "1" } });
 
-      my $alert_count = FixMyStreet::App->model('DB::Alert')->search(
+      my $alert_count = FixMyStreet::DB->resultset('Alert')->search(
           { user_id => $user->id, alert_type => 'new_updates', confirmed => 1, parameter => $report_id }
       )->count();
 
diff --git a/t/app/controller/report_interest_count.t b/t/app/controller/report_interest_count.t
index 330d844d0..a9911c4ba 100644
--- a/t/app/controller/report_interest_count.t
+++ b/t/app/controller/report_interest_count.t
@@ -26,7 +26,7 @@ my $dt = DateTime->new(
     second => 23
 );
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode           => 'SW1A 1AA',
         bodies_str         => '2504',
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 48169c148..a364c786c 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -7,7 +7,6 @@ package main;
 
 use Test::MockModule;
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 use Web::Scraper;
 use Path::Class;
 
@@ -744,14 +743,14 @@ foreach my $test (
     # check that the user does not exist
     my $test_email = 'test-1@example.com';
     if ($test->{user}) {
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         ok $user, "test user does exist";
         $user->problems->delete;
         $user->name( 'Old Name' );
         $user->password( 'old_password' );
         $user->update;
     } elsif (!$first_user) {
-        ok !FixMyStreet::App->model('DB::User')->find( { email => $test_email } ),
+        ok !FixMyStreet::DB->resultset('User')->find( { email => $test_email } ),
           "test user does not exist";
         $first_user = 1;
     } else {
@@ -796,7 +795,7 @@ foreach my $test (
 
     # check that the user has been created/ not changed
     my $user =
-      FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+      FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
     ok $user, "user found";
     if ($test->{user}) {
         is $user->name, 'Old Name', 'name unchanged';
@@ -841,7 +840,7 @@ foreach my $test (
     }
 
     # check that the reporter has an alert
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user       => $report->user,
         alert_type => 'new_updates',
         parameter  => $report->id,
@@ -1029,7 +1028,7 @@ foreach my $test (
     $mech->get_ok( '/report/' . $report->id );
 
     # check that the reporter has an alert
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user       => $report->user,
         alert_type => 'new_updates',
         parameter  => $report->id,
@@ -1130,7 +1129,7 @@ foreach my $test (
         $mech->get_ok( '/report/' . $report->id );
 
         # check that the reporter has an alert
-        my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+        my $alert = FixMyStreet::DB->resultset('Alert')->find( {
             user       => $report->user,
             alert_type => 'new_updates',
             parameter  => $report->id,
@@ -1506,13 +1505,13 @@ subtest "check that a lat/lon off coast leads to /around" => sub {
 };
 
 subtest "check we load a partial report correctly" => sub {
-    my $user = FixMyStreet::App->model('DB::User')->find_or_create(
+    my $user = FixMyStreet::DB->resultset('User')->find_or_create(
         {
             email => 'test-partial@example.com'
         }
     );
 
-    my $report = FixMyStreet::App->model('DB::Problem')->create( {
+    my $report = FixMyStreet::DB->resultset('Problem')->create( {
         name               => '',
         postcode           => '',
         category           => 'Street lighting',
@@ -1531,7 +1530,7 @@ subtest "check we load a partial report correctly" => sub {
 
     my $report_id = $report->id;
 
-    my $token = FixMyStreet::App->model("DB::Token")
+    my $token = FixMyStreet::DB->resultset("Token")
         ->create( { scope => 'partial', data => $report->id } );
 
     my $token_code = $token->token;
@@ -1677,7 +1676,7 @@ for my $test (
         # confirm token in order to update the user details
         $mech->get_ok($url);
 
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => 'firstlast@example.com' } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => 'firstlast@example.com' } );
 
         my $report = $user->problems->first;
         ok $report, "Found the report";
@@ -1816,7 +1815,7 @@ subtest "test Hart" => sub {
 
             # check that the user has been created/ not changed
             $user =
-              FixMyStreet::App->model('DB::User')->find( { email => $user ? $user->email : $test_email } );
+              FixMyStreet::DB->resultset('User')->find( { email => $user ? $user->email : $test_email } );
             ok $user, "user found";
 
             # find the report
@@ -1942,7 +1941,7 @@ subtest "unresponsive body handling works" => sub {
             "submit good details"
         );
 
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         ok $user, "test user does exist";
 
         my $report = $user->problems->first;
@@ -1976,7 +1975,7 @@ subtest "unresponsive body handling works" => sub {
         my $res = $mech->response;
         ok $res->header('Content-Type') =~ m{^application/json\b}, 'response should be json';
 
-        $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         ok $user, "test user does exist";
 
         $report = $user->problems->first;
@@ -2150,7 +2149,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
         $mech->get_ok($url);
 
         # find the report
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => 'firstlast@example.com' } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => 'firstlast@example.com' } );
 
         my $report = $user->problems->first;
         ok $report, "Found the report";
diff --git a/t/app/controller/report_new_anon.t b/t/app/controller/report_new_anon.t
index e1acb202c..bd73a2b70 100644
--- a/t/app/controller/report_new_anon.t
+++ b/t/app/controller/report_new_anon.t
@@ -11,7 +11,6 @@ sub anonymous_account { { email => 'anonbutton@example.org', name => 'Anonymous
 package main;
 
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 
 # disable info logs for this test run
 FixMyStreet::App->log->disable('info');
@@ -93,7 +92,7 @@ subtest "test report creation anonymously" => sub {
     is $report->name, 'Anonymous';
     is $report->anonymous, 0; # Doesn't change behaviour here, but uses anon account's name always
 
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user => $report->user,
         alert_type => 'new_updates',
         parameter => $report->id,
@@ -161,7 +160,7 @@ subtest "test report creation anonymously by button" => sub {
     is $report->anonymous, 1; # Doesn't change behaviour here, but uses anon account's name always
     is $report->get_extra_metadata('contributed_as'), 'anonymous_user';
 
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user => $report->user,
         alert_type => 'new_updates',
         parameter => $report->id,
@@ -204,7 +203,7 @@ subtest "test report creation anonymously by staff user" => sub {
     is $report->anonymous, 1;
     is $report->get_extra_metadata('contributed_as'), 'anonymous_user';
 
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user => $report->user,
         alert_type => 'new_updates',
         parameter => $report->id,
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index 6551946c6..264198052 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -1,5 +1,4 @@
 use FixMyStreet::TestMech;
-use FixMyStreet::App;
 use Test::LongString;
 use Web::Scraper;
 
@@ -186,7 +185,7 @@ foreach my $test (
 
         # check that the user does not exist
         my $test_email = $test->{submit_with}->{username};
-        my $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         if ( $user ) {
             $user->problems->delete;
             $user->comments->delete;
@@ -252,7 +251,7 @@ foreach my $test (
             $mech->submit_form_ok( { with_fields => $new_values } );
         };
 
-        $user = FixMyStreet::App->model('DB::User')->find( { email => $test_email } );
+        $user = FixMyStreet::DB->resultset('User')->find( { email => $test_email } );
         ok $user, 'created user';
         my $prob = $user->problems->first;
         ok $prob, 'problem created';
diff --git a/t/app/controller/report_new_text.t b/t/app/controller/report_new_text.t
index fad7fb6ab..852cdac76 100644
--- a/t/app/controller/report_new_text.t
+++ b/t/app/controller/report_new_text.t
@@ -110,14 +110,14 @@ foreach my $test (
     $mech->log_out_ok;
 
     if ($test->{user}) {
-        my $user = FixMyStreet::App->model('DB::User')->find( { phone => $test_phone } );
+        my $user = FixMyStreet::DB->resultset('User')->find( { phone => $test_phone } );
         ok $user, "test user does exist";
         $user->problems->delete;
         $user->name( 'Old Name' );
         $user->password( 'old_password' );
         $user->update;
     } elsif (!$first_user) {
-        ok !FixMyStreet::App->model('DB::User')->find( { phone => $test_phone } ),
+        ok !FixMyStreet::DB->resultset('User')->find( { phone => $test_phone } ),
           "test user does not exist";
         $first_user = 1;
     } else {
@@ -153,7 +153,7 @@ foreach my $test (
 
     is_deeply $mech->page_errors, [], "check there were no errors";
 
-    my $user = FixMyStreet::App->model('DB::User')->find( { phone => $test_phone } );
+    my $user = FixMyStreet::DB->resultset('User')->find( { phone => $test_phone } );
     ok $user, "user found";
     if ($test->{user}) {
         is $user->name, 'Old Name', 'name unchanged';
@@ -189,7 +189,7 @@ foreach my $test (
     }
 
     # check that the reporter has an alert
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user => $report->user,
         alert_type => 'new_updates',
         parameter => $report->id,
@@ -300,7 +300,7 @@ subtest "test report creation for a user who is signing in as they report" => su
     is $report->bodies_str, $body->id;
     is $report->state, 'confirmed', "report is now confirmed";
     $mech->get_ok( '/report/' . $report->id );
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user => $report->user,
         alert_type => 'new_updates',
         parameter => $report->id,
@@ -356,7 +356,7 @@ subtest "test report creation for a user who is logged in" => sub {
     $mech->content_contains('Thank you for reporting this issue');
     is $report->state, 'confirmed', "report is now confirmed";
     $mech->get_ok( '/report/' . $report->id );
-    my $alert = FixMyStreet::App->model('DB::Alert')->find( {
+    my $alert = FixMyStreet::DB->resultset('Alert')->find( {
         user => $report->user,
         alert_type => 'new_updates',
         parameter => $report->id,
diff --git a/t/app/controller/report_update_text.t b/t/app/controller/report_update_text.t
index 4ab8e4bae..52f221264 100644
--- a/t/app/controller/report_update_text.t
+++ b/t/app/controller/report_update_text.t
@@ -18,7 +18,7 @@ my $dt = DateTime->new(
     second => 23
 );
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode => 'SW1A 1AA',
         bodies_str => $body->id,
@@ -44,7 +44,7 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
 my $report_id = $report->id;
 ok $report, "created test report - $report_id";
 
-my $comment = FixMyStreet::App->model('DB::Comment')->find_or_create( {
+my $comment = FixMyStreet::DB->resultset('Comment')->find_or_create( {
     problem_id => $report_id,
     user_id => $user2->id,
     name => 'Other User',
@@ -181,7 +181,7 @@ for my $test (
         }
 
         my ($token) = $mech->content =~ /name="token" value="([^"]*)"/;
-        $token = FixMyStreet::App->model('DB::Token')->find({
+        $token = FixMyStreet::DB->resultset('Token')->find({
             token => $token,
             scope => 'comment'
         });
@@ -189,7 +189,7 @@ for my $test (
 
         my $update_id = $token->data->{id};
         my $add_alerts = $token->data->{add_alert};
-        my $update = FixMyStreet::App->model('DB::Comment')->find( { id => $update_id } );
+        my $update = FixMyStreet::DB->resultset('Comment')->find( { id => $update_id } );
 
         ok $update, 'found update in database';
         is $update->state, 'unconfirmed', 'update unconfirmed';
@@ -211,11 +211,11 @@ for my $test (
             ok $user->check_password( 'new_secret' ), 'password changed';
             is $user->name, 'Reg User', 'name changed';
         } else {
-            $user = FixMyStreet::App->model( 'DB::User' )->find( { phone => $details->{username} } );
+            $user = FixMyStreet::DB->resultset( 'User' )->find( { phone => $details->{username} } );
             ok $user, 'found user';
         }
 
-        my $alert = FixMyStreet::App->model( 'DB::Alert' )->find(
+        my $alert = FixMyStreet::DB->resultset( 'Alert' )->find(
             { user => $user, alert_type => 'new_updates', confirmed => 1, }
         );
 
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 983305661..07ee48587 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -31,7 +31,7 @@ my $dt = DateTime->new(
     second => 23
 );
 
-my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
+my $report = FixMyStreet::DB->resultset('Problem')->find_or_create(
     {
         postcode           => 'SW1A 1AA',
         bodies_str         => $body->id,
@@ -57,7 +57,7 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
 my $report_id = $report->id;
 ok $report, "created test report - $report_id";
 
-my $comment = FixMyStreet::App->model('DB::Comment')->find_or_create(
+my $comment = FixMyStreet::DB->resultset('Comment')->find_or_create(
     {
         problem_id => $report_id,
         user_id    => $user2->id,
@@ -201,7 +201,7 @@ subtest "several updates shown in correct order" => sub {
             new_state => 'fixed - user',
         },
     ) {
-        my $q = FixMyStreet::App->model('DB::Questionnaire')->find_or_create(
+        my $q = FixMyStreet::DB->resultset('Questionnaire')->find_or_create(
             $fields
         );
         push @qs, $q;
@@ -238,7 +238,7 @@ subtest "several updates shown in correct order" => sub {
             confirmed  => '2011-03-15 08:12:36',
         }
     ) {
-        my $comment = FixMyStreet::App->model('DB::Comment')->find_or_create(
+        my $comment = FixMyStreet::DB->resultset('Comment')->find_or_create(
             $fields
         );
         if ($fields->{text} eq 'Second update') {
@@ -443,7 +443,7 @@ for my $test (
         my ($url_token) = $url =~ m{/C/(\S+)};
         ok $url, "extracted confirm url '$url'";
 
-        my $token = FixMyStreet::App->model('DB::Token')->find(
+        my $token = FixMyStreet::DB->resultset('Token')->find(
             {
                 token => $url_token,
                 scope => 'comment'
@@ -454,7 +454,7 @@ for my $test (
         my $update_id  = $token->data->{id};
         my $add_alerts = $token->data->{add_alert};
         my $update =
-          FixMyStreet::App->model('DB::Comment')->find( { id => $update_id } );
+          FixMyStreet::DB->resultset('Comment')->find( { id => $update_id } );
 
         my $details = {
             %{ $test->{form_values} },
@@ -470,11 +470,11 @@ for my $test (
         $mech->get_ok( $url );
         $mech->content_contains("/report/$report_id#update_$update_id");
 
-        my $unreg_user = FixMyStreet::App->model( 'DB::User' )->find( { email => $details->{username} } );
+        my $unreg_user = FixMyStreet::DB->resultset( 'User' )->find( { email => $details->{username} } );
 
         ok $unreg_user, 'found user';
 
-        my $alert = FixMyStreet::App->model( 'DB::Alert' )->find(
+        my $alert = FixMyStreet::DB->resultset( 'Alert' )->find(
             { user => $unreg_user, alert_type => 'new_updates', confirmed => 1, }
         );
 
@@ -548,7 +548,7 @@ for my $test (
         my $email = $mech->email_count_is(0);
 
         my $update =
-          FixMyStreet::App->model('DB::Comment')->find( { problem_id => $report_id, text => 'Update no email confirm' } );
+          FixMyStreet::DB->resultset('Comment')->find( { problem_id => $report_id, text => 'Update no email confirm' } );
         my $update_id = $update->id;
 
         $mech->content_contains('name="update_' . $update_id . '"');
@@ -563,7 +563,7 @@ for my $test (
         is $update->user->email, $details->{username}, 'update email';
         is $update->text, $details->{update}, 'update text';
 
-        my $unreg_user = FixMyStreet::App->model( 'DB::User' )->find( { email => $details->{username} } );
+        my $unreg_user = FixMyStreet::DB->resultset( 'User' )->find( { email => $details->{username} } );
 
         ok $unreg_user, 'found user';
 
@@ -790,7 +790,7 @@ for my $test (
 
 subtest 'check meta correct for comments marked confirmed but not marked open' => sub {
     $report->comments->delete;
-    my $comment = FixMyStreet::App->model('DB::Comment')->create(
+    my $comment = FixMyStreet::DB->resultset('Comment')->create(
         {
             user          => $user,
             problem_id    => $report->id,
@@ -911,7 +911,7 @@ subtest "check comment with no status change has not status in meta" => sub {
         like $update_meta->[3], qr/investigating/i, 'third update meta says investigating';
 
         my $dt = DateTime->now( time_zone => "local" )->add( seconds => 1 );
-        $comment = FixMyStreet::App->model('DB::Comment')->find_or_create(
+        $comment = FixMyStreet::DB->resultset('Comment')->find_or_create(
             {
                 problem_id => $report_id,
                 user_id    => $user->id,
@@ -943,7 +943,7 @@ subtest "check comment with no status change has not status in meta" => sub {
 
 subtest 'check meta correct for second comment marking as reopened' => sub {
     $report->comments->delete;
-    my $comment = FixMyStreet::App->model('DB::Comment')->create(
+    my $comment = FixMyStreet::DB->resultset('Comment')->create(
         {
             user          => $user,
             problem_id    => $report->id,
@@ -961,7 +961,7 @@ subtest 'check meta correct for second comment marking as reopened' => sub {
     my $update_meta = $mech->extract_update_metas;
     like $update_meta->[0], qr/fixed/i, 'update meta says fixed';
 
-    $comment = FixMyStreet::App->model('DB::Comment')->create(
+    $comment = FixMyStreet::DB->resultset('Comment')->create(
         {
             user          => $user,
             problem_id    => $report->id,
@@ -982,7 +982,7 @@ subtest 'check meta correct for second comment marking as reopened' => sub {
 
 subtest 'check meta correct for comment after mark_fixed with not problem_state' => sub {
     $report->comments->delete;
-    my $comment = FixMyStreet::App->model('DB::Comment')->create(
+    my $comment = FixMyStreet::DB->resultset('Comment')->create(
         {
             user          => $user,
             problem_id    => $report->id,
@@ -1000,7 +1000,7 @@ subtest 'check meta correct for comment after mark_fixed with not problem_state'
     my $update_meta = $mech->extract_update_metas;
     like $update_meta->[0], qr/fixed/i, 'update meta says fixed';
 
-    $comment = FixMyStreet::App->model('DB::Comment')->create(
+    $comment = FixMyStreet::DB->resultset('Comment')->create(
         {
             user          => $user,
             problem_id    => $report->id,
@@ -1066,7 +1066,7 @@ subtest $test->{desc} => sub {
 
     $report->comments->delete;
 
-    my $comment = FixMyStreet::App->model('DB::Comment')->create(
+    my $comment = FixMyStreet::DB->resultset('Comment')->create(
         {
             user          => $test->{user},
             name          => $test->{name},
@@ -1130,7 +1130,7 @@ subtest $test->{desc} => sub {
 
     $report->comments->delete;
 
-    my $comment = FixMyStreet::App->model('DB::Comment')->create(
+    my $comment = FixMyStreet::DB->resultset('Comment')->create(
         {
             user          => $user2,
             name          => 'an administrator',
@@ -1182,7 +1182,7 @@ subtest $test->{desc} => sub {
     $report->comments->delete;
 
     for my $state (@{$test->{problem_states}}) {
-        my $comment = FixMyStreet::App->model('DB::Comment')->create(
+        my $comment = FixMyStreet::DB->resultset('Comment')->create(
             {
                 user          => $user2,
                 name          => 'an administrator',
@@ -1327,7 +1327,7 @@ subtest 'submit an update for a registered user, creating update by email' => su
     my ($url_token) = $url =~ m{/C/(\S+)};
     ok $url, "extracted confirm url '$url'";
 
-    my $token = FixMyStreet::App->model('DB::Token')->find( {
+    my $token = FixMyStreet::DB->resultset('Token')->find( {
         token => $url_token,
         scope => 'comment'
     } );
@@ -1335,7 +1335,7 @@ subtest 'submit an update for a registered user, creating update by email' => su
 
     my $update_id  = $token->data->{id};
     my $add_alerts = $token->data->{add_alert};
-    my $update = FixMyStreet::App->model('DB::Comment')->find( { id => $update_id } );
+    my $update = FixMyStreet::DB->resultset('Comment')->find( { id => $update_id } );
 
     ok $update, 'found update in database';
     is $update->state, 'unconfirmed', 'update unconfirmed';
@@ -1554,7 +1554,7 @@ for my $test (
         is $update->anonymous, $test->{anonymous}, 'user anonymous';
 
         my $alert =
-          FixMyStreet::App->model('DB::Alert')
+          FixMyStreet::DB->resultset('Alert')
           ->find( { user => $update->user, alert_type => 'new_updates', confirmed => 1, whendisabled => undef } );
 
         ok $test->{alert} ? $alert : !$alert, 'not signed up for alerts';
@@ -1664,7 +1664,7 @@ foreach my $test (
         my $questionnaire;
         if ( $test->{answered} ) {
             $questionnaire =
-              FixMyStreet::App->model('DB::Questionnaire')->create(
+              FixMyStreet::DB->resultset('Questionnaire')->create(
                 {
                     problem_id    => $report_id,
                     ever_reported => 'y',
@@ -1729,7 +1729,7 @@ foreach my $test (
             $mech->content_contains( $report->title );
             $mech->content_contains( 'Thank you for updating this issue' );
 
-            $questionnaire = FixMyStreet::App->model( 'DB::Questionnaire' )->find(
+            $questionnaire = FixMyStreet::DB->resultset( 'Questionnaire' )->find(
                 { problem_id => $report_id }
             );
 
@@ -1806,7 +1806,7 @@ for my $test (
         my $questionnaire;
         if ( $test->{answered} ) {
             $questionnaire =
-              FixMyStreet::App->model('DB::Questionnaire')->create(
+              FixMyStreet::DB->resultset('Questionnaire')->create(
                 {
                     problem_id    => $report_id,
                     ever_reported => 'y',
@@ -1852,7 +1852,7 @@ for my $test (
         my ($url_token) = $url =~ m{/C/(\S+)};
         ok $url, "extracted confirm url '$url'";
 
-        my $token = FixMyStreet::App->model('DB::Token')->find(
+        my $token = FixMyStreet::DB->resultset('Token')->find(
             {
                 token => $url_token,
                 scope => 'comment'
@@ -1878,7 +1878,7 @@ for my $test (
             $mech->content_contains( $report->title );
             $mech->content_contains( 'Thank you for updating this issue' );
 
-            $questionnaire = FixMyStreet::App->model( 'DB::Questionnaire' )->find(
+            $questionnaire = FixMyStreet::DB->resultset( 'Questionnaire' )->find(
                 { problem_id => $report_id }
             );
 
diff --git a/t/app/model/defecttype.t b/t/app/model/defecttype.t
index e924129e2..ec40f6dbc 100644
--- a/t/app/model/defecttype.t
+++ b/t/app/model/defecttype.t
@@ -1,4 +1,3 @@
-use FixMyStreet::App;
 use FixMyStreet::TestMech;
 use JSON::MaybeXS;
 
@@ -11,7 +10,7 @@ my $potholes_contact = $mech->create_contact_ok( body_id => $oxfordshire->id, ca
 my $traffic_lights_contact =$mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Traffic lights', email => 'lights@example.com' );
 my $pavements_contact =$mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Pavements', email => 'pavements@example.com' );
 
-my $potholes_defect_type = FixMyStreet::App->model('DB::DefectType')->find_or_create(
+my $potholes_defect_type = FixMyStreet::DB->resultset('DefectType')->find_or_create(
     {
         body_id => $oxfordshire->id,
         name => 'Potholes and Pavements',
@@ -27,7 +26,7 @@ $potholes_defect_type->contact_defect_types->find_or_create({
 });
 $potholes_defect_type->update();
 
-my $general_defect_type = FixMyStreet::App->model('DB::DefectType')->find_or_create(
+my $general_defect_type = FixMyStreet::DB->resultset('DefectType')->find_or_create(
     {
         body_id => $oxfordshire->id,
         name => 'All categories',
@@ -37,14 +36,14 @@ my $general_defect_type = FixMyStreet::App->model('DB::DefectType')->find_or_cre
 
 
 subtest 'for_bodies returns correct results' => sub {
-    my $defect_types = FixMyStreet::App->model('DB::DefectType')->for_bodies(
+    my $defect_types = FixMyStreet::DB->resultset('DefectType')->for_bodies(
         [ $oxfordshire->id ],
         'Potholes'
     );
 
     is $defect_types->count, 2, 'Both defect types are included for Potholes category';
 
-    $defect_types = FixMyStreet::App->model('DB::DefectType')->for_bodies(
+    $defect_types = FixMyStreet::DB->resultset('DefectType')->for_bodies(
         [ $oxfordshire->id ],
         'Traffic lights'
     );
@@ -67,7 +66,7 @@ subtest 'Problem->defect_types behaves correctly' => sub {
 
 subtest 'by_categories returns all defect types grouped by category' => sub {
     my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $oxfordshire->id ] } )->all;
-    my $defect_types = FixMyStreet::App->model('DB::DefectType')->by_categories($area_id, @contacts);
+    my $defect_types = FixMyStreet::DB->resultset('DefectType')->by_categories($area_id, @contacts);
     my $potholes = decode_json($defect_types->{Potholes});
     my $traffic_lights = decode_json($defect_types->{'Traffic lights'});
     my $pavements = decode_json($defect_types->{Pavements});
@@ -80,7 +79,7 @@ subtest 'by_categories returns all defect types grouped by category' => sub {
 };
 
 subtest 'by_categories returns defect types for an area with multiple bodies' => sub {
-    FixMyStreet::App->model('DB::DefectType')->find_or_create(
+    FixMyStreet::DB->resultset('DefectType')->find_or_create(
         {
             body_id => $other_body->id,
             name => 'All categories',
@@ -89,7 +88,7 @@ subtest 'by_categories returns defect types for an area with multiple bodies' =>
     );
 
     my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $oxfordshire->id ] } )->all;
-    my $defect_types = FixMyStreet::App->model('DB::DefectType')->by_categories($area_id, @contacts);
+    my $defect_types = FixMyStreet::DB->resultset('DefectType')->by_categories($area_id, @contacts);
     my $potholes = decode_json($defect_types->{Potholes});
     my $traffic_lights = decode_json($defect_types->{'Traffic lights'});
     my $pavements = decode_json($defect_types->{Pavements});
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 18557f44a..661a8827f 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -1,6 +1,5 @@
 use FixMyStreet::TestMech;
 use FixMyStreet;
-use FixMyStreet::App;
 use FixMyStreet::DB;
 use FixMyStreet::Script::Reports;
 use Sub::Override;
@@ -785,7 +784,7 @@ subtest 'generates a tokenised url for a user' => sub {
 
     like $url, qr/\/M\//, 'problem generates tokenised url';
 
-    my $token_obj = FixMyStreet::App->model('DB::Token')->find( {
+    my $token_obj = FixMyStreet::DB->resultset('Token')->find( {
         scope => 'email_sign_in', token => $token
     } );
     is $token, $token_obj->token, 'token is generated in database with correct scope';
@@ -797,7 +796,7 @@ subtest 'stores params in a token' => sub {
     my $url = $problem->tokenised_url($user, { foo => 'bar', baz => 'boo'});
     (my $token = $url) =~ s/\/M\///g;
 
-    my $token_obj = FixMyStreet::App->model('DB::Token')->find( {
+    my $token_obj = FixMyStreet::DB->resultset('Token')->find( {
         scope => 'email_sign_in', token => $token
     } );
 
diff --git a/t/app/model/responsepriority.t b/t/app/model/responsepriority.t
index 4e624bf07..c7a4fe210 100644
--- a/t/app/model/responsepriority.t
+++ b/t/app/model/responsepriority.t
@@ -2,7 +2,6 @@ use strict;
 use warnings;
 use Test::More;
 
-use FixMyStreet::App;
 use FixMyStreet::TestMech;
 use JSON::MaybeXS;
 
@@ -14,7 +13,7 @@ my $other_body = $mech->create_body_ok($area_id, 'Some Other Council');
 my $potholes_contact = $mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Potholes', email => 'potholes@example.com' );
 my $traffic_lights_contact =$mech->create_contact_ok( body_id => $oxfordshire->id, category => 'Traffic lights', email => 'lights@example.com' );
 
-my $potholes_response_priority = FixMyStreet::App->model('DB::ResponsePriority')->find_or_create(
+my $potholes_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->find_or_create(
     {
         body_id => $oxfordshire->id,
         name => 'Potholes',
@@ -25,7 +24,7 @@ $potholes_response_priority->contact_response_priorities->find_or_create({
     contact_id => $potholes_contact->id,
 });
 
-my $general_response_priority = FixMyStreet::App->model('DB::ResponsePriority')->find_or_create(
+my $general_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->find_or_create(
     {
         body_id => $oxfordshire->id,
         name => 'All categories',
@@ -34,14 +33,14 @@ my $general_response_priority = FixMyStreet::App->model('DB::ResponsePriority')-
 );
 
 subtest 'for_bodies returns correct results' => sub {
-    my $priorities = FixMyStreet::App->model('DB::ResponsePriority')->for_bodies(
+    my $priorities = FixMyStreet::DB->resultset('ResponsePriority')->for_bodies(
         [ $oxfordshire->id ],
         'Potholes'
     );
 
     is $priorities->count, 2, 'Both priorities are included for Potholes category';
 
-    $priorities = FixMyStreet::App->model('DB::ResponsePriority')->for_bodies(
+    $priorities = FixMyStreet::DB->resultset('ResponsePriority')->for_bodies(
         [ $oxfordshire->id ],
         'Traffic lights'
     );
@@ -52,7 +51,7 @@ subtest 'for_bodies returns correct results' => sub {
 
 subtest 'by_categories returns allresponse priorities grouped by category' => sub {
     my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $oxfordshire->id ] } )->all;
-    my $priorities = FixMyStreet::App->model('DB::ResponsePriority')->by_categories($area_id, @contacts);
+    my $priorities = FixMyStreet::DB->resultset('ResponsePriority')->by_categories($area_id, @contacts);
     my $potholes = decode_json($priorities->{Potholes});
     my $traffic_lights = decode_json($priorities->{'Traffic lights'});
 
@@ -61,7 +60,7 @@ subtest 'by_categories returns allresponse priorities grouped by category' => su
 };
 
 subtest 'by_categories returns all response priorities for an area with multiple bodies' => sub {
-    my $other_response_priority = FixMyStreet::App->model('DB::ResponsePriority')->find_or_create(
+    my $other_response_priority = FixMyStreet::DB->resultset('ResponsePriority')->find_or_create(
         {
             body_id => $other_body->id,
             name => 'All categories',
@@ -70,7 +69,7 @@ subtest 'by_categories returns all response priorities for an area with multiple
     );
 
     my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $oxfordshire->id ] } )->all;
-    my $priorities = FixMyStreet::App->model('DB::ResponsePriority')->by_categories($area_id, @contacts);
+    my $priorities = FixMyStreet::DB->resultset('ResponsePriority')->by_categories($area_id, @contacts);
     my $potholes = decode_json($priorities->{Potholes});
     my $traffic_lights = decode_json($priorities->{'Traffic lights'});
 
diff --git a/t/app/model/responsetemplate.t b/t/app/model/responsetemplate.t
index fbabc1c12..631af9819 100644
--- a/t/app/model/responsetemplate.t
+++ b/t/app/model/responsetemplate.t
@@ -16,7 +16,7 @@ $t2->add_to_contacts($c2);
 my @contacts = FixMyStreet::DB->resultset('Contact')->not_deleted->search( { body_id => [ $body->id ] } )->all;
 
 subtest 'by_categories returns allresponse templates grouped by category' => sub {
-    my $templates = FixMyStreet::App->model('DB::ResponseTemplate')->by_categories($area_id, @contacts);
+    my $templates = FixMyStreet::DB->resultset('ResponseTemplate')->by_categories($area_id, @contacts);
     my $potholes = decode_json($templates->{Potholes});
     my $graffiti = decode_json($templates->{Graffiti});
 
diff --git a/t/app/model/user.t b/t/app/model/user.t
index c1981c858..929020d4b 100644
--- a/t/app/model/user.t
+++ b/t/app/model/user.t
@@ -105,7 +105,7 @@ done_testing();
 sub create_update {
     my ($problem, %params) = @_;
     my $dt = DateTime->now()->add(days => 1);
-    return FixMyStreet::App->model('DB::Comment')->find_or_create({
+    return FixMyStreet::DB->resultset('Comment')->find_or_create({
         problem_id => $problem->id,
         user_id => $problem->user_id,
         name => 'Other User',
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 3ab1f6150..02ec8750e 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -169,7 +169,7 @@ for my $test (
         like $body, qr/This update will be sent to Bromley Council/i, "Email indicates problem will be sent to Bromley";
         unlike $body, qr/Note that we do not send updates to/i, "Email does not say updates aren't sent to Bromley";
 
-        my $unreg_user = FixMyStreet::App->model( 'DB::User' )->find( { email => 'unregistered@example.com' } );
+        my $unreg_user = FixMyStreet::DB->resultset('User')->find( { email => 'unregistered@example.com' } );
 
         ok $unreg_user, 'found user';
 
diff --git a/t/cobrand/isleofwight.t b/t/cobrand/isleofwight.t
index f945dc924..1d22eb517 100644
--- a/t/cobrand/isleofwight.t
+++ b/t/cobrand/isleofwight.t
@@ -254,7 +254,7 @@ subtest "fixing passes along the correct message" => sub {
 
         my ($p) = $mech->create_problems_for_body(1, $isleofwight->id, 'Title', { external_id => 1 });
 
-        my $c = FixMyStreet::App->model('DB::Comment')->create({
+        my $c = FixMyStreet::DB->resultset('Comment')->create({
             problem => $p, user => $p->user, anonymous => 't', text => 'Update text',
             problem_state => 'fixed - council', state => 'confirmed', mark_fixed => 0,
             confirmed => DateTime->now(),
@@ -371,7 +371,7 @@ subtest "comment recording triage details is not sent" => sub {
 };
 
 my ($p) = $mech->create_problems_for_body(1, $isleofwight->id, '', { cobrand => 'isleofwight' });
-my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+my $alert = FixMyStreet::DB->resultset('Alert')->create( {
     parameter  => $p->id,
     alert_type => 'new_updates',
     user       => $user,
@@ -412,7 +412,7 @@ subtest "check not responsible as correct text" => sub {
             external_id => 1,
         });
 
-    my $c = FixMyStreet::App->model('DB::Comment')->create({
+    my $c = FixMyStreet::DB->resultset('Comment')->create({
         problem => $p, user => $p->user, anonymous => 't', text => 'Update text',
         problem_state => 'not responsible', state => 'confirmed', mark_fixed => 0,
         confirmed => DateTime->now(),
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index a08eb431e..6825caccf 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -834,7 +834,7 @@ subtest "problems can't be assigned to deleted bodies" => sub {
 };
 
 subtest "photo must be supplied for categories that require it" => sub {
-    FixMyStreet::App->model('DB::Contact')->find_or_create({
+    FixMyStreet::DB->resultset('Contact')->find_or_create({
         body => $division,
         category => "Graffiti - photo required",
         email => "graffiti\@example.org",