Merge branch 'master' into migrate_to_catalyst

2 files changed, 6 insertions, 3 deletions

diff --git a/t/Cobrand.t b/t/Cobrand.t
index f6c2e9c87..1f38ec605 100755
--- a/t/Cobrand.t
+++ b/t/Cobrand.t
@@ -51,7 +51,7 @@ sub test_disambiguate_location {
     $q = new MockQuery('nosite');
     $s = 'London Road';
     $s = Cobrand::disambiguate_location('nosite', $s, $q);
-    ok($s eq 'London Road', 'should return location string as passed if no cobrand module exists') or diag("Got $s");
+    ok($s eq 'London Road&gl=uk', 'should return location string as passed if no cobrand module exists') or diag("Got $s");
   
 }
 
diff --git a/t/Page.t b/t/Page.t
index f57c56092..a1ae7f3aa 100755
--- a/t/Page.t
+++ b/t/Page.t
@@ -71,9 +71,12 @@ sub test_header() {
 
     # Test that template passed is rendered 
     $params{'template'} = 'test';    
-    $html = Page::template_header('test', $q, '/../t/templates/' . $q->{site} . '/', title=>'My test title', lang=>'en-gb');	
+    $html = Page::template_include('test-header', $q,
+        '/../t/templates/' . $q->{site} . '/',
+        title => 'My test title', lang => 'en-gb'
+    );	
+     
     like  ($html, qr/My test header template/, 'named template rendered ok');
- 
 
     return 1;
 }