diff --git a/src/Poche/Repository/EntryRepository.php b/src/Poche/Repository/EntryRepository.php
index fcb3c68..c36ffda 100644
--- a/src/Poche/Repository/EntryRepository.php
+++ b/src/Poche/Repository/EntryRepository.php
@@ -12,11 +12,9 @@ class EntryRepository
 
     //TODO don't hardcode the user ;)
     public function getEntries($userId = 1) {
-        $sql = "SELECT * FROM entries where user_id = :userId";
-        $stmt = $this->db->prepare($sql);
-        $stmt->bindValue('userId', $userId);
-        $entries = $stmt->fetchAll();
-        return $entries;
+        $sql = "SELECT * FROM entries where user_id = ?";
+        $entries = $this->db->fetchAll($sql, array($userId));
+        return $entries ? $entries : array();
     }
 
     //TODO don't hardcode the user ;)
diff --git a/tests/functionals/ApiTest.php b/tests/functionals/ApiTest.php
index 147b2b1..ca513c9 100644
--- a/tests/functionals/ApiTest.php
+++ b/tests/functionals/ApiTest.php
@@ -19,7 +19,7 @@ class ApiTest extends PocheWebTestCase
             )
         );
 
-        $this->assertEquals($client->getResponse()->getContent(), '[]');
+        $this->assertEquals('[]', $client->getResponse()->getContent());
 
     }
 
@@ -42,7 +42,7 @@ class ApiTest extends PocheWebTestCase
             )
         );
 
-        $this->assertEquals($client->getResponse()->getContent(),'{"id":"1","url":"http:\/\/deboutlesgens.com\/blog\/le-courage-de-vivre-consciemment\/","title":"Le courage de vivre consciemment","content":"Test content","updated":null,"status":null,"bookmark":"0","fetched":"1","user_id":"1"}');
+        $this->assertEquals('[{"id":"1","url":"http:\/\/deboutlesgens.com\/blog\/le-courage-de-vivre-consciemment\/","title":"Le courage de vivre consciemment","content":"Test content","updated":null,"status":null,"bookmark":"0","fetched":"1","user_id":"1"}]', $client->getResponse()->getContent());
 
     }