2 files changed, 7 insertions, 7 deletions
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index e9e5cb26..d90d7ed6 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -106,15 +106,15 @@ class Access_Helper_Test extends Unit_Test_Case {
     $item = album::create($root,  rand(), "test album");
 
     // New rows exist
-    $this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded);
-    $this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded);
+    $this->assert_true(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_true(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
 
     // Delete the item
     $item->delete();
 
     // Rows are gone
-    $this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded);
-    $this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded);
+    $this->assert_false(ORM::factory("access_cache")->where("item_id", $item->id)->find()->loaded());
+    $this->assert_false(ORM::factory("access_intent")->where("item_id", $item->id)->find()->loaded());
   }
 
   public function new_photos_inherit_parent_permissions_test() {
diff --git a/modules/gallery/tests/I18n_Test.php b/modules/gallery/tests/I18n_Test.php
index 9010606a..d0555cbf 100644
--- a/modules/gallery/tests/I18n_Test.php
+++ b/modules/gallery/tests/I18n_Test.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-class I18n_Test extends Unit_Test_Case {
+class Gallery_I18n_Test extends Unit_Test_Case {
   private $i18n;
 
   public function setup() {
@@ -26,7 +26,7 @@ class I18n_Test extends Unit_Test_Case {
         'root_locale' => 'en',
         'default_locale' => 'te_ST',
         'locale_dir' => VARPATH . 'locale/');
-    $this->i18n = I18n::instance($config);
+    $this->i18n = Gallery_I18n::instance($config);
 
     ORM::factory("incoming_translation")
       ->where("locale", "te_ST")
@@ -43,7 +43,7 @@ class I18n_Test extends Unit_Test_Case {
     foreach ($messages_te_ST as $data) {
       list ($message, $translation) = $data;
       $entry = ORM::factory("incoming_translation");
-      $entry->key = I18n::get_message_key($message);
+      $entry->key = Gallery_I18n::get_message_key($message);
       $entry->message = serialize($message);
       $entry->translation = serialize($translation);
       $entry->locale = 'te_ST';