7 files changed, 11 insertions, 11 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index 8963e417d..65e252954 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -1050,7 +1050,7 @@ subtest 'report search' => sub {
     $report->update;
 
     $mech->get_ok('/admin/reports?search=' . $report->user->email);
-    $mech->content_like( qr{<tr [^>]*hidden[^>]*> \s* <td> \s* $r_id \s* </td>}xs );
+    $mech->content_like( qr{<tr [^>]*hidden[^>]*> \s* <td[^>]*> \s* $r_id \s* </td>}xs );
 
     $report->state('fixed - user');
     $report->update;
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 0f01a9ea9..fa2d94aed 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -7,7 +7,7 @@ my $mech = FixMyStreet::TestMech->new;
 
 subtest "check that if no query we get sent back to the homepage" => sub {
     $mech->get_ok('/around');
-    is $mech->uri->path, '/around', "still at  '/around'";
+    is $mech->uri->path, '/', "redirected to '/'";
 };
 
 # x,y requests were generated by the old map code. We keep the behavior for
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 67466e959..8d7bfbf4d 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -95,7 +95,7 @@ $mech->not_logged_in_ok;
     $mech->log_out_ok;
     $mech->get_ok($link);
     is $mech->uri, $link, "not logged in";
-    $mech->content_contains( 'Link too old or already used',
+    $mech->content_contains( 'too old or already used',
         'token now invalid' );
     $mech->not_logged_in_ok;
 }
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 868977953..722c3c39c 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -17,7 +17,7 @@ ok -e $sample_file, "sample file $sample_file exists";
 subtest "test that bare requests to /report/new get redirected" => sub {
 
     $mech->get_ok('/report/new');
-    is $mech->uri->path, '/around', "went to /around";
+    is $mech->uri->path, '/', "went to /";
     is_deeply { $mech->uri->query_form }, {}, "query empty";
 
     $mech->get_ok('/report/new?pc=SW1A%201AA');
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index cdebee35d..aa34b1a2c 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -807,7 +807,7 @@ subtest 'check meta correct for second comment marking as reopened' => sub {
             user          => $user,
             problem_id    => $report->id,
             text          => 'update text',
-            confirmed     => DateTime->now,
+            confirmed     => DateTime->now + DateTime::Duration->new( minutes => 1 ),
             problem_state => 'confirmed',
             anonymous     => 0,
             mark_open     => 0,
diff --git a/t/app/model/comment.t b/t/app/model/comment.t
index 93104c2e5..3141af828 100644
--- a/t/app/model/comment.t
+++ b/t/app/model/comment.t
@@ -23,5 +23,5 @@ my $comment = $comment_rs->new(
     }
 );
 
-is $comment->confirmed_local,  undef, 'inflating null confirmed ok';
-is $comment->created_local,  undef, 'inflating null confirmed ok';
+is $comment->confirmed,  undef, 'inflating null confirmed ok';
+is $comment->created,  undef, 'inflating null confirmed ok';
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index a92e3b079..6ba2bbde4 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -32,10 +32,10 @@ my $problem = $problem_rs->new(
     }
 );
 
-is $problem->confirmed_local,  undef, 'inflating null confirmed ok';
-is $problem->whensent_local,   undef, 'inflating null confirmed ok';
-is $problem->lastupdate_local, undef, 'inflating null confirmed ok';
-is $problem->created_local,  undef, 'inflating null confirmed ok';
+is $problem->confirmed,  undef, 'inflating null confirmed ok';
+is $problem->whensent,   undef, 'inflating null confirmed ok';
+is $problem->lastupdate, undef, 'inflating null confirmed ok';
+is $problem->created,  undef, 'inflating null confirmed ok';
 
 for my $test ( 
     {