57 files changed, 269 insertions, 3737 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 69dfd4b1..4eb314f7 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -23,10 +23,16 @@ class EntryController extends Controller
     {
         try {
             $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
+
             $em = $this->getDoctrine()->getManager();
             $em->persist($entry);
             $em->flush();
         } catch (\Exception $e) {
+            $this->get('logger')->error('Error while saving an entry', [
+                'exception' => $e,
+                'entry' => $entry,
+            ]);
+
             return false;
         }
 
@@ -60,11 +66,12 @@ class EntryController extends Controller
                 return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()]));
             }
 
-            $this->updateEntry($entry);
-            $this->get('session')->getFlashBag()->add(
-                'notice',
-                'flashes.entry.notice.entry_saved'
-            );
+            $message = 'flashes.entry.notice.entry_saved';
+            if (false === $this->updateEntry($entry)) {
+                $message = 'flashes.entry.notice.entry_saved_failed';
+            }
+
+            $this->get('session')->getFlashBag()->add('notice', $message);
 
             return $this->redirect($this->generateUrl('homepage'));
         }
@@ -399,7 +406,7 @@ class EntryController extends Controller
         $url = $this->generateUrl(
             'view',
             ['id' => $entry->getId()],
-            UrlGeneratorInterface::ABSOLUTE_URL
+            UrlGeneratorInterface::ABSOLUTE_PATH
         );
 
         $em = $this->getDoctrine()->getManager();
@@ -411,8 +418,9 @@ class EntryController extends Controller
             'flashes.entry.notice.entry_deleted'
         );
 
-        // don't redirect user to the deleted entry
-        $to = ($url !== $request->headers->get('referer') ? $request->headers->get('referer') : null);
+        // don't redirect user to the deleted entry (check that the referer doesn't end with the same url)
+        $referer = $request->headers->get('referer');
+        $to = (1 !== preg_match('#'.$url.'$#i', $referer) ? $referer : null);
 
         $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);
 
diff --git a/src/Wallabag/CoreBundle/Controller/FooterController.php b/src/Wallabag/CoreBundle/Controller/FooterController.php
new file mode 100644
index 00000000..fd93c436
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Controller/FooterController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Wallabag\CoreBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class FooterController extends Controller
+{
+    /**
+     * Display the footer.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function indexAction()
+    {
+        $addonsUrl = $this->container->getParameter('addons_url');
+        $socialsUrl = $this->container->getParameter('socials_url');
+
+        return $this->render(
+            'WallabagCoreBundle::footer.html.twig',
+            [
+                'addonsUrl' => $addonsUrl,
+                'socialsUrl' => $socialsUrl,
+            ]
+        );
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
index b41302f8..2a57f06f 100644
--- a/src/Wallabag/CoreBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -12,9 +12,11 @@ class StaticController extends Controller
      */
     public function howtoAction()
     {
+        $addonsUrl = $this->container->getParameter('addons_url');
+
         return $this->render(
             'WallabagCoreBundle:Static:howto.html.twig',
-            []
+            ['addonsUrl' => $addonsUrl]
         );
     }
 
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
index 5a376453..03be9667 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php
@@ -6,7 +6,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\TaggingRule;
 
 class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -16,12 +15,6 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager)
     {
         $adminConfig = new Config($this->getReference('admin-user'));
-        $taggingRule = new TaggingRule();
-
-        $taggingRule->setConfig($adminConfig);
-        $taggingRule->setRule('title matches "wallabag"');
-        $taggingRule->setTags(['wallabag']);
-        $manager->persist($taggingRule);
 
         $adminConfig->setTheme('material');
         $adminConfig->setItemsPerPage(30);
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTaggingRuleData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTaggingRuleData.php
index 2e1cc270..7efe6356 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTaggingRuleData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTaggingRuleData.php
@@ -28,6 +28,14 @@ class LoadTaggingRuleData extends AbstractFixture implements OrderedFixtureInter
 
         $manager->persist($tr2);
 
+        $tr3 = new TaggingRule();
+
+        $tr3->setRule('title matches "wallabag"');
+        $tr3->setTags(['wallabag']);
+        $tr3->setConfig($this->getReference('admin-config'));
+
+        $manager->persist($tr3);
+
         $manager->flush();
     }
 
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index 84599f0d..7d08b73b 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -25,6 +25,7 @@ class WallabagCoreExtension extends Extension
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
+        $loader->load('parameters.yml');
     }
 
     public function getAlias()
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 1271f1f5..ceae78b0 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -177,8 +177,16 @@ class Entry
     private $user;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist", "remove"})
-     * @ORM\JoinTable
+     * @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist"})
+     * @ORM\JoinTable(
+     *  name="entry_tag",
+     *  joinColumns={
+     *      @ORM\JoinColumn(name="entry_id", referencedColumnName="id")
+     *  },
+     *  inverseJoinColumns={
+     *      @ORM\JoinColumn(name="tag_id", referencedColumnName="id")
+     *  }
+     * )
      *
      * @Groups({"entries_for_user", "export_all"})
      */
@@ -526,13 +534,18 @@ class Entry
             }
         }
 
-        $this->tags[] = $tag;
+        $this->tags->add($tag);
         $tag->addEntry($this);
     }
 
     public function removeTag(Tag $tag)
     {
+        if (!$this->tags->contains($tag)) {
+            return;
+        }
+
         $this->tags->removeElement($tag);
+        $tag->removeEntry($this);
     }
 
     /**
diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php
index b4adbbd3..4b480ff1 100644
--- a/src/Wallabag/CoreBundle/Entity/Tag.php
+++ b/src/Wallabag/CoreBundle/Entity/Tag.php
@@ -98,9 +98,30 @@ class Tag
         return $this->slug;
     }
 
+    /**
+     * @param Entry $entry
+     */
     public function addEntry(Entry $entry)
     {
-        $this->entries[] = $entry;
+        if ($this->entries->contains($entry)) {
+            return;
+        }
+
+        $this->entries->add($entry);
+        $entry->addTag($this);
+    }
+
+    /**
+     * @param Entry $entry
+     */
+    public function removeEntry(Entry $entry)
+    {
+        if (!$this->entries->contains($entry)) {
+            return;
+        }
+
+        $this->entries->removeElement($entry);
+        $entry->removeTag($this);
     }
 
     public function hasEntry($entry)
diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
index b712ad15..cb4bee83 100644
--- a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
+++ b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
@@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface
     private $separator;
 
     /**
-     * @param string $separator The separator used in the list.
+     * @param string $separator The separator used in the list
      */
     public function __construct($separator = ',')
     {
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 4cf22200..7d25cc80 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -21,7 +21,9 @@ class ConfigType extends AbstractType
     {
         $this->themes = array_combine(
             $themes,
-            array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
+            array_map(function ($s) {
+                return ucwords(strtolower(str_replace('-', ' ', $s)));
+            }, $themes)
         );
 
         $this->languages = $languages;
@@ -32,7 +34,6 @@ class ConfigType extends AbstractType
         $builder
             ->add('theme', ChoiceType::class, [
                 'choices' => array_flip($this->themes),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.theme_label',
             ])
             ->add('items_per_page', null, [
@@ -49,7 +50,6 @@ class ConfigType extends AbstractType
             ])
             ->add('language', ChoiceType::class, [
                 'choices' => array_flip($this->languages),
-                'choices_as_values' => true,
                 'label' => 'config.form_settings.language_label',
             ])
             ->add('save', SubmitType::class, [
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index cd4d3490..3c597b5d 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -36,17 +36,26 @@ class EntryFilterType extends AbstractType
         $builder
             ->add('readingTime', NumberRangeFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
-                    $value = $values['value'];
+                    $lower = $values['value']['left_number'][0];
+                    $upper = $values['value']['right_number'][0];
+
+                    $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed());
+                    $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed());
 
-                    if (null === $value['left_number'][0] || null === $value['right_number'][0]) {
+                    if (null === $lower && null === $upper) {
+                        // no value? no filter
                         return;
+                    } elseif (null === $lower && null !== $upper) {
+                        // only lower value is defined: query all entries with reading LOWER THAN this value
+                        $expression = $filterQuery->getExpr()->lte($field, $max);
+                    } elseif (null !== $lower && null === $upper) {
+                        // only upper value is defined: query all entries with reading GREATER THAN this value
+                        $expression = $filterQuery->getExpr()->gte($field, $min);
+                    } else {
+                        // both value are defined, perform a between
+                        $expression = $filterQuery->getExpr()->between($field, $min, $max);
                     }
 
-                    $min = (int) ($value['left_number'][0] * $this->user->getConfig()->getReadingSpeed());
-                    $max = (int) ($value['right_number'][0] * $this->user->getConfig()->getReadingSpeed());
-
-                    $expression = $filterQuery->getExpr()->between($field, $min, $max);
-
                     return $filterQuery->createCondition($expression);
                 },
                 'label' => 'entry.filters.reading_time.label',
@@ -87,6 +96,18 @@ class EntryFilterType extends AbstractType
             ->add('isStarred', CheckboxFilterType::class, [
                 'label' => 'entry.filters.starred_label',
             ])
+            ->add('isUnread', CheckboxFilterType::class, [
+                'label' => 'entry.filters.unread_label',
+                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
+                    if (false === $values['value']) {
+                        return;
+                    }
+
+                    $expression = $filterQuery->getExpr()->eq('e.isArchived', 'false');
+
+                    return $filterQuery->createCondition($expression);
+                },
+            ])
             ->add('previewPicture', CheckboxFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     if (false === $values['value']) {
@@ -101,7 +122,6 @@ class EntryFilterType extends AbstractType
             ])
             ->add('language', ChoiceFilterType::class, [
                 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
-                'choices_as_values' => true,
                 'label' => 'entry.filters.language_label',
             ])
         ;
diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
index 14ef4a64..239d09ae 100644
--- a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
+++ b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
@@ -25,7 +25,7 @@ class RuleBasedTagger
     /**
      * Add tags from rules defined by the user.
      *
-     * @param Entry $entry Entry to tag.
+     * @param Entry $entry Entry to tag
      */
     public function tag(Entry $entry)
     {
@@ -49,7 +49,7 @@ class RuleBasedTagger
      *
      * @param User $user
      *
-     * @return array<Entry> A list of modified entries.
+     * @return array<Entry> A list of modified entries
      */
     public function tagAllForUser(User $user)
     {
@@ -75,7 +75,7 @@ class RuleBasedTagger
     /**
      * Fetch a tag.
      *
-     * @param string $label The tag's label.
+     * @param string $label The tag's label
      *
      * @return Tag
      */
diff --git a/src/Wallabag/CoreBundle/Resources/config/parameters.yml b/src/Wallabag/CoreBundle/Resources/config/parameters.yml
new file mode 100644
index 00000000..abd9ab68
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/config/parameters.yml
@@ -0,0 +1,12 @@
+parameters:
+    addons_url:
+        firefox: https://addons.mozilla.org/firefox/addon/wallabag-v2/
+        chrome: https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm
+        f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche
+        google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
+        ios: https://itunes.apple.com/app/wallabag/id828331015?mt=8
+        windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646
+    socials_url:
+        twitter: https://twitter.com/wallabagapp
+        google_plus: https://plus.google.com/+WallabagOrg/posts
+        facebook: https://facebook.com/Wallabag
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css
index b203cbb8..605eb641 100644
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css
@@ -64,7 +64,7 @@ pre {
   max-width: 61.25em;/*980px*/
 }
 
-table, img {
+table, img, figure {
   max-width: 100%;
   height :auto;
 }
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
index b106d91a..b4e082d3 100755
--- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
@@ -345,7 +345,8 @@ main ul.row {
     max-width: 40em;
 }
 
-#article img {
+#article img,
+#article figure {
     max-width: 100%;
     height: auto;
 }
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 8d392063..213d5790 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -154,6 +154,7 @@ entry:
         status_label: 'Status'
         archived_label: 'Arkiveret'
         starred_label: 'Favorit'
+        unread_label: 'Ulæst'
         preview_picture_label: 'Har et vist billede'
         preview_picture_help: 'Forhåndsvis billede'
         language_label: 'Sprog'
@@ -396,6 +397,7 @@ flashes:
         notice:
             # entry_already_saved: 'Entry already saved on %date%'
             # entry_saved: 'Entry saved'
+            # entry_saved_failed: 'Failed to save entry'
             # entry_updated: 'Entry updated'
             # entry_reloaded: 'Entry reloaded'
             # entry_reload_failed: 'Failed to reload entry'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index c7a89492..c98cf0fc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -154,6 +154,7 @@ entry:
         status_label: 'Status'
         archived_label: 'Archiviert'
         starred_label: 'Favorisiert'
+        unread_label: 'Ungelesene'
         preview_picture_label: 'Vorschaubild vorhanden'
         preview_picture_help: 'Vorschaubild'
         language_label: 'Sprache'
@@ -395,7 +396,8 @@ flashes:
     entry:
         notice:
             entry_already_saved: 'Eintrag bereits am %date% gespeichert'
-            entry_saved: 'Eintag gespeichert'
+            entry_saved: 'Eintrag gespeichert'
+            # entry_saved_failed: 'Failed to save entry'
             entry_updated: 'Eintrag aktualisiert'
             entry_reloaded: 'Eintrag neugeladen'
             entry_reload_failed: 'Neuladen des Eintrags fehlgeschlagen'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 1cc42404..b65e4522 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -81,7 +81,7 @@ config:
             archive: 'archived'
         rss_limit: 'Number of items in the feed'
     form_user:
-        two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion"
+        two_factor_description: "Enabling two factor authentication means you'll receive an email with a code on every new untrusted connection."
         name_label: 'Name'
         email_label: 'Email'
         twoFactorAuthentication_label: 'Two factor authentication'
@@ -98,9 +98,9 @@ config:
         faq:
             title: 'FAQ'
             tagging_rules_definition_title: 'What does « tagging rules » mean?'
-            tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
+            tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble of manually classifying your entries.'
             how_to_use_them_title: 'How do I use them?'
-            how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
+            how_to_use_them_description: 'Let us assume you want to tag new entries as « <i>short reading</i> » when the reading time is under 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them with a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
             variables_available_title: 'Which variables and operators can I use to write rules?'
             variables_available_description: 'The following variables and operators can be used to create tagging rules:'
             meaning: 'Meaning'
@@ -140,7 +140,7 @@ entry:
         archived: 'Archived entries'
         filtered: 'Filtered entries'
     list:
-        number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
+        number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
         reading_time: 'estimated reading time'
         reading_time_minutes: 'estimated reading time: %readingTime% min'
         reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
@@ -154,6 +154,7 @@ entry:
         status_label: 'Status'
         archived_label: 'Archived'
         starred_label: 'Starred'
+        unread_label: 'Unread'
         preview_picture_label: 'Has a preview picture'
         preview_picture_help: 'Preview picture'
         language_label: 'Language'
@@ -222,14 +223,14 @@ about:
         bug_reports: 'Bug reports'
         support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
     helping:
-        description: 'wallabag is free and opensource. You can help us:'
+        description: 'wallabag is free and open source. You can help us:'
         by_contributing: 'by contributing to the project:'
         by_contributing_2: 'an issue lists all our needs'
         by_paypal: 'via Paypal'
     contributors:
         description: 'Thank you to contributors on wallabag web application'
     third_party:
-        description: 'Here are the list of third-party libraries used in wallabag (with their licenses):'
+        description: 'Here is the list of third-party libraries used in wallabag (with their licenses):'
         package: 'Package'
         license: 'License'
 
@@ -258,7 +259,7 @@ quickstart:
     page_title: 'Quickstart'
     intro:
         title: 'Welcome to wallabag!'
-        paragraph_1: "We'll accompany you to visit wallabag and show you some features which can interest you."
+        paragraph_1: "We'll accompany you on your visit to wallabag and show you some features that might interest you."
         paragraph_2: 'Follow us!'
     configure:
         title: 'Configure the application'
@@ -290,7 +291,7 @@ quickstart:
         title: 'Full documentation'
         annotate: 'Annotate your article'
         export: 'Convert your articles into ePUB or PDF'
-        search_filters: 'See how you can look for an article by using search engine and filters'
+        search_filters: 'See how you can look for an article by using the search engine and filters'
         fetching_errors: 'What can I do if an article encounters errors during fetching?'
         all_docs: 'And so many other articles!'
     support:
@@ -303,11 +304,11 @@ quickstart:
 tag:
     page_title: 'Tags'
     list:
-        number_on_the_page: '{0} There is no tag.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
+        number_on_the_page: '{0} There are no tags.|{1} There is one tag.|]1,Inf[ There are %count% tags.'
 
 import:
     page_title: 'Import'
-    page_description: 'Welcome to wallabag importer. Please select your previous service that you want to migrate.'
+    page_description: 'Welcome to wallabag importer. Please select your previous service from which you want to migrate.'
     action:
         import_contents: 'Import contents'
     form:
@@ -317,7 +318,7 @@ import:
         save_label: 'Upload file'
     pocket:
         page_title: 'Import > Pocket'
-        description: "This importer will import all your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
+        description: "This importer will import all of your Pocket data. Pocket doesn't allow us to retrieve content from their service, so the readable content of each article will be re-fetched by wallabag."
         config_missing:
             description: "Pocket import isn't configured."
             admin_message: 'You need to define %keyurls%a pocket_consumer_key%keyurle%.'
@@ -396,6 +397,7 @@ flashes:
         notice:
             entry_already_saved: 'Entry already saved on %date%'
             entry_saved: 'Entry saved'
+            entry_saved_failed: 'Failed to save entry'
             entry_updated: 'Entry updated'
             entry_reloaded: 'Entry reloaded'
             entry_reload_failed: 'Failed to reload entry'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index e8461247..75978f16 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -135,7 +135,7 @@ config:
 
 entry:
     page_titles:
-        unread: 'Artúclos no leídos'
+        unread: 'Artículos no leídos'
         starred: 'Artículos favoritos'
         archived: 'Artículos archivados'
         filtered: 'Artículos filtrados'
@@ -154,6 +154,7 @@ entry:
         status_label: 'Estatus'
         archived_label: 'Archivado'
         starred_label: 'Favorito'
+        unread_label: 'Sin leer'
         preview_picture_label: 'Hay una foto'
         preview_picture_help: 'Foto de preview'
         language_label: 'Idioma'
@@ -396,6 +397,7 @@ flashes:
         notice:
             entry_already_saved: 'Entrada ya guardada por %fecha%'
             entry_saved: 'Entrada guardada'
+            # entry_saved_failed: 'Failed to save entry'
             entry_updated: 'Entrada actualizada'
             entry_reloaded: 'Entrada recargada'
             entry_reload_failed: 'Entrada recargada reprobada'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index d34ff8ff..db6e5960 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -96,8 +96,8 @@ config:
         rule_label: 'قانون'
         tags_label: 'برچسب‌ها'
         faq:
-             title: 'پرسش‌های متداول'
-             tagging_rules_definition_title: 'برچسب‌گذاری خودکار یعنی چه؟'
+            title: 'پرسش‌های متداول'
+            tagging_rules_definition_title: 'برچسب‌گذاری خودکار یعنی چه؟'
         #     tagging_rules_definition_description: 'They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.'
         #     how_to_use_them_title: 'How do I use them?'
         #     how_to_use_them_description: 'Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »'
@@ -154,6 +154,7 @@ entry:
         status_label: 'وضعیت'
         archived_label: 'بایگانی‌شده'
         starred_label: 'برگزیده'
+        unread_label: 'خوانده‌نشده'
         preview_picture_label: 'دارای عکس پیش‌نمایش'
         preview_picture_help: 'پیش‌نمایش عکس'
         language_label: 'زبان'
@@ -383,30 +384,31 @@ developer:
 flashes:
     config:
         notice:
-           config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود.'
-           password_updated: 'رمز به‌روز شد'
-           password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید."
-           user_updated: 'اطلاعات به‌روز شد'
-           rss_updated: 'اطلاعات آر-اس-اس به‌روز شد'
-           tagging_rules_updated: 'برچسب‌گذاری خودکار به‌روز شد'
-           tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد'
-           user_added: 'کابر "%username%" ا�زوده شد'
-           rss_token_updated: 'کد آر-اس-اس به‌روز شد'
+            config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود.'
+            password_updated: 'رمز به‌روز شد'
+            password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید."
+            user_updated: 'اطلاعات به‌روز شد'
+            rss_updated: 'اطلاعات آر-اس-اس به‌روز شد'
+            tagging_rules_updated: 'برچسب‌گذاری خودکار به‌روز شد'
+            tagging_rules_deleted: 'قانون برچسب‌گذاری پاک شد'
+            user_added: 'کابر "%username%" ا�زوده شد'
+            rss_token_updated: 'کد آر-اس-اس به‌روز شد'
     entry:
         notice:
-           entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
-           entry_saved: 'مقاله ذخیره شد'
-           entry_updated: 'مقاله به‌روز شد'
-           entry_reloaded: 'مقاله به‌روز شد'
-           entry_reload_failed: 'به‌روزرسانی مقاله شکست خورد'
-           entry_archived: 'مقاله بایگانی شد'
-           entry_unarchived: 'مقاله از بایگانی درآمد'
-           entry_starred: 'مقاله برگزیده شد'
-           entry_unstarred: 'مقاله نابرگزیده شد'
-           entry_deleted: 'مقاله پاک شد'
+            entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود'
+            entry_saved: 'مقاله ذخیره شد'
+            # entry_saved_failed: 'Failed to save entry'
+            entry_updated: 'مقاله به‌روز شد'
+            entry_reloaded: 'مقاله به‌روز شد'
+            entry_reload_failed: 'به‌روزرسانی مقاله شکست خورد'
+            entry_archived: 'مقاله بایگانی شد'
+            entry_unarchived: 'مقاله از بایگانی درآمد'
+            entry_starred: 'مقاله برگزیده شد'
+            entry_unstarred: 'مقاله نابرگزیده شد'
+            entry_deleted: 'مقاله پاک شد'
     tag:
         notice:
-           tag_added: 'برچسب ا�زوده شد'
+            tag_added: 'برچسب ا�زوده شد'
     import:
         notice:
             failed: 'درون‌ریزی شکست خورد. لط�اً دوباره تلاش کنید.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 80ba0546..94300596 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -154,6 +154,7 @@ entry:
         status_label: 'Status'
         archived_label: 'Lus'
         starred_label: 'Favoris'
+        unread_label: 'Non lus'
         preview_picture_label: 'A une photo'
         preview_picture_help: 'Photo'
         language_label: 'Langue'
@@ -267,12 +268,12 @@ quickstart:
         tagging_rules: 'Écrivez des règles pour classer automatiquement vos articles'
     admin:
         title: 'Administration'
-        description: "En tant qu'adminitrasteur sur wallabag, vous avez des privilèges qui vous permette de :"
+        description: "En tant qu'administrateur sur wallabag, vous avez des privilèges qui vous permettent de :"
         new_user: 'Créer un nouvel utilisateur'
         analytics: 'Configurer les statistiques'
         sharing: 'Activer des paramètres de partages'
-        export: 'Configurer les export'
-        import: 'Configurer les import'
+        export: "Configurer les formats d'export"
+        import: "Configurer l'import"
     first_steps:
         title: 'Premiers pas'
         new_article: 'Ajoutez votre premier article'
@@ -288,7 +289,7 @@ quickstart:
         create_application: 'Créer votre application tierce'
     docs:
         title: 'Documentation complète'
-        annotate: 'Annotater votre article'
+        annotate: 'Annoter votre article'
         export: 'Convertissez vos articles en ePub ou en PDF'
         search_filters: "Apprenez à utiliser le moteur de recherche et les filtres pour retrouver l'article qui vous intéresse"
         fetching_errors: "Que faire si mon article n'est pas correctement récupéré ?"
@@ -396,6 +397,7 @@ flashes:
         notice:
             entry_already_saved: 'Article déjà sauvergardé le %date%'
             entry_saved: 'Article enregistré'
+            entry_saved_failed: "L'enregistrement a échoué"
             entry_updated: 'Article mis à jour'
             entry_reloaded: 'Article rechargé'
             entry_reload_failed: "Le rechargement de l'article a échoué"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 4f3ac090..00ed9c98 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -396,6 +396,7 @@ flashes:
         notice:
             entry_already_saved: 'Contenuto già salvato in data %date%'
             entry_saved: 'Contenuto salvato'
+            # entry_saved_failed: 'Failed to save entry'
             entry_updated: 'Contenuto aggiornato'
             entry_reloaded: 'Contenuto ricaricato'
             entry_reload_failed: 'Errore nel ricaricamento del contenuto'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 46f58bbf..c81c852b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -154,6 +154,7 @@ entry:
         status_label: 'Estatus'
         archived_label: 'Legits'
         starred_label: 'Favorits'
+        unread_label: 'Pas legits'
         preview_picture_label: 'A una fotò'
         preview_picture_help: 'Fotò'
         language_label: 'Lenga'
@@ -396,6 +397,7 @@ flashes:
         notice:
             entry_already_saved: 'Article ja salvargardat lo %date%'
             entry_saved: 'Article enregistrat'
+            # entry_saved_failed: 'Failed to save entry'
             entry_updated: 'Article mes a jorn'
             entry_reloaded: 'Article recargat'
             entry_reload_failed: "Fracàs de l'actualizacion de l'article"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 292749ed..3707a857 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -154,6 +154,7 @@ entry:
         status_label: 'Status'
         archived_label: 'Zarchiwizowane'
         starred_label: 'Oznaczone gwiazdkÄ…'
+        unread_label: 'Nieprzeczytane'
         preview_picture_label: 'Posiada podglÄ…d obrazu'
         preview_picture_help: 'PodglÄ…d obrazu'
         language_label: 'Język'
@@ -396,6 +397,7 @@ flashes:
         notice:
             entry_already_saved: 'Wpis już został dodany %date%'
             entry_saved: 'Wpis zapisany'
+            # entry_saved_failed: 'Failed to save entry'
             entry_updated: 'Wpis zaktualizowany'
             entry_reloaded: 'Wpis ponownie załadowany'
             entry_reload_failed: 'Błąd ponownego załadowania'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 45040f35..27be1edc 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -154,6 +154,7 @@ entry:
         status_label: 'Status'
         archived_label: 'Arhivat'
         starred_label: 'Steluțe'
+        unread_label: 'Necitite'
         preview_picture_label: 'Are o imagine de previzualizare'
         preview_picture_help: 'Previzualizare imagine'
         language_label: 'Limbă'
@@ -396,6 +397,7 @@ flashes:
         notice:
             # entry_already_saved: 'Entry already saved on %date%'
             # entry_saved: 'Entry saved'
+            # entry_saved_failed: 'Failed to save entry'
             # entry_updated: 'Entry updated'
             # entry_reloaded: 'Entry reloaded'
             # entry_reload_failed: 'Failed to reload entry'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 8a095a5b..85ee7316 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -154,6 +154,7 @@ entry:
         status_label: 'Durum'
         archived_label: 'ArÅŸiv'
         starred_label: 'Favori'
+        unread_label: 'Okunmayan'
         preview_picture_label: 'Resim önizlemesi varsa'
         preview_picture_help: 'Resim önizlemesi'
         language_label: 'Dil'
@@ -396,6 +397,7 @@ flashes:
         notice:
             entry_already_saved: 'Entry already saved on %date%'
             entry_saved: 'Makale kaydedildi'
+            # entry_saved_failed: 'Failed to save entry'
             # entry_updated: 'Entry updated'
             entry_reloaded: 'Makale içeriği yenilendi'
             # entry_reload_failed: 'Failed to reload entry'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index c51f90d2..a8abe8d3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -134,7 +134,8 @@
         </fieldset>
         {% endif %}
 
-        {{ form_rest(form.user) }}
+        {{ form_widget(form.user._token) }}
+        {{ form_widget(form.user.save) }}
     </form>
 
     <h2>{{ 'config.tab_menu.password'|trans }}</h2>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index a2caaebf..778625ae 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -54,6 +54,11 @@
                 </div>
 
                 <div class="input-field">
+                    {{ form_widget(form.isUnread) }}
+                    {{ form_label(form.isUnread) }}
+                </div>
+
+                <div class="input-field">
                     {{ form_widget(form.previewPicture) }}
                     {{ form_label(form.previewPicture) }}
                 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
index eab092c7..b529a0ac 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
@@ -11,14 +11,14 @@
     </ul>
     <h3>{{ 'howto.top_menu.browser_addons'|trans }}</h3>
     <ul>
-        <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
-        <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
+        <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
+        <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
     </ul>
     <h3>{{ 'howto.top_menu.mobile_apps'|trans }}</h3>
     <ul>
-        <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
-        <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
-        <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
+        <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
+        <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
+        <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
     </ul>
     <h3>{{ 'howto.top_menu.bookmarklet'|trans }}</h3>
     <p>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 5a90f227..afd5b499 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -158,7 +158,7 @@
                             {% endif %}
 
                             {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                            {{ form_rest(form.user) }}
+                            {{ form_widget(form.user._token) }}
                         </form>
                     </div>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index cc4038c5..920fa933 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -32,7 +32,7 @@
 
                         <div class="card-content">
                             {% if not entry.previewPicture is null %}
-                                <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-vert right"></i>
+                                <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i>
                             {% endif %}
 
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
@@ -126,6 +126,11 @@
                     {{ form_label(form.isStarred) }}
                 </div>
 
+                <div class="input-field col s6 with-checkbox">
+                    {{ form_widget(form.isUnread) }}
+                    {{ form_label(form.isUnread) }}
+                </div>
+
                 <div class="col s12">
                     <label>{{ 'entry.filters.preview_picture_help'|trans }}</label>
                 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
index 4354a6b7..6a177d6b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
@@ -18,17 +18,17 @@
                     <div class="col s12">
                         <h5>{{ 'howto.top_menu.browser_addons'|trans }}</h5>
                         <ul>
-                            <li><a href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
-                            <li><a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
+                            <li><a href="{{ addonsUrl.firefox }}" target="_blank">{{ 'howto.browser_addons.firefox'|trans }}</a></li>
+                            <li><a href="{{ addonsUrl.chrome }}" target="_blank">{{ 'howto.browser_addons.chrome'|trans }}</a></li>
                         </ul>
                     </div>
 
                     <div class="col s12">
                         <h5>{{ 'howto.top_menu.mobile_apps'|trans }}</h5>
                         <ul>
-                            <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
-                            <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
-                            <li>Windows Phone: <a href="http://www.windowsphone.com/en-US/store/app/wallabag/d5226cf1-f422-4e00-996c-88e9c5233332" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
+                            <li>Android: <a href="{{ addonsUrl.f_droid }}" target="_blank">{{ 'howto.mobile_apps.android.via_f_droid'|trans }}</a> / <a href="{{ addonsUrl.google_play }}" target="_blank">{{ 'howto.mobile_apps.android.via_google_play'|trans }}</a></li>
+                            <li>iOS: <a href="{{ addonsUrl.ios }}" target="_blank">{{ 'howto.mobile_apps.ios'|trans }}</a></li>
+                            <li>Windows Phone: <a href="{{ addonsUrl.windows }}" target="_blank">{{ 'howto.mobile_apps.windows'|trans }}</a></li>
                         </ul>
                     </div>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
new file mode 100644
index 00000000..7cb19966
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/footer.html.twig
@@ -0,0 +1,41 @@
+<footer class="page-footer cyan darken-2">
+    <div class="container">
+        <div class="row">
+            <div class="col l6 s12">
+                <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5>
+                <p class="grey-text text-lighten-4">
+                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.google_play }}" title="Android">
+                        <span class="icon-android"></span>
+                    </a>
+                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.ios }}" title="iOS">
+                        <span class="icon-apple"></span>
+                    </a>
+                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.firefox }}" title="Firefox">
+                        <span class="icon-firefox"></span>
+                    </a>
+                    <a target="_blank" class="grey-text text-lighten-3" href="{{ addonsUrl.chrome }}" title="Chrome">
+                        <span class="icon-chrome"></span>
+                    </a>
+                </p>
+            </div>
+            <div class="col l4 offset-l2 s12">
+                <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5>
+                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.twitter }}" title="Twitter">
+                    <span class="icon-twitter"></span>
+                </a>
+                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.google_plus }}" title="Google+">
+                    <span class="icon-google-plus2"></span>
+                </a>
+                <a target="_blank" class="grey-text text-lighten-3" href="{{ socialsUrl.facebook }}" title="Facebook">
+                    <span class="icon-facebook2"></span>
+                </a>
+            </div>
+        </div>
+    </div>
+    <div class="footer-copyright">
+        <div class="container">
+            <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
+            <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
+        </div>
+    </div>
+</footer>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 25ad23dd..a5c16792 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -122,45 +122,5 @@
 {% endblock %}
 
 {% block footer %}
-    <footer class="page-footer cyan darken-2">
-        <div class="container">
-            <div class="row">
-                <div class="col l6 s12">
-                    <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5>
-                    <p class="grey-text text-lighten-4">
-                        <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="Android">
-                            <span class="icon-android"></span>
-                        </a>
-                        <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS">
-                            <span class="icon-apple"></span>
-                        </a>
-                        <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag/" title="Firefox">
-                            <span class="icon-firefox"></span>
-                        </a>
-                        <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome">
-                            <span class="icon-chrome"></span>
-                        </a>
-                    </p>
-                </div>
-                <div class="col l4 offset-l2 s12">
-                    <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5>
-                    <a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp" title="Twitter">
-                        <span class="icon-twitter"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts" title="Google+">
-                        <span class="icon-google-plus2"></span>
-                    </a>
-                    <a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag" title="Facebook">
-                        <span class="icon-facebook2"></span>
-                    </a>
-                </div>
-            </div>
-        </div>
-        <div class="footer-copyright">
-            <div class="container">
-                <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
-                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
-            </div>
-        </div>
-    </footer>
+    {{ render(controller("WallabagCoreBundle:Footer:index")) }}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
deleted file mode 100644
index 0673d581..00000000
--- a/src/Wallabag/CoreBundle/Tests/Command/InstallCommandTest.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Command;
-
-use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
-use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Tester\CommandTester;
-use Wallabag\CoreBundle\Command\InstallCommand;
-use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class InstallCommandTest extends WallabagCoreTestCase
-{
-    public function setUp()
-    {
-        parent::setUp();
-
-        if ($this->getClient()->getContainer()->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver) {
-            /*
-             * LOG:  statement: CREATE DATABASE "wallabag"
-             * ERROR:  source database "template1" is being accessed by other users
-             * DETAIL:  There is 1 other session using the database.
-             * STATEMENT:  CREATE DATABASE "wallabag"
-             * FATAL:  database "wallabag" does not exist
-             *
-             * http://stackoverflow.com/a/14374832/569101
-             */
-            $this->markTestSkipped('PostgreSQL spotted: can find a good way to drop current database, skipping.');
-        }
-    }
-
-    public static function tearDownAfterClass()
-    {
-        $application = new Application(static::$kernel);
-        $application->setAutoExit(false);
-
-        $code = $application->run(new ArrayInput([
-            'command' => 'doctrine:fixtures:load',
-            '--no-interaction' => true,
-            '--env' => 'test',
-        ]), new NullOutput());
-    }
-
-    public function testRunInstallCommand()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new InstallCommandMock());
-
-        $command = $application->find('wallabag:install');
-
-        // We mock the QuestionHelper
-        $question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $question->expects($this->any())
-            ->method('ask')
-            ->will($this->returnValue('yes_'.uniqid('', true)));
-
-        // We override the standard helper with our mock
-        $command->getHelperSet()->set($question, 'question');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-        ]);
-
-        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Config setup.', $tester->getDisplay());
-        $this->assertContains('Installing assets.', $tester->getDisplay());
-    }
-
-    public function testRunInstallCommandWithReset()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new InstallCommandMock());
-
-        $command = $application->find('wallabag:install');
-
-        // We mock the QuestionHelper
-        $question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $question->expects($this->any())
-            ->method('ask')
-            ->will($this->returnValue('yes_'.uniqid('', true)));
-
-        // We override the standard helper with our mock
-        $command->getHelperSet()->set($question, 'question');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-            '--reset' => true,
-        ]);
-
-        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
-        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Config setup.', $tester->getDisplay());
-        $this->assertContains('Installing assets.', $tester->getDisplay());
-
-        // we force to reset everything
-        $this->assertContains('Droping database, creating database and schema, clearing the cache', $tester->getDisplay());
-    }
-
-    public function testRunInstallCommandWithDatabaseRemoved()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new DropDatabaseDoctrineCommand());
-
-        // drop database first, so the install command won't ask to reset things
-        $command = $application->find('doctrine:database:drop');
-        $command->run(new ArrayInput([
-            'command' => 'doctrine:database:drop',
-            '--force' => true,
-        ]), new NullOutput());
-
-        // start a new application to avoid lagging connexion to pgsql
-        $client = static::createClient();
-        $application = new Application($client->getKernel());
-        $application->add(new InstallCommand());
-
-        $command = $application->find('wallabag:install');
-
-        // We mock the QuestionHelper
-        $question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $question->expects($this->any())
-            ->method('ask')
-            ->will($this->returnValue('yes_'.uniqid('', true)));
-
-        // We override the standard helper with our mock
-        $command->getHelperSet()->set($question, 'question');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-        ]);
-
-        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Config setup.', $tester->getDisplay());
-        $this->assertContains('Installing assets.', $tester->getDisplay());
-
-        // the current database doesn't already exist
-        $this->assertContains('Creating database and schema, clearing the cache', $tester->getDisplay());
-    }
-
-    public function testRunInstallCommandChooseResetSchema()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new InstallCommandMock());
-
-        $command = $application->find('wallabag:install');
-
-        // We mock the QuestionHelper
-        $question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $question->expects($this->exactly(3))
-            ->method('ask')
-            ->will($this->onConsecutiveCalls(
-                false, // don't want to reset the entire database
-                true, // do want to reset the schema
-                false // don't want to create a new user
-            ));
-
-        // We override the standard helper with our mock
-        $command->getHelperSet()->set($question, 'question');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-        ]);
-
-        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Config setup.', $tester->getDisplay());
-        $this->assertContains('Installing assets.', $tester->getDisplay());
-
-        $this->assertContains('Droping schema and creating schema', $tester->getDisplay());
-    }
-
-    public function testRunInstallCommandChooseNothing()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new InstallCommand());
-        $application->add(new DropDatabaseDoctrineCommand());
-        $application->add(new CreateDatabaseDoctrineCommand());
-
-        // drop database first, so the install command won't ask to reset things
-        $command = new DropDatabaseDoctrineCommand();
-        $command->setApplication($application);
-        $command->run(new ArrayInput([
-            'command' => 'doctrine:database:drop',
-            '--force' => true,
-        ]), new NullOutput());
-
-        $this->getClient()->getContainer()->get('doctrine')->getConnection()->close();
-
-        $command = new CreateDatabaseDoctrineCommand();
-        $command->setApplication($application);
-        $command->run(new ArrayInput([
-            'command' => 'doctrine:database:create',
-            '--env' => 'test',
-        ]), new NullOutput());
-
-        $command = $application->find('wallabag:install');
-
-        // We mock the QuestionHelper
-        $question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $question->expects($this->exactly(2))
-            ->method('ask')
-            ->will($this->onConsecutiveCalls(
-                false, // don't want to reset the entire database
-                false // don't want to create a new user
-            ));
-
-        // We override the standard helper with our mock
-        $command->getHelperSet()->set($question, 'question');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-        ]);
-
-        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Config setup.', $tester->getDisplay());
-        $this->assertContains('Installing assets.', $tester->getDisplay());
-
-        $this->assertContains('Creating schema', $tester->getDisplay());
-    }
-
-    public function testRunInstallCommandNoInteraction()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new InstallCommandMock());
-
-        $command = $application->find('wallabag:install');
-
-        // We mock the QuestionHelper
-        $question = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $question->expects($this->any())
-            ->method('ask')
-            ->will($this->returnValue('yes_'.uniqid('', true)));
-
-        // We override the standard helper with our mock
-        $command->getHelperSet()->set($question, 'question');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-            '--no-interaction' => true,
-        ]);
-
-        $this->assertContains('Checking system requirements.', $tester->getDisplay());
-        $this->assertContains('Setting up database.', $tester->getDisplay());
-        $this->assertContains('Administration setup.', $tester->getDisplay());
-        $this->assertContains('Config setup.', $tester->getDisplay());
-        $this->assertContains('Installing assets.', $tester->getDisplay());
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php b/src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php
deleted file mode 100644
index 4f544c1d..00000000
--- a/src/Wallabag/CoreBundle/Tests/Command/TagAllCommandTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Command;
-
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
-use Wallabag\CoreBundle\Command\TagAllCommand;
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class TagAllCommandTest extends WallabagCoreTestCase
-{
-    /**
-     * @expectedException Symfony\Component\Console\Exception\RuntimeException
-     * @expectedExceptionMessage Not enough arguments (missing: "username")
-     */
-    public function testRunTagAllCommandWithoutUsername()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new TagAllCommand());
-
-        $command = $application->find('wallabag:tag:all');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-        ]);
-    }
-
-    public function testRunTagAllCommandWithBadUsername()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new TagAllCommand());
-
-        $command = $application->find('wallabag:tag:all');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-            'username' => 'unknown',
-        ]);
-
-        $this->assertContains('User "unknown" not found', $tester->getDisplay());
-    }
-
-    public function testRunTagAllCommand()
-    {
-        $application = new Application($this->getClient()->getKernel());
-        $application->add(new TagAllCommand());
-
-        $command = $application->find('wallabag:tag:all');
-
-        $tester = new CommandTester($command);
-        $tester->execute([
-            'command' => $command->getName(),
-            'username' => 'admin',
-        ]);
-
-        $this->assertContains('Tagging entries for user « admin »... Done', $tester->getDisplay());
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
deleted file mode 100644
index 8cdedfda..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/ConfigControllerTest.php
+++ /dev/null
@@ -1,652 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class ConfigControllerTest extends WallabagCoreTestCase
-{
-    public function testLogin()
-    {
-        $client = $this->getClient();
-
-        $client->request('GET', '/new');
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertContains('login', $client->getResponse()->headers->get('location'));
-    }
-
-    public function testIndex()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertCount(1, $crawler->filter('button[id=config_save]'));
-        $this->assertCount(1, $crawler->filter('button[id=change_passwd_save]'));
-        $this->assertCount(1, $crawler->filter('button[id=update_user_save]'));
-        $this->assertCount(1, $crawler->filter('button[id=new_user_save]'));
-        $this->assertCount(1, $crawler->filter('button[id=rss_config_save]'));
-    }
-
-    public function testUpdate()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=config_save]')->form();
-
-        $data = [
-            'config[theme]' => 'baggy',
-            'config[items_per_page]' => '30',
-            'config[reading_speed]' => '0.5',
-            'config[language]' => 'en',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(['_text']));
-        $this->assertContains('flashes.config.notice.config_saved', $alert[0]);
-    }
-
-    public function testChangeReadingSpeed()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/unread/list');
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $dataFilters = [
-            'entry_filter[readingTime][right_number]' => 22,
-            'entry_filter[readingTime][left_number]' => 22,
-        ];
-        $crawler = $client->submit($form, $dataFilters);
-        $this->assertCount(1, $crawler->filter('div[class=entry]'));
-
-        // Change reading speed
-        $crawler = $client->request('GET', '/config');
-        $form = $crawler->filter('button[id=config_save]')->form();
-        $data = [
-            'config[reading_speed]' => '2',
-        ];
-        $client->submit($form, $data);
-
-        // Is the entry still available via filters?
-        $crawler = $client->request('GET', '/unread/list');
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $crawler = $client->submit($form, $dataFilters);
-        $this->assertCount(0, $crawler->filter('div[class=entry]'));
-
-        // Restore old configuration
-        $crawler = $client->request('GET', '/config');
-        $form = $crawler->filter('button[id=config_save]')->form();
-        $data = [
-            'config[reading_speed]' => '0.5',
-        ];
-        $client->submit($form, $data);
-    }
-
-    public function dataForUpdateFailed()
-    {
-        return [
-            [[
-                'config[theme]' => 'baggy',
-                'config[items_per_page]' => '',
-                'config[language]' => 'en',
-            ]],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForUpdateFailed
-     */
-    public function testUpdateFailed($data)
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=config_save]')->form();
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains('This value should not be blank', $alert[0]);
-    }
-
-    public function dataForChangePasswordFailed()
-    {
-        return [
-            [
-                [
-                    'change_passwd[old_password]' => 'material',
-                    'change_passwd[new_password][first]' => '',
-                    'change_passwd[new_password][second]' => '',
-                ],
-                'validator.password_wrong_value',
-            ],
-            [
-                [
-                    'change_passwd[old_password]' => 'mypassword',
-                    'change_passwd[new_password][first]' => '',
-                    'change_passwd[new_password][second]' => '',
-                ],
-                'This value should not be blank',
-            ],
-            [
-                [
-                    'change_passwd[old_password]' => 'mypassword',
-                    'change_passwd[new_password][first]' => 'hop',
-                    'change_passwd[new_password][second]' => '',
-                ],
-                'validator.password_must_match',
-            ],
-            [
-                [
-                    'change_passwd[old_password]' => 'mypassword',
-                    'change_passwd[new_password][first]' => 'hop',
-                    'change_passwd[new_password][second]' => 'hop',
-                ],
-                'validator.password_too_short',
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForChangePasswordFailed
-     */
-    public function testChangePasswordFailed($data, $expectedMessage)
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=change_passwd_save]')->form();
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains($expectedMessage, $alert[0]);
-    }
-
-    public function testChangePassword()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=change_passwd_save]')->form();
-
-        $data = [
-            'change_passwd[old_password]' => 'mypassword',
-            'change_passwd[new_password][first]' => 'mypassword',
-            'change_passwd[new_password][second]' => 'mypassword',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(['_text']));
-        $this->assertContains('flashes.config.notice.password_updated', $alert[0]);
-    }
-
-    public function dataForUserFailed()
-    {
-        return [
-            [
-                [
-                    'update_user[name]' => '',
-                    'update_user[email]' => '',
-                ],
-                'fos_user.email.blank',
-            ],
-            [
-                [
-                    'update_user[name]' => '',
-                    'update_user[email]' => 'test',
-                ],
-                'fos_user.email.invalid',
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForUserFailed
-     */
-    public function testUserFailed($data, $expectedMessage)
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=update_user_save]')->form();
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains($expectedMessage, $alert[0]);
-    }
-
-    public function testUserUpdate()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=update_user_save]')->form();
-
-        $data = [
-            'update_user[name]' => 'new name',
-            'update_user[email]' => 'admin@wallabag.io',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains('flashes.config.notice.user_updated', $alert[0]);
-    }
-
-    public function dataForNewUserFailed()
-    {
-        return [
-            [
-                [
-                    'new_user[username]' => '',
-                    'new_user[plainPassword][first]' => '',
-                    'new_user[plainPassword][second]' => '',
-                    'new_user[email]' => '',
-                ],
-                'fos_user.username.blank',
-            ],
-            [
-                [
-                    'new_user[username]' => 'a',
-                    'new_user[plainPassword][first]' => 'mypassword',
-                    'new_user[plainPassword][second]' => 'mypassword',
-                    'new_user[email]' => '',
-                ],
-                'fos_user.username.short',
-            ],
-            [
-                [
-                    'new_user[username]' => 'wallace',
-                    'new_user[plainPassword][first]' => 'mypassword',
-                    'new_user[plainPassword][second]' => 'mypassword',
-                    'new_user[email]' => 'test',
-                ],
-                'fos_user.email.invalid',
-            ],
-            [
-                [
-                    'new_user[username]' => 'admin',
-                    'new_user[plainPassword][first]' => 'wallacewallace',
-                    'new_user[plainPassword][second]' => 'wallacewallace',
-                    'new_user[email]' => 'wallace@wallace.me',
-                ],
-                'fos_user.username.already_used',
-            ],
-            [
-                [
-                    'new_user[username]' => 'wallace',
-                    'new_user[plainPassword][first]' => 'mypassword1',
-                    'new_user[plainPassword][second]' => 'mypassword2',
-                    'new_user[email]' => 'wallace@wallace.me',
-                ],
-                'validator.password_must_match',
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForNewUserFailed
-     */
-    public function testNewUserFailed($data, $expectedMessage)
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=new_user_save]')->form();
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains($expectedMessage, $alert[0]);
-    }
-
-    public function testNewUserCreated()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=new_user_save]')->form();
-
-        $data = [
-            'new_user[username]' => 'wallace',
-            'new_user[plainPassword][first]' => 'wallace1',
-            'new_user[plainPassword][second]' => 'wallace1',
-            'new_user[email]' => 'wallace@wallace.me',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(['_text']));
-        $this->assertContains('flashes.config.notice.user_added', $alert[0]);
-
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('wallace');
-
-        $this->assertTrue(false !== $user);
-        $this->assertTrue($user->isEnabled());
-        $this->assertEquals('material', $user->getConfig()->getTheme());
-        $this->assertEquals(12, $user->getConfig()->getItemsPerPage());
-        $this->assertEquals(50, $user->getConfig()->getRssLimit());
-        $this->assertEquals('en', $user->getConfig()->getLanguage());
-        $this->assertEquals(1, $user->getConfig()->getReadingSpeed());
-    }
-
-    public function testRssUpdateResetToken()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        // reset the token
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-
-        if (!$user) {
-            $this->markTestSkipped('No user found in db.');
-        }
-
-        $config = $user->getConfig();
-        $config->setRssToken(null);
-        $em->persist($config);
-        $em->flush();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains('config.form_rss.no_token', $body[0]);
-
-        $client->request('GET', '/generate-token');
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertNotContains('config.form_rss.no_token', $body[0]);
-    }
-
-    public function testGenerateTokenAjax()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request(
-            'GET',
-            '/generate-token',
-            [],
-            [],
-            ['HTTP_X-Requested-With' => 'XMLHttpRequest']
-        );
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $content = json_decode($client->getResponse()->getContent(), true);
-        $this->assertArrayHasKey('token', $content);
-    }
-
-    public function testRssUpdate()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=rss_config_save]')->form();
-
-        $data = [
-            'rss_config[rss_limit]' => 12,
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(['_text']));
-        $this->assertContains('flashes.config.notice.rss_updated', $alert[0]);
-    }
-
-    public function dataForRssFailed()
-    {
-        return [
-            [
-                [
-                    'rss_config[rss_limit]' => 0,
-                ],
-                'This value should be 1 or more.',
-            ],
-            [
-                [
-                    'rss_config[rss_limit]' => 1000000000000,
-                ],
-                'validator.rss_limit_too_hight',
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForRssFailed
-     */
-    public function testRssFailed($data, $expectedMessage)
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=rss_config_save]')->form();
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains($expectedMessage, $alert[0]);
-    }
-
-    public function testTaggingRuleCreation()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertTrue($client->getResponse()->isSuccessful());
-
-        $form = $crawler->filter('button[id=tagging_rule_save]')->form();
-
-        $data = [
-            'tagging_rule[rule]' => 'readingTime <= 3',
-            'tagging_rule[tags]' => 'short reading',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(['_text']));
-        $this->assertContains('flashes.config.notice.tagging_rules_updated', $alert[0]);
-
-        $deleteLink = $crawler->filter('.delete')->last()->link();
-
-        $crawler = $client->click($deleteLink);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div.messages.success')->extract(['_text']));
-        $this->assertContains('flashes.config.notice.tagging_rules_deleted', $alert[0]);
-    }
-
-    public function dataForTaggingRuleFailed()
-    {
-        return [
-            [
-                [
-                    'tagging_rule[rule]' => 'unknownVar <= 3',
-                    'tagging_rule[tags]' => 'cool tag',
-                ],
-                [
-                    'The variable',
-                    'does not exist.',
-                ],
-            ],
-            [
-                [
-                    'tagging_rule[rule]' => 'length(domainName) <= 42',
-                    'tagging_rule[tags]' => 'cool tag',
-                ],
-                [
-                    'The operator',
-                    'does not exist.',
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForTaggingRuleFailed
-     */
-    public function testTaggingRuleCreationFail($data, $messages)
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertTrue($client->getResponse()->isSuccessful());
-
-        $form = $crawler->filter('button[id=tagging_rule_save]')->form();
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-
-        foreach ($messages as $message) {
-            $this->assertContains($message, $body[0]);
-        }
-    }
-
-    public function testDeletingTaggingRuleFromAnOtherUser()
-    {
-        $this->logInAs('bob');
-        $client = $this->getClient();
-
-        $rule = $client->getContainer()->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:TaggingRule')
-            ->findAll()[0];
-
-        $crawler = $client->request('GET', '/tagging-rule/delete/'.$rule->getId());
-
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
-        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains('You can not access this tagging rule', $body[0]);
-    }
-
-    public function testDemoMode()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $config = $client->getContainer()->get('craue_config');
-        $config->set('demo_mode_enabled', 1);
-        $config->set('demo_mode_username', 'admin');
-
-        $crawler = $client->request('GET', '/config');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[id=change_passwd_save]')->form();
-
-        $data = [
-            'change_passwd[old_password]' => 'mypassword',
-            'change_passwd[new_password][first]' => 'mypassword',
-            'change_passwd[new_password][second]' => 'mypassword',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertContains('flashes.config.notice.password_not_updated_demo', $client->getContainer()->get('session')->getFlashBag()->get('notice')[0]);
-
-        $config->set('demo_mode_enabled', 0);
-        $config->set('demo_mode_username', 'wallabag');
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php
deleted file mode 100644
index fc220b85..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/DeveloperControllerTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class DeveloperControllerTest extends WallabagCoreTestCase
-{
-    public function testCreateClient()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $nbClients = $em->getRepository('WallabagApiBundle:Client')->findAll();
-
-        $crawler = $client->request('GET', '/developer/client/create');
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[type=submit]')->form();
-
-        $client->submit($form);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $newNbClients = $em->getRepository('WallabagApiBundle:Client')->findAll();
-        $this->assertGreaterThan(count($nbClients), count($newNbClients));
-    }
-
-    public function testListingClient()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $nbClients = $em->getRepository('WallabagApiBundle:Client')->findAll();
-
-        $crawler = $client->request('GET', '/developer');
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertEquals(count($nbClients), $crawler->filter('ul[class=collapsible] li')->count());
-    }
-
-    public function testDeveloperHowto()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/developer/howto/first-app');
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
-    public function testRemoveClient()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $nbClients = $em->getRepository('WallabagApiBundle:Client')->findAll();
-
-        $crawler = $client->request('GET', '/developer');
-
-        $link = $crawler
-            ->filter('div[class=collapsible-body] p a')
-            ->eq(0)
-            ->link()
-        ;
-
-        $client->click($link);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $newNbClients = $em->getRepository('WallabagApiBundle:Client')->findAll();
-        $this->assertGreaterThan(count($newNbClients), count($nbClients));
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
deleted file mode 100644
index df4c34cd..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ /dev/null
@@ -1,619 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Entity\Entry;
-
-class EntryControllerTest extends WallabagCoreTestCase
-{
-    public $url = 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html';
-
-    public function testLogin()
-    {
-        $client = $this->getClient();
-
-        $client->request('GET', '/new');
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertContains('login', $client->getResponse()->headers->get('location'));
-    }
-
-    public function testQuickstart()
-    {
-        $this->logInAs('empty');
-        $client = $this->getClient();
-
-        $client->request('GET', '/unread/list');
-        $crawler = $client->followRedirect();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains('quickstart.intro.paragraph_1', $body[0]);
-
-        // Test if quickstart is disabled when user has 1 entry
-        $crawler = $client->request('GET', '/new');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('form[name=entry]')->form();
-
-        $data = [
-            'entry[url]' => $this->url,
-        ];
-
-        $client->submit($form, $data);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $client->followRedirect();
-
-        $crawler = $client->request('GET', '/unread/list');
-        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains('entry.list.number_on_the_page', $body[0]);
-    }
-
-    public function testGetNew()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/new');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertCount(1, $crawler->filter('input[type=url]'));
-        $this->assertCount(1, $crawler->filter('form[name=entry]'));
-    }
-
-    public function testPostNewViaBookmarklet()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/');
-
-        $this->assertCount(4, $crawler->filter('div[class=entry]'));
-
-        // Good URL
-        $client->request('GET', '/bookmarklet', ['url' => $this->url]);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $client->followRedirect();
-        $crawler = $client->request('GET', '/');
-        $this->assertCount(5, $crawler->filter('div[class=entry]'));
-
-        $em = $client->getContainer()
-            ->get('doctrine.orm.entity_manager');
-        $entry = $em
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-        $em->remove($entry);
-        $em->flush();
-    }
-
-    public function testPostNewEmpty()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/new');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('form[name=entry]')->form();
-
-        $crawler = $client->submit($form);
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertCount(1, $alert = $crawler->filter('form ul li')->extract(['_text']));
-        $this->assertEquals('This value should not be blank.', $alert[0]);
-    }
-
-    /**
-     * This test will require an internet connection.
-     */
-    public function testPostNewOk()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/new');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('form[name=entry]')->form();
-
-        $data = [
-            'entry[url]' => $this->url,
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content);
-        $this->assertEquals($this->url, $content->getUrl());
-        $this->assertContains('Google', $content->getTitle());
-    }
-
-    public function testPostNewOkUrlExist()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/new');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('form[name=entry]')->form();
-
-        $data = [
-            'entry[url]' => $this->url,
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertContains('/view/', $client->getResponse()->getTargetUrl());
-    }
-
-    /**
-     * This test will require an internet connection.
-     */
-    public function testPostNewThatWillBeTaggued()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/new');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('form[name=entry]')->form();
-
-        $data = [
-            'entry[url]' => $url = 'https://github.com/wallabag/wallabag',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $client->followRedirect();
-
-        $em = $client->getContainer()
-            ->get('doctrine.orm.entity_manager');
-        $entry = $em
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUrl($url);
-        $tags = $entry->getTags();
-
-        $this->assertCount(1, $tags);
-        $this->assertEquals('wallabag', $tags[0]->getLabel());
-
-        $em->remove($entry);
-        $em->flush();
-    }
-
-    public function testArchive()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/archive/list');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
-    public function testStarred()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/starred/list');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
-    public function testRangeException()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/all/list/900');
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertEquals('/all/list', $client->getResponse()->getTargetUrl());
-    }
-
-    /**
-     * @depends testPostNewOk
-     */
-    public function testView()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $crawler = $client->request('GET', '/view/'.$content->getId());
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-        $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertContains($content->getTitle(), $body[0]);
-    }
-
-    /**
-     * @depends testPostNewOk
-     *
-     * This test will require an internet connection.
-     */
-    public function testReload()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        // empty content
-        $content->setContent('');
-        $client->getContainer()->get('doctrine.orm.entity_manager')->persist($content);
-        $client->getContainer()->get('doctrine.orm.entity_manager')->flush();
-
-        $client->request('GET', '/reload/'.$content->getId());
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $this->assertNotEmpty($content->getContent());
-    }
-
-    public function testEdit()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $crawler = $client->request('GET', '/edit/'.$content->getId());
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->assertCount(1, $crawler->filter('input[id=entry_title]'));
-        $this->assertCount(1, $crawler->filter('button[id=entry_save]'));
-    }
-
-    public function testEditUpdate()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $crawler = $client->request('GET', '/edit/'.$content->getId());
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $form = $crawler->filter('button[type=submit]')->form();
-
-        $data = [
-            'entry[title]' => 'My updated title hehe :)',
-        ];
-
-        $client->submit($form, $data);
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $crawler = $client->followRedirect();
-
-        $this->assertGreaterThan(1, $alert = $crawler->filter('div[id=article] h1')->extract(['_text']));
-        $this->assertContains('My updated title hehe :)', $alert[0]);
-    }
-
-    public function testToggleArchive()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $client->request('GET', '/archive/'.$content->getId());
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $res = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->find($content->getId());
-
-        $this->assertEquals($res->isArchived(), true);
-    }
-
-    public function testToggleStar()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $client->request('GET', '/star/'.$content->getId());
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $res = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneById($content->getId());
-
-        $this->assertEquals($res->isStarred(), true);
-    }
-
-    public function testDelete()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findByUrlAndUserId($this->url, $this->getLoggedInUserId());
-
-        $client->request('GET', '/delete/'.$content->getId());
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $client->request('GET', '/delete/'.$content->getId());
-
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-
-    /**
-     * It will create a new entry.
-     * Browse to it.
-     * Then remove it.
-     *
-     * And it'll check that user won't be redirected to the view page of the content when it had been removed
-     */
-    public function testViewAndDelete()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        // add a new content to be removed later
-        $user = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUserName('admin');
-
-        $content = new Entry($user);
-        $content->setUrl('http://1.1.1.1/entry');
-        $content->setReadingTime(12);
-        $content->setDomainName('domain.io');
-        $content->setMimetype('text/html');
-        $content->setTitle('test title entry');
-        $content->setContent('This is my content /o/');
-        $content->setArchived(true);
-        $content->setLanguage('fr');
-
-        $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->persist($content);
-        $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->flush();
-
-        $client->request('GET', '/view/'.$content->getId());
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $client->request('GET', '/delete/'.$content->getId());
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $client->followRedirect();
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
-    public function testViewOtherUserEntry()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUsernameAndNotArchived('bob');
-
-        $client->request('GET', '/view/'.$content->getId());
-
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
-    }
-
-    public function testFilterOnReadingTime()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/unread/list');
-
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-
-        $data = [
-            'entry_filter[readingTime][right_number]' => 22,
-            'entry_filter[readingTime][left_number]' => 22,
-        ];
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertCount(1, $crawler->filter('div[class=entry]'));
-    }
-
-    public function testFilterOnCreationDate()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/unread/list');
-
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-
-        $data = [
-            'entry_filter[createdAt][left_date]' => date('d/m/Y'),
-            'entry_filter[createdAt][right_date]' => date('d/m/Y', strtotime('+1 day')),
-        ];
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertCount(5, $crawler->filter('div[class=entry]'));
-
-        $data = [
-            'entry_filter[createdAt][left_date]' => date('d/m/Y'),
-            'entry_filter[createdAt][right_date]' => date('d/m/Y'),
-        ];
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertCount(5, $crawler->filter('div[class=entry]'));
-
-        $data = [
-            'entry_filter[createdAt][left_date]' => '01/01/1970',
-            'entry_filter[createdAt][right_date]' => '01/01/1970',
-        ];
-
-        $crawler = $client->submit($form, $data);
-
-        $this->assertCount(0, $crawler->filter('div[class=entry]'));
-    }
-
-    public function testPaginationWithFilter()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-        $crawler = $client->request('GET', '/config');
-
-        $form = $crawler->filter('button[id=config_save]')->form();
-
-        $data = [
-            'config[items_per_page]' => '1',
-        ];
-
-        $client->submit($form, $data);
-
-        $parameters = '?entry_filter%5BreadingTime%5D%5Bleft_number%5D=&entry_filter%5BreadingTime%5D%5Bright_number%5D=';
-
-        $client->request('GET', 'unread/list'.$parameters);
-
-        $this->assertContains($parameters, $client->getResponse()->getContent());
-
-        // reset pagination
-        $crawler = $client->request('GET', '/config');
-        $form = $crawler->filter('button[id=config_save]')->form();
-        $data = [
-            'config[items_per_page]' => '12',
-        ];
-        $client->submit($form, $data);
-    }
-
-    public function testFilterOnDomainName()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/unread/list');
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $data = [
-            'entry_filter[domainName]' => 'domain',
-        ];
-
-        $crawler = $client->submit($form, $data);
-        $this->assertCount(5, $crawler->filter('div[class=entry]'));
-
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $data = [
-            'entry_filter[domainName]' => 'wallabag',
-        ];
-
-        $crawler = $client->submit($form, $data);
-        $this->assertCount(0, $crawler->filter('div[class=entry]'));
-    }
-
-    public function testFilterOnStatus()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/unread/list');
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $form['entry_filter[isArchived]']->tick();
-        $form['entry_filter[isStarred]']->untick();
-
-        $crawler = $client->submit($form);
-        $this->assertCount(1, $crawler->filter('div[class=entry]'));
-
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $form['entry_filter[isArchived]']->untick();
-        $form['entry_filter[isStarred]']->tick();
-
-        $crawler = $client->submit($form);
-        $this->assertCount(1, $crawler->filter('div[class=entry]'));
-    }
-
-    public function testPreviewPictureFilter()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/unread/list');
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $form['entry_filter[previewPicture]']->tick();
-
-        $crawler = $client->submit($form);
-        $this->assertCount(1, $crawler->filter('div[class=entry]'));
-    }
-
-    public function testFilterOnLanguage()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/unread/list');
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $data = [
-            'entry_filter[language]' => 'fr',
-        ];
-
-        $crawler = $client->submit($form, $data);
-        $this->assertCount(2, $crawler->filter('div[class=entry]'));
-
-        $form = $crawler->filter('button[id=submit-filter]')->form();
-        $data = [
-            'entry_filter[language]' => 'en',
-        ];
-
-        $crawler = $client->submit($form, $data);
-        $this->assertCount(2, $crawler->filter('div[class=entry]'));
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php
deleted file mode 100644
index 76c98055..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/ExportControllerTest.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class ExportControllerTest extends WallabagCoreTestCase
-{
-    public function testLogin()
-    {
-        $client = $this->getClient();
-
-        $client->request('GET', '/export/unread.csv');
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-        $this->assertContains('login', $client->getResponse()->headers->get('location'));
-    }
-
-    public function testUnknownCategoryExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/export/awesomeness.epub');
-
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-
-    public function testUnknownFormatExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/export/unread.xslx');
-
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-
-    public function testUnsupportedFormatExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/export/unread.doc');
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUsernameAndNotArchived('admin');
-
-        $client->request('GET', '/export/'.$content->getId().'.doc');
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-
-    public function testBadEntryId()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/export/0.mobi');
-
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-
-    public function testEpubExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        ob_start();
-        $crawler = $client->request('GET', '/export/archive.epub');
-        ob_end_clean();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $headers = $client->getResponse()->headers;
-        $this->assertEquals('application/epub+zip', $headers->get('content-type'));
-        $this->assertEquals('attachment; filename="Archive articles.epub"', $headers->get('content-disposition'));
-        $this->assertEquals('binary', $headers->get('content-transfer-encoding'));
-    }
-
-    public function testMobiExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $content = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUsernameAndNotArchived('admin');
-
-        ob_start();
-        $crawler = $client->request('GET', '/export/'.$content->getId().'.mobi');
-        ob_end_clean();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $headers = $client->getResponse()->headers;
-        $this->assertEquals('application/x-mobipocket-ebook', $headers->get('content-type'));
-        $this->assertEquals('attachment; filename="'.preg_replace('/[^A-Za-z0-9\-]/', '', $content->getTitle()).'.mobi"', $headers->get('content-disposition'));
-        $this->assertEquals('binary', $headers->get('content-transfer-encoding'));
-    }
-
-    public function testPdfExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        ob_start();
-        $crawler = $client->request('GET', '/export/all.pdf');
-        ob_end_clean();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $headers = $client->getResponse()->headers;
-        $this->assertEquals('application/pdf', $headers->get('content-type'));
-        $this->assertEquals('attachment; filename="All articles.pdf"', $headers->get('content-disposition'));
-        $this->assertEquals('binary', $headers->get('content-transfer-encoding'));
-    }
-
-    public function testTxtExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        ob_start();
-        $crawler = $client->request('GET', '/export/all.txt');
-        ob_end_clean();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $headers = $client->getResponse()->headers;
-        $this->assertEquals('text/plain; charset=UTF-8', $headers->get('content-type'));
-        $this->assertEquals('attachment; filename="All articles.txt"', $headers->get('content-disposition'));
-        $this->assertEquals('UTF-8', $headers->get('content-transfer-encoding'));
-    }
-
-    public function testCsvExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        // to be sure results are the same
-        $contentInDB = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->createQueryBuilder('e')
-            ->leftJoin('e.user', 'u')
-            ->where('u.username = :username')->setParameter('username', 'admin')
-            ->andWhere('e.isArchived = true')
-            ->getQuery()
-            ->getArrayResult();
-
-        ob_start();
-        $crawler = $client->request('GET', '/export/archive.csv');
-        ob_end_clean();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $headers = $client->getResponse()->headers;
-        $this->assertEquals('application/csv', $headers->get('content-type'));
-        $this->assertEquals('attachment; filename="Archive articles.csv"', $headers->get('content-disposition'));
-        $this->assertEquals('UTF-8', $headers->get('content-transfer-encoding'));
-
-        $csv = str_getcsv($client->getResponse()->getContent(), "\n");
-
-        $this->assertGreaterThan(1, $csv);
-        // +1 for title line
-        $this->assertEquals(count($contentInDB) + 1, count($csv));
-        $this->assertEquals('Title;URL;Content;Tags;"MIME Type";Language', $csv[0]);
-    }
-
-    public function testJsonExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        // to be sure results are the same
-        $contentInDB = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->createQueryBuilder('e')
-            ->leftJoin('e.user', 'u')
-            ->where('u.username = :username')->setParameter('username', 'admin')
-            ->getQuery()
-            ->getArrayResult();
-
-        ob_start();
-        $crawler = $client->request('GET', '/export/all.json');
-        ob_end_clean();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $headers = $client->getResponse()->headers;
-        $this->assertEquals('application/json', $headers->get('content-type'));
-        $this->assertEquals('attachment; filename="All articles.json"', $headers->get('content-disposition'));
-        $this->assertEquals('UTF-8', $headers->get('content-transfer-encoding'));
-
-        $content = json_decode($client->getResponse()->getContent(), true);
-        $this->assertEquals(count($contentInDB), count($content));
-        $this->assertArrayHasKey('id', $content[0]);
-        $this->assertArrayHasKey('title', $content[0]);
-        $this->assertArrayHasKey('url', $content[0]);
-        $this->assertArrayHasKey('is_archived', $content[0]);
-        $this->assertArrayHasKey('is_starred', $content[0]);
-        $this->assertArrayHasKey('content', $content[0]);
-        $this->assertArrayHasKey('mimetype', $content[0]);
-        $this->assertArrayHasKey('language', $content[0]);
-        $this->assertArrayHasKey('reading_time', $content[0]);
-        $this->assertArrayHasKey('domain_name', $content[0]);
-        $this->assertArrayHasKey('tags', $content[0]);
-    }
-
-    public function testXmlExport()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        // to be sure results are the same
-        $contentInDB = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->createQueryBuilder('e')
-            ->leftJoin('e.user', 'u')
-            ->where('u.username = :username')->setParameter('username', 'admin')
-            ->andWhere('e.isArchived = false')
-            ->getQuery()
-            ->getArrayResult();
-
-        ob_start();
-        $crawler = $client->request('GET', '/export/unread.xml');
-        ob_end_clean();
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $headers = $client->getResponse()->headers;
-        $this->assertEquals('application/xml', $headers->get('content-type'));
-        $this->assertEquals('attachment; filename="Unread articles.xml"', $headers->get('content-disposition'));
-        $this->assertEquals('UTF-8', $headers->get('content-transfer-encoding'));
-
-        $content = new \SimpleXMLElement($client->getResponse()->getContent());
-        $this->assertGreaterThan(0, $content->count());
-        $this->assertEquals(count($contentInDB), $content->count());
-        $this->assertNotEmpty('id', (string) $content->entry[0]->id);
-        $this->assertNotEmpty('title', (string) $content->entry[0]->title);
-        $this->assertNotEmpty('url', (string) $content->entry[0]->url);
-        $this->assertNotEmpty('content', (string) $content->entry[0]->content);
-        $this->assertNotEmpty('domain_name', (string) $content->entry[0]->domain_name);
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php
deleted file mode 100644
index 87a01b8e..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/RssControllerTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class RssControllerTest extends WallabagCoreTestCase
-{
-    public function validateDom($xml, $nb = null)
-    {
-        $doc = new \DOMDocument();
-        $doc->loadXML($xml);
-
-        $xpath = new \DOMXpath($doc);
-
-        if (null === $nb) {
-            $this->assertGreaterThan(0, $xpath->query('//item')->length);
-        } else {
-            $this->assertEquals($nb, $xpath->query('//item')->length);
-        }
-
-        $this->assertEquals(1, $xpath->query('/rss')->length);
-        $this->assertEquals(1, $xpath->query('/rss/channel')->length);
-
-        foreach ($xpath->query('//item') as $item) {
-            $this->assertEquals(1, $xpath->query('title', $item)->length);
-            $this->assertEquals(1, $xpath->query('source', $item)->length);
-            $this->assertEquals(1, $xpath->query('link', $item)->length);
-            $this->assertEquals(1, $xpath->query('guid', $item)->length);
-            $this->assertEquals(1, $xpath->query('pubDate', $item)->length);
-            $this->assertEquals(1, $xpath->query('description', $item)->length);
-        }
-    }
-
-    public function dataForBadUrl()
-    {
-        return [
-            [
-                '/admin/YZIOAUZIAO/unread.xml',
-            ],
-            [
-                '/wallace/YZIOAUZIAO/starred.xml',
-            ],
-            [
-                '/wallace/YZIOAUZIAO/archives.xml',
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForBadUrl
-     */
-    public function testBadUrl($url)
-    {
-        $client = $this->getClient();
-
-        $client->request('GET', $url);
-
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-
-    public function testUnread()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(2);
-        $em->persist($config);
-        $em->flush();
-
-        $client->request('GET', '/admin/SUPERTOKEN/unread.xml');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->validateDom($client->getResponse()->getContent(), 2);
-    }
-
-    public function testStarred()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(1);
-        $em->persist($config);
-        $em->flush();
-
-        $client = $this->getClient();
-        $client->request('GET', '/admin/SUPERTOKEN/starred.xml');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode(), 1);
-
-        $this->validateDom($client->getResponse()->getContent());
-    }
-
-    public function testArchives()
-    {
-        $client = $this->getClient();
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-
-        $config = $user->getConfig();
-        $config->setRssToken('SUPERTOKEN');
-        $config->setRssLimit(null);
-        $em->persist($config);
-        $em->flush();
-
-        $client = $this->getClient();
-        $client->request('GET', '/admin/SUPERTOKEN/archive.xml');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-
-        $this->validateDom($client->getResponse()->getContent());
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
deleted file mode 100644
index 2910fa4f..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/SecurityControllerTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class SecurityControllerTest extends WallabagCoreTestCase
-{
-    public function testLoginWithout2Factor()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-        $client->followRedirects();
-
-        $crawler = $client->request('GET', '/config');
-        $this->assertContains('config.form_rss.description', $crawler->filter('body')->extract(['_text'])[0]);
-    }
-
-    public function testLoginWith2Factor()
-    {
-        $client = $this->getClient();
-
-        if (!$client->getContainer()->getParameter('twofactor_auth')) {
-            $this->markTestSkipped('twofactor_auth is not enabled.');
-
-            return;
-        }
-
-        $client->followRedirects();
-
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $user->setTwoFactorAuthentication(true);
-        $em->persist($user);
-        $em->flush();
-
-        $this->logInAs('admin');
-        $crawler = $client->request('GET', '/config');
-        $this->assertContains('scheb_two_factor.trusted', $crawler->filter('body')->extract(['_text'])[0]);
-
-        // restore user
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-        $user->setTwoFactorAuthentication(false);
-        $em->persist($user);
-        $em->flush();
-    }
-
-    public function testTrustedComputer()
-    {
-        $client = $this->getClient();
-
-        if (!$client->getContainer()->getParameter('twofactor_auth')) {
-            $this->markTestSkipped('twofactor_auth is not enabled.');
-
-            return;
-        }
-
-        $em = $client->getContainer()->get('doctrine.orm.entity_manager');
-        $user = $em
-            ->getRepository('WallabagUserBundle:User')
-            ->findOneByUsername('admin');
-
-        $date = new \DateTime();
-        $user->addTrustedComputer('ABCDEF', $date->add(new \DateInterval('P1M')));
-        $this->assertTrue($user->isTrustedComputer('ABCDEF'));
-        $this->assertFalse($user->isTrustedComputer('FEDCBA'));
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
deleted file mode 100644
index fd698b3e..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-/**
- * The controller `SettingsController` does not exist.
- * This test cover security against the internal settings page managed by CraueConfigBundle.
- */
-class SettingsControllerTest extends WallabagCoreTestCase
-{
-    public function testSettingsWithAdmin()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/settings');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
-    public function testSettingsWithNormalUser()
-    {
-        $this->logInAs('bob');
-        $client = $this->getClient();
-
-        $crawler = $client->request('GET', '/settings');
-
-        $this->assertEquals(403, $client->getResponse()->getStatusCode());
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php
deleted file mode 100644
index 6d7976c4..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/StaticControllerTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class StaticControllerTest extends WallabagCoreTestCase
-{
-    public function testAbout()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/about');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
-    public function testHowto()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/howto');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
deleted file mode 100644
index 8af37ea4..00000000
--- a/src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Controller;
-
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-
-class TagControllerTest extends WallabagCoreTestCase
-{
-    public $tagName = 'opensource';
-
-    public function testList()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $client->request('GET', '/tag/list');
-
-        $this->assertEquals(200, $client->getResponse()->getStatusCode());
-    }
-
-    public function testAddTagToEntry()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $entry = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUsernameAndNotArchived('admin');
-
-        $crawler = $client->request('GET', '/view/'.$entry->getId());
-
-        $form = $crawler->filter('form[name=tag]')->form();
-
-        $data = [
-            'tag[label]' => $this->tagName,
-        ];
-
-        $client->submit($form, $data);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $this->assertEquals(1, count($entry->getTags()));
-
-        # tag already exists and already assigned
-        $client->submit($form, $data);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $newEntry = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->find($entry->getId());
-
-        $this->assertEquals(1, count($newEntry->getTags()));
-
-        # tag already exists but still not assigned to this entry
-        $data = [
-            'tag[label]' => 'foo',
-        ];
-
-        $client->submit($form, $data);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $newEntry = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->find($entry->getId());
-
-        $this->assertEquals(2, count($newEntry->getTags()));
-    }
-
-    public function testAddMultipleTagToEntry()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $entry = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUsernameAndNotArchived('admin');
-
-        $crawler = $client->request('GET', '/view/'.$entry->getId());
-
-        $form = $crawler->filter('form[name=tag]')->form();
-
-        $data = [
-            'tag[label]' => 'foo2, bar2',
-        ];
-
-        $client->submit($form, $data);
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $newEntry = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->find($entry->getId());
-
-        $tags = $newEntry->getTags()->toArray();
-        $this->assertGreaterThanOrEqual(2, count($tags));
-        $this->assertNotEquals(false, array_search('foo2', $tags), 'Tag foo2 is assigned to the entry');
-        $this->assertNotEquals(false, array_search('bar2', $tags), 'Tag bar2 is assigned to the entry');
-    }
-
-    public function testRemoveTagFromEntry()
-    {
-        $this->logInAs('admin');
-        $client = $this->getClient();
-
-        $entry = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Entry')
-            ->findOneByUsernameAndNotArchived('admin');
-
-        $tag = $client->getContainer()
-            ->get('doctrine.orm.entity_manager')
-            ->getRepository('WallabagCoreBundle:Tag')
-            ->findOneByEntryAndTagLabel($entry, $this->tagName);
-
-        $client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId());
-
-        $this->assertEquals(302, $client->getResponse()->getStatusCode());
-
-        $this->assertNotContains($this->tagName, $entry->getTags());
-
-        $client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId());
-
-        $this->assertEquals(404, $client->getResponse()->getStatusCode());
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php
deleted file mode 100644
index b4c022d5..00000000
--- a/src/Wallabag/CoreBundle/Tests/EventListener/LocaleListenerTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\EventListener;
-
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Wallabag\CoreBundle\EventListener\LocaleListener;
-
-class LocaleListenerTest extends \PHPUnit_Framework_TestCase
-{
-    private function getEvent(Request $request)
-    {
-        return new GetResponseEvent($this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'), $request, HttpKernelInterface::MASTER_REQUEST);
-    }
-
-    public function testWithoutSession()
-    {
-        $request = Request::create('/');
-
-        $listener = new LocaleListener('fr');
-        $event = $this->getEvent($request);
-
-        $listener->onKernelRequest($event);
-        $this->assertEquals('en', $request->getLocale());
-    }
-
-    public function testWithPreviousSession()
-    {
-        $request = Request::create('/');
-        // generate a previous session
-        $request->cookies->set('MOCKSESSID', 'foo');
-        $request->setSession(new Session(new MockArraySessionStorage()));
-
-        $listener = new LocaleListener('fr');
-        $event = $this->getEvent($request);
-
-        $listener->onKernelRequest($event);
-        $this->assertEquals('fr', $request->getLocale());
-    }
-
-    public function testLocaleFromRequestAttribute()
-    {
-        $request = Request::create('/');
-        // generate a previous session
-        $request->cookies->set('MOCKSESSID', 'foo');
-        $request->setSession(new Session(new MockArraySessionStorage()));
-        $request->attributes->set('_locale', 'es');
-
-        $listener = new LocaleListener('fr');
-        $event = $this->getEvent($request);
-
-        $listener->onKernelRequest($event);
-        $this->assertEquals('en', $request->getLocale());
-        $this->assertEquals('es', $request->getSession()->get('_locale'));
-    }
-
-    public function testSubscribedEvents()
-    {
-        $request = Request::create('/');
-        // generate a previous session
-        $request->cookies->set('MOCKSESSID', 'foo');
-        $request->setSession(new Session(new MockArraySessionStorage()));
-
-        $listener = new LocaleListener('fr');
-        $event = $this->getEvent($request);
-
-        $dispatcher = new EventDispatcher();
-        $dispatcher->addSubscriber($listener);
-
-        $dispatcher->dispatch(
-            KernelEvents::REQUEST,
-            $event
-        );
-
-        $this->assertEquals('fr', $request->getLocale());
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
deleted file mode 100644
index 7039dc61..00000000
--- a/src/Wallabag/CoreBundle/Tests/EventListener/RegistrationConfirmedListenerTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\EventListener;
-
-use FOS\UserBundle\Event\FilterUserResponseEvent;
-use FOS\UserBundle\FOSUserEvents;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener;
-use Wallabag\UserBundle\Entity\User;
-
-class RegistrationConfirmedListenerTest extends \PHPUnit_Framework_TestCase
-{
-    private $em;
-    private $listener;
-    private $dispatcher;
-    private $request;
-    private $response;
-
-    protected function setUp()
-    {
-        $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->listener = new RegistrationConfirmedListener(
-            $this->em,
-            'baggy',
-            20,
-            50,
-            'fr'
-        );
-
-        $this->dispatcher = new EventDispatcher();
-        $this->dispatcher->addSubscriber($this->listener);
-
-        $this->request = Request::create('/');
-        $this->response = Response::create();
-    }
-
-    public function testWithInvalidUser()
-    {
-        $user = new User();
-        $user->setEnabled(false);
-
-        $event = new FilterUserResponseEvent(
-            $user,
-            $this->request,
-            $this->response
-        );
-
-        $this->em->expects($this->never())->method('persist');
-        $this->em->expects($this->never())->method('flush');
-
-        $this->dispatcher->dispatch(
-            FOSUserEvents::REGISTRATION_CONFIRMED,
-            $event
-        );
-    }
-
-    public function testWithValidUser()
-    {
-        $user = new User();
-        $user->setEnabled(true);
-
-        $event = new FilterUserResponseEvent(
-            $user,
-            $this->request,
-            $this->response
-        );
-
-        $config = new Config($user);
-        $config->setTheme('baggy');
-        $config->setItemsPerPage(20);
-        $config->setRssLimit(50);
-        $config->setLanguage('fr');
-
-        $this->em->expects($this->once())
-            ->method('persist')
-            ->will($this->returnValue($config));
-        $this->em->expects($this->once())
-            ->method('flush');
-
-        $this->dispatcher->dispatch(
-            FOSUserEvents::REGISTRATION_CONFIRMED,
-            $event
-        );
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php b/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php
deleted file mode 100644
index d9ffe30e..00000000
--- a/src/Wallabag/CoreBundle/Tests/EventListener/UserLocaleListenerTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\EventListener;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\EventListener\UserLocaleListener;
-use Wallabag\UserBundle\Entity\User;
-
-class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase
-{
-    public function testWithLanguage()
-    {
-        $session = new Session(new MockArraySessionStorage());
-        $listener = new UserLocaleListener($session);
-
-        $user = new User();
-        $user->setEnabled(true);
-
-        $config = new Config($user);
-        $config->setLanguage('fr');
-
-        $user->setConfig($config);
-
-        $userToken = new UsernamePasswordToken($user, '', 'test');
-        $request = Request::create('/');
-        $event = new InteractiveLoginEvent($request, $userToken);
-
-        $listener->onInteractiveLogin($event);
-
-        $this->assertEquals('fr', $session->get('_locale'));
-    }
-
-    public function testWithoutLanguage()
-    {
-        $session = new Session(new MockArraySessionStorage());
-        $listener = new UserLocaleListener($session);
-
-        $user = new User();
-        $user->setEnabled(true);
-
-        $config = new Config($user);
-
-        $user->setConfig($config);
-
-        $userToken = new UsernamePasswordToken($user, '', 'test');
-        $request = Request::create('/');
-        $event = new InteractiveLoginEvent($request, $userToken);
-
-        $listener->onInteractiveLogin($event);
-
-        $this->assertEquals('', $session->get('_locale'));
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php b/src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php
deleted file mode 100644
index 6b1e8613..00000000
--- a/src/Wallabag/CoreBundle/Tests/Form/DataTransformer/StringToListTransformerTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Form\DataTransformer;
-
-use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
-
-class StringToListTransformerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider transformProvider
-     */
-    public function testTransformWithValidData($inputData, $expectedResult)
-    {
-        $transformer = new StringToListTransformer();
-
-        $this->assertSame($expectedResult, $transformer->transform($inputData));
-    }
-
-    public function transformProvider()
-    {
-        return [
-            [null, ''],
-            [[], ''],
-            [['single value'], 'single value'],
-            [['first value', 'second value'], 'first value,second value'],
-        ];
-    }
-
-    /**
-     * @dataProvider reverseTransformProvider
-     */
-    public function testReverseTransformWithValidData($inputData, $expectedResult)
-    {
-        $transformer = new StringToListTransformer();
-
-        $this->assertSame($expectedResult, $transformer->reverseTransform($inputData));
-    }
-
-    public function reverseTransformProvider()
-    {
-        return [
-            [null, null],
-            ['', []],
-            ['single value', ['single value']],
-            ['first value,second value', ['first value', 'second value']],
-            ['first value,     second value', ['first value', 'second value']],
-            ['first value,  ,  second value', ['first value', 'second value']],
-        ];
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php b/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php
deleted file mode 100644
index 9d7b0f36..00000000
--- a/src/Wallabag/CoreBundle/Tests/Helper/ContentProxyTest.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Helper;
-
-use Psr\Log\NullLogger;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\UserBundle\Entity\User;
-
-class ContentProxyTest extends \PHPUnit_Framework_TestCase
-{
-    public function testWithBadUrl()
-    {
-        $tagger = $this->getTaggerMock();
-        $tagger->expects($this->once())
-            ->method('tag');
-
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->setMethods(['fetchContent'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $graby->expects($this->any())
-            ->method('fetchContent')
-            ->willReturn([
-                'html' => false,
-                'title' => '',
-                'url' => '',
-                'content_type' => '',
-                'language' => '',
-            ]);
-
-        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger());
-        $entry = $proxy->updateEntry(new Entry(new User()), 'http://user@:80');
-
-        $this->assertEquals('http://user@:80', $entry->getUrl());
-        $this->assertEmpty($entry->getTitle());
-        $this->assertEquals('<p>Unable to retrieve readable content.</p>', $entry->getContent());
-        $this->assertEmpty($entry->getPreviewPicture());
-        $this->assertEmpty($entry->getMimetype());
-        $this->assertEmpty($entry->getLanguage());
-        $this->assertEquals(0.0, $entry->getReadingTime());
-        $this->assertEquals(false, $entry->getDomainName());
-    }
-
-    public function testWithEmptyContent()
-    {
-        $tagger = $this->getTaggerMock();
-        $tagger->expects($this->once())
-            ->method('tag');
-
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->setMethods(['fetchContent'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $graby->expects($this->any())
-            ->method('fetchContent')
-            ->willReturn([
-                'html' => false,
-                'title' => '',
-                'url' => '',
-                'content_type' => '',
-                'language' => '',
-            ]);
-
-        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger());
-        $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0');
-
-        $this->assertEquals('http://0.0.0.0', $entry->getUrl());
-        $this->assertEmpty($entry->getTitle());
-        $this->assertEquals('<p>Unable to retrieve readable content.</p>', $entry->getContent());
-        $this->assertEmpty($entry->getPreviewPicture());
-        $this->assertEmpty($entry->getMimetype());
-        $this->assertEmpty($entry->getLanguage());
-        $this->assertEquals(0.0, $entry->getReadingTime());
-        $this->assertEquals('0.0.0.0', $entry->getDomainName());
-    }
-
-    public function testWithEmptyContentButOG()
-    {
-        $tagger = $this->getTaggerMock();
-        $tagger->expects($this->once())
-            ->method('tag');
-
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->setMethods(['fetchContent'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $graby->expects($this->any())
-            ->method('fetchContent')
-            ->willReturn([
-                'html' => false,
-                'title' => '',
-                'url' => '',
-                'content_type' => '',
-                'language' => '',
-                'open_graph' => [
-                    'og_title' => 'my title',
-                    'og_description' => 'desc',
-                ],
-            ]);
-
-        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger());
-        $entry = $proxy->updateEntry(new Entry(new User()), 'http://domain.io');
-
-        $this->assertEquals('http://domain.io', $entry->getUrl());
-        $this->assertEquals('my title', $entry->getTitle());
-        $this->assertEquals('<p>Unable to retrieve readable content.</p><p><i>But we found a short description: </i></p>desc', $entry->getContent());
-        $this->assertEmpty($entry->getPreviewPicture());
-        $this->assertEmpty($entry->getLanguage());
-        $this->assertEmpty($entry->getMimetype());
-        $this->assertEquals(0.0, $entry->getReadingTime());
-        $this->assertEquals('domain.io', $entry->getDomainName());
-    }
-
-    public function testWithContent()
-    {
-        $tagger = $this->getTaggerMock();
-        $tagger->expects($this->once())
-            ->method('tag');
-
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->setMethods(['fetchContent'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $graby->expects($this->any())
-            ->method('fetchContent')
-            ->willReturn([
-                'html' => str_repeat('this is my content', 325),
-                'title' => 'this is my title',
-                'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
-                'language' => 'fr',
-                'open_graph' => [
-                    'og_title' => 'my OG title',
-                    'og_description' => 'OG desc',
-                    'og_image' => 'http://3.3.3.3/cover.jpg',
-                ],
-            ]);
-
-        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger());
-        $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0');
-
-        $this->assertEquals('http://1.1.1.1', $entry->getUrl());
-        $this->assertEquals('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
-        $this->assertEquals('http://3.3.3.3/cover.jpg', $entry->getPreviewPicture());
-        $this->assertEquals('text/html', $entry->getMimetype());
-        $this->assertEquals('fr', $entry->getLanguage());
-        $this->assertEquals(4.0, $entry->getReadingTime());
-        $this->assertEquals('1.1.1.1', $entry->getDomainName());
-    }
-
-    public function testWithForcedContent()
-    {
-        $tagger = $this->getTaggerMock();
-        $tagger->expects($this->once())
-            ->method('tag');
-
-        $graby = $this->getMockBuilder('Graby\Graby')->getMock();
-
-        $proxy = new ContentProxy($graby, $tagger, $this->getTagRepositoryMock(), $this->getLogger());
-        $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0', [
-            'html' => str_repeat('this is my content', 325),
-            'title' => 'this is my title',
-            'url' => 'http://1.1.1.1',
-            'content_type' => 'text/html',
-            'language' => 'fr',
-        ]);
-
-        $this->assertEquals('http://1.1.1.1', $entry->getUrl());
-        $this->assertEquals('this is my title', $entry->getTitle());
-        $this->assertContains('this is my content', $entry->getContent());
-        $this->assertEquals('text/html', $entry->getMimetype());
-        $this->assertEquals('fr', $entry->getLanguage());
-        $this->assertEquals(4.0, $entry->getReadingTime());
-        $this->assertEquals('1.1.1.1', $entry->getDomainName());
-    }
-
-    public function testTaggerThrowException()
-    {
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $tagger = $this->getTaggerMock();
-        $tagger->expects($this->once())
-            ->method('tag')
-            ->will($this->throwException(new \Exception()));
-
-        $tagRepo = $this->getTagRepositoryMock();
-        $proxy = new ContentProxy($graby, $tagger, $tagRepo, $this->getLogger());
-
-        $entry = $proxy->updateEntry(new Entry(new User()), 'http://0.0.0.0', [
-            'html' => str_repeat('this is my content', 325),
-            'title' => 'this is my title',
-            'url' => 'http://1.1.1.1',
-            'content_type' => 'text/html',
-            'language' => 'fr',
-        ]);
-
-        $this->assertCount(0, $entry->getTags());
-    }
-
-    public function testAssignTagsWithArrayAndExtraSpaces()
-    {
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $tagRepo = $this->getTagRepositoryMock();
-        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger());
-
-        $entry = new Entry(new User());
-
-        $proxy->assignTagsToEntry($entry, ['   tag1', 'tag2   ']);
-
-        $this->assertCount(2, $entry->getTags());
-        $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
-        $this->assertEquals('tag2', $entry->getTags()[1]->getLabel());
-    }
-
-    public function testAssignTagsWithString()
-    {
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $tagRepo = $this->getTagRepositoryMock();
-        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger());
-
-        $entry = new Entry(new User());
-
-        $proxy->assignTagsToEntry($entry, 'tag1, tag2');
-
-        $this->assertCount(2, $entry->getTags());
-        $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
-        $this->assertEquals('tag2', $entry->getTags()[1]->getLabel());
-    }
-
-    public function testAssignTagsWithEmptyArray()
-    {
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $tagRepo = $this->getTagRepositoryMock();
-        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger());
-
-        $entry = new Entry(new User());
-
-        $proxy->assignTagsToEntry($entry, []);
-
-        $this->assertCount(0, $entry->getTags());
-    }
-
-    public function testAssignTagsWithEmptyString()
-    {
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $tagRepo = $this->getTagRepositoryMock();
-        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger());
-
-        $entry = new Entry(new User());
-
-        $proxy->assignTagsToEntry($entry, '');
-
-        $this->assertCount(0, $entry->getTags());
-    }
-
-    public function testAssignTagsAlreadyAssigned()
-    {
-        $graby = $this->getMockBuilder('Graby\Graby')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $tagRepo = $this->getTagRepositoryMock();
-        $proxy = new ContentProxy($graby, $this->getTaggerMock(), $tagRepo, $this->getLogger());
-
-        $tagEntity = new Tag();
-        $tagEntity->setLabel('tag1');
-
-        $entry = new Entry(new User());
-        $entry->addTag($tagEntity);
-
-        $proxy->assignTagsToEntry($entry, 'tag1, tag2');
-
-        $this->assertCount(2, $entry->getTags());
-        $this->assertEquals('tag1', $entry->getTags()[0]->getLabel());
-        $this->assertEquals('tag2', $entry->getTags()[1]->getLabel());
-    }
-
-    private function getTaggerMock()
-    {
-        return $this->getMockBuilder('Wallabag\CoreBundle\Helper\RuleBasedTagger')
-            ->setMethods(['tag'])
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    private function getTagRepositoryMock()
-    {
-        return $this->getMockBuilder('Wallabag\CoreBundle\Repository\TagRepository')
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    private function getLogger()
-    {
-        return new NullLogger();
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php b/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php
deleted file mode 100644
index f4aecc80..00000000
--- a/src/Wallabag/CoreBundle/Tests/Helper/RedirectTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Helper;
-
-use Wallabag\CoreBundle\Helper\Redirect;
-
-class RedirectTest extends \PHPUnit_Framework_TestCase
-{
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
-    private $routerMock;
-
-    /** @var Redirect */
-    private $redirect;
-
-    public function setUp()
-    {
-        $this->routerMock = $this->getRouterMock();
-        $this->redirect = new Redirect($this->routerMock);
-    }
-
-    public function testRedirectToNullWithFallback()
-    {
-        $redirectUrl = $this->redirect->to(null, 'fallback');
-
-        $this->assertEquals('fallback', $redirectUrl);
-    }
-
-    public function testRedirectToNullWithoutFallback()
-    {
-        $redirectUrl = $this->redirect->to(null);
-
-        $this->assertEquals($this->routerMock->generate('homepage'), $redirectUrl);
-    }
-
-    public function testRedirectToValidUrl()
-    {
-        $redirectUrl = $this->redirect->to('/unread/list');
-
-        $this->assertEquals('/unread/list', $redirectUrl);
-    }
-
-    private function getRouterMock()
-    {
-        $mock = $this->getMockBuilder('Symfony\Component\Routing\Router')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $mock->expects($this->any())
-            ->method('generate')
-            ->with('homepage')
-            ->willReturn('homepage');
-
-        return $mock;
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php b/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php
deleted file mode 100644
index e9025b45..00000000
--- a/src/Wallabag/CoreBundle/Tests/Helper/RuleBasedTaggerTest.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Helper;
-
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\CoreBundle\Helper\RuleBasedTagger;
-use Wallabag\UserBundle\Entity\User;
-
-class RuleBasedTaggerTest extends \PHPUnit_Framework_TestCase
-{
-    private $rulerz;
-    private $tagRepository;
-    private $entryRepository;
-    private $tagger;
-
-    public function setUp()
-    {
-        $this->rulerz = $this->getRulerZMock();
-        $this->tagRepository = $this->getTagRepositoryMock();
-        $this->entryRepository = $this->getEntryRepositoryMock();
-
-        $this->tagger = new RuleBasedTagger($this->rulerz, $this->tagRepository, $this->entryRepository);
-    }
-
-    public function testTagWithNoRule()
-    {
-        $entry = new Entry($this->getUser());
-
-        $this->tagger->tag($entry);
-
-        $this->assertTrue($entry->getTags()->isEmpty());
-    }
-
-    public function testTagWithNoMatchingRule()
-    {
-        $taggingRule = $this->getTaggingRule('rule as string', ['foo', 'bar']);
-        $user = $this->getUser([$taggingRule]);
-        $entry = new Entry($user);
-
-        $this->rulerz
-            ->expects($this->once())
-            ->method('satisfies')
-            ->with($entry, 'rule as string')
-            ->willReturn(false);
-
-        $this->tagger->tag($entry);
-
-        $this->assertTrue($entry->getTags()->isEmpty());
-    }
-
-    public function testTagWithAMatchingRule()
-    {
-        $taggingRule = $this->getTaggingRule('rule as string', ['foo', 'bar']);
-        $user = $this->getUser([$taggingRule]);
-        $entry = new Entry($user);
-
-        $this->rulerz
-            ->expects($this->once())
-            ->method('satisfies')
-            ->with($entry, 'rule as string')
-            ->willReturn(true);
-
-        $this->tagger->tag($entry);
-
-        $this->assertFalse($entry->getTags()->isEmpty());
-
-        $tags = $entry->getTags();
-        $this->assertSame('foo', $tags[0]->getLabel());
-        $this->assertSame('bar', $tags[1]->getLabel());
-    }
-
-    public function testTagWithAMixOfMatchingRules()
-    {
-        $taggingRule = $this->getTaggingRule('bla bla', ['hey']);
-        $otherTaggingRule = $this->getTaggingRule('rule as string', ['foo']);
-
-        $user = $this->getUser([$taggingRule, $otherTaggingRule]);
-        $entry = new Entry($user);
-
-        $this->rulerz
-            ->method('satisfies')
-            ->will($this->onConsecutiveCalls(false, true));
-
-        $this->tagger->tag($entry);
-
-        $this->assertFalse($entry->getTags()->isEmpty());
-
-        $tags = $entry->getTags();
-        $this->assertSame('foo', $tags[0]->getLabel());
-    }
-
-    public function testWhenTheTagExists()
-    {
-        $taggingRule = $this->getTaggingRule('rule as string', ['foo']);
-        $user = $this->getUser([$taggingRule]);
-        $entry = new Entry($user);
-        $tag = new Tag();
-
-        $this->rulerz
-            ->expects($this->once())
-            ->method('satisfies')
-            ->with($entry, 'rule as string')
-            ->willReturn(true);
-
-        $this->tagRepository
-            ->expects($this->once())
-            // the method `findOneByLabel` doesn't exist, EntityRepository will then call `_call` method
-            // to magically call the `findOneBy` with ['label' => 'foo']
-            ->method('__call')
-            ->willReturn($tag);
-
-        $this->tagger->tag($entry);
-
-        $this->assertFalse($entry->getTags()->isEmpty());
-
-        $tags = $entry->getTags();
-        $this->assertSame($tag, $tags[0]);
-    }
-
-    public function testSameTagWithDifferentfMatchingRules()
-    {
-        $taggingRule = $this->getTaggingRule('bla bla', ['hey']);
-        $otherTaggingRule = $this->getTaggingRule('rule as string', ['hey']);
-
-        $user = $this->getUser([$taggingRule, $otherTaggingRule]);
-        $entry = new Entry($user);
-
-        $this->rulerz
-            ->method('satisfies')
-            ->willReturn(true);
-
-        $this->tagger->tag($entry);
-
-        $this->assertFalse($entry->getTags()->isEmpty());
-
-        $tags = $entry->getTags();
-        $this->assertCount(1, $tags);
-    }
-
-    public function testTagAllEntriesForAUser()
-    {
-        $taggingRule = $this->getTaggingRule('bla bla', ['hey']);
-
-        $user = $this->getUser([$taggingRule]);
-
-        $this->rulerz
-            ->method('satisfies')
-            ->willReturn(true);
-
-        $this->rulerz
-            ->method('filter')
-            ->willReturn([new Entry($user), new Entry($user)]);
-
-        $entries = $this->tagger->tagAllForUser($user);
-
-        $this->assertCount(2, $entries);
-
-        foreach ($entries as $entry) {
-            $tags = $entry->getTags();
-
-            $this->assertCount(1, $tags);
-            $this->assertEquals('hey', $tags[0]->getLabel());
-        }
-    }
-
-    private function getUser(array $taggingRules = [])
-    {
-        $user = new User();
-        $config = new Config($user);
-
-        $user->setConfig($config);
-
-        foreach ($taggingRules as $rule) {
-            $config->addTaggingRule($rule);
-        }
-
-        return $user;
-    }
-
-    private function getTaggingRule($rule, array $tags)
-    {
-        $taggingRule = new TaggingRule();
-        $taggingRule->setRule($rule);
-        $taggingRule->setTags($tags);
-
-        return $taggingRule;
-    }
-
-    private function getRulerZMock()
-    {
-        return $this->getMockBuilder('RulerZ\RulerZ')
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    private function getTagRepositoryMock()
-    {
-        return $this->getMockBuilder('Wallabag\CoreBundle\Repository\TagRepository')
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    private function getEntryRepositoryMock()
-    {
-        return $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php b/src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php
deleted file mode 100644
index ff9cdafd..00000000
--- a/src/Wallabag/CoreBundle/Tests/Mock/InstallCommandMock.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Mock;
-
-use Wallabag\CoreBundle\Command\InstallCommand;
-
-/**
- * This mock aims to speed the test of InstallCommand by avoid calling external command
- * like all doctrine commands.
- *
- * This speed the test but as a downside, it doesn't allow to fully test the InstallCommand
- *
- * Launching tests to avoid doctrine command:
- *     phpunit --exclude-group command-doctrine
- */
-class InstallCommandMock extends InstallCommand
-{
-    protected function runCommand($command, $parameters = [])
-    {
-        return $this;
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php b/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php
deleted file mode 100644
index ee10938a..00000000
--- a/src/Wallabag/CoreBundle/Tests/ParamConverter/UsernameRssTokenConverterTest.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Command;
-
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
-use Symfony\Component\HttpFoundation\Request;
-use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter;
-use Wallabag\UserBundle\Entity\User;
-
-class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase
-{
-    public function testSupportsWithNoRegistry()
-    {
-        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter();
-
-        $this->assertFalse($converter->supports($params));
-    }
-
-    public function testSupportsWithNoRegistryManagers()
-    {
-        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $registry->expects($this->once())
-            ->method('getManagers')
-            ->will($this->returnValue([]));
-
-        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter($registry);
-
-        $this->assertFalse($converter->supports($params));
-    }
-
-    public function testSupportsWithNoConfigurationClass()
-    {
-        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $registry->expects($this->once())
-            ->method('getManagers')
-            ->will($this->returnValue(['default' => null]));
-
-        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter($registry);
-
-        $this->assertFalse($converter->supports($params));
-    }
-
-    public function testSupportsWithNotTheGoodClass()
-    {
-        $meta = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $meta->expects($this->once())
-            ->method('getName')
-            ->will($this->returnValue('nothingrelated'));
-
-        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $em->expects($this->once())
-            ->method('getClassMetadata')
-            ->with('superclass')
-            ->will($this->returnValue($meta));
-
-        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $registry->expects($this->once())
-            ->method('getManagers')
-            ->will($this->returnValue(['default' => null]));
-
-        $registry->expects($this->once())
-            ->method('getManagerForClass')
-            ->with('superclass')
-            ->will($this->returnValue($em));
-
-        $params = new ParamConverter(['class' => 'superclass']);
-        $converter = new UsernameRssTokenConverter($registry);
-
-        $this->assertFalse($converter->supports($params));
-    }
-
-    public function testSupportsWithGoodClass()
-    {
-        $meta = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $meta->expects($this->once())
-            ->method('getName')
-            ->will($this->returnValue('Wallabag\UserBundle\Entity\User'));
-
-        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $em->expects($this->once())
-            ->method('getClassMetadata')
-            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($meta));
-
-        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $registry->expects($this->once())
-            ->method('getManagers')
-            ->will($this->returnValue(['default' => null]));
-
-        $registry->expects($this->once())
-            ->method('getManagerForClass')
-            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($em));
-
-        $params = new ParamConverter(['class' => 'WallabagUserBundle:User']);
-        $converter = new UsernameRssTokenConverter($registry);
-
-        $this->assertTrue($converter->supports($params));
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Route attribute is missing
-     */
-    public function testApplyEmptyRequest()
-    {
-        $params = new ParamConverter([]);
-        $converter = new UsernameRssTokenConverter();
-
-        $converter->apply(new Request(), $params);
-    }
-
-    /**
-     * @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     * @expectedExceptionMessage User not found
-     */
-    public function testApplyUserNotFound()
-    {
-        $repo = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $repo->expects($this->once())
-            ->method('findOneByUsernameAndRsstoken')
-            ->with('test', 'test')
-            ->will($this->returnValue(null));
-
-        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $em->expects($this->once())
-            ->method('getRepository')
-            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($repo));
-
-        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $registry->expects($this->once())
-            ->method('getManagerForClass')
-            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($em));
-
-        $params = new ParamConverter(['class' => 'WallabagUserBundle:User']);
-        $converter = new UsernameRssTokenConverter($registry);
-        $request = new Request([], [], ['username' => 'test', 'token' => 'test']);
-
-        $converter->apply($request, $params);
-    }
-
-    public function testApplyUserFound()
-    {
-        $user = new User();
-
-        $repo = $this->getMockBuilder('Wallabag\UserBundle\Repository\UserRepository')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $repo->expects($this->once())
-            ->method('findOneByUsernameAndRsstoken')
-            ->with('test', 'test')
-            ->will($this->returnValue($user));
-
-        $em = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $em->expects($this->once())
-            ->method('getRepository')
-            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($repo));
-
-        $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $registry->expects($this->once())
-            ->method('getManagerForClass')
-            ->with('WallabagUserBundle:User')
-            ->will($this->returnValue($em));
-
-        $params = new ParamConverter(['class' => 'WallabagUserBundle:User', 'name' => 'user']);
-        $converter = new UsernameRssTokenConverter($registry);
-        $request = new Request([], [], ['username' => 'test', 'token' => 'test']);
-
-        $converter->apply($request, $params);
-
-        $this->assertEquals($user, $request->attributes->get('user'));
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php b/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php
deleted file mode 100644
index e5eafab1..00000000
--- a/src/Wallabag/CoreBundle/Tests/Subscriber/TablePrefixSubscriberTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Subscriber;
-
-use Doctrine\Common\EventManager;
-use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber;
-
-class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase
-{
-    public function dataForPrefix()
-    {
-        return [
-            ['wallabag_', 'Wallabag\UserBundle\Entity\User', '`user`', 'user', 'wallabag_user', '"wallabag_user"', new \Doctrine\DBAL\Platforms\PostgreSqlPlatform()],
-            ['wallabag_', 'Wallabag\UserBundle\Entity\User', '`user`', 'user', 'wallabag_user', '`wallabag_user`', new \Doctrine\DBAL\Platforms\MySqlPlatform()],
-            ['wallabag_', 'Wallabag\UserBundle\Entity\User', '`user`', 'user', 'wallabag_user', '"wallabag_user"', new \Doctrine\DBAL\Platforms\SqlitePlatform()],
-
-            ['wallabag_', 'Wallabag\UserBundle\Entity\User', 'user', 'user', 'wallabag_user', 'wallabag_user', new \Doctrine\DBAL\Platforms\PostgreSqlPlatform()],
-            ['wallabag_', 'Wallabag\UserBundle\Entity\User', 'user', 'user', 'wallabag_user', 'wallabag_user', new \Doctrine\DBAL\Platforms\MySqlPlatform()],
-            ['wallabag_', 'Wallabag\UserBundle\Entity\User', 'user', 'user', 'wallabag_user', 'wallabag_user', new \Doctrine\DBAL\Platforms\SqlitePlatform()],
-
-            ['', 'Wallabag\UserBundle\Entity\User', '`user`', 'user', 'user', '"user"', new \Doctrine\DBAL\Platforms\PostgreSqlPlatform()],
-            ['', 'Wallabag\UserBundle\Entity\User', '`user`', 'user', 'user', '`user`', new \Doctrine\DBAL\Platforms\MySqlPlatform()],
-            ['', 'Wallabag\UserBundle\Entity\User', '`user`', 'user', 'user', '"user"', new \Doctrine\DBAL\Platforms\SqlitePlatform()],
-
-            ['', 'Wallabag\UserBundle\Entity\User', 'user', 'user', 'user', 'user', new \Doctrine\DBAL\Platforms\PostgreSqlPlatform()],
-            ['', 'Wallabag\UserBundle\Entity\User', 'user', 'user', 'user', 'user', new \Doctrine\DBAL\Platforms\MySqlPlatform()],
-            ['', 'Wallabag\UserBundle\Entity\User', 'user', 'user', 'user', 'user', new \Doctrine\DBAL\Platforms\SqlitePlatform()],
-        ];
-    }
-
-    /**
-     * @dataProvider dataForPrefix
-     */
-    public function testPrefix($prefix, $entityName, $tableName, $tableNameExpected, $finalTableName, $finalTableNameQuoted, $platform)
-    {
-        $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $subscriber = new TablePrefixSubscriber($prefix);
-
-        $metaClass = new ClassMetadata($entityName);
-        $metaClass->setPrimaryTable(['name' => $tableName]);
-
-        $metaDataEvent = new LoadClassMetadataEventArgs($metaClass, $em);
-
-        $this->assertEquals($tableNameExpected, $metaDataEvent->getClassMetadata()->getTableName());
-
-        $subscriber->loadClassMetadata($metaDataEvent);
-
-        $this->assertEquals($finalTableName, $metaDataEvent->getClassMetadata()->getTableName());
-        $this->assertEquals($finalTableNameQuoted, $metaDataEvent->getClassMetadata()->getQuotedTableName($platform));
-    }
-
-    /**
-     * @dataProvider dataForPrefix
-     */
-    public function testSubscribedEvents($prefix, $entityName, $tableName, $tableNameExpected, $finalTableName, $finalTableNameQuoted, $platform)
-    {
-        $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $metaClass = new ClassMetadata($entityName);
-        $metaClass->setPrimaryTable(['name' => $tableName]);
-
-        $metaDataEvent = new LoadClassMetadataEventArgs($metaClass, $em);
-
-        $subscriber = new TablePrefixSubscriber($prefix);
-
-        $evm = new EventManager();
-        $evm->addEventSubscriber($subscriber);
-
-        $evm->dispatchEvent('loadClassMetadata', $metaDataEvent);
-
-        $this->assertEquals($finalTableName, $metaDataEvent->getClassMetadata()->getTableName());
-        $this->assertEquals($finalTableNameQuoted, $metaDataEvent->getClassMetadata()->getQuotedTableName($platform));
-    }
-
-    public function testPrefixManyToMany()
-    {
-        $em = $this->getMockBuilder('Doctrine\ORM\EntityManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $subscriber = new TablePrefixSubscriber('yo_');
-
-        $metaClass = new ClassMetadata('Wallabag\UserBundle\Entity\Entry');
-        $metaClass->setPrimaryTable(['name' => 'entry']);
-        $metaClass->mapManyToMany([
-            'fieldName' => 'tags',
-            'joinTable' => ['name' => null, 'schema' => null],
-            'targetEntity' => 'Tag',
-            'mappedBy' => null,
-            'inversedBy' => 'entries',
-            'cascade' => ['persist'],
-            'indexBy' => null,
-            'orphanRemoval' => false,
-            'fetch' => 2,
-        ]);
-
-        $metaDataEvent = new LoadClassMetadataEventArgs($metaClass, $em);
-
-        $this->assertEquals('entry', $metaDataEvent->getClassMetadata()->getTableName());
-
-        $subscriber->loadClassMetadata($metaDataEvent);
-
-        $this->assertEquals('yo_entry', $metaDataEvent->getClassMetadata()->getTableName());
-        $this->assertEquals('yo_entry_tag', $metaDataEvent->getClassMetadata()->associationMappings['tags']['joinTable']['name']);
-        $this->assertEquals('yo_entry', $metaDataEvent->getClassMetadata()->getQuotedTableName(new \Doctrine\DBAL\Platforms\MySqlPlatform()));
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php b/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
deleted file mode 100644
index 9af8fad8..00000000
--- a/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests\Twig;
-
-use Wallabag\CoreBundle\Twig\WallabagExtension;
-
-class WallabagExtensionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testRemoveWww()
-    {
-        $extension = new WallabagExtension();
-
-        $this->assertEquals('lemonde.fr', $extension->removeWww('www.lemonde.fr'));
-        $this->assertEquals('lemonde.fr', $extension->removeWww('lemonde.fr'));
-        $this->assertEquals('gist.github.com', $extension->removeWww('gist.github.com'));
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php b/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
deleted file mode 100644
index 05450c0b..00000000
--- a/src/Wallabag/CoreBundle/Tests/WallabagCoreTestCase.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Tests;
-
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-
-abstract class WallabagCoreTestCase extends WebTestCase
-{
-    private $client = null;
-
-    public function getClient()
-    {
-        return $this->client;
-    }
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->client = static::createClient();
-    }
-
-    public function logInAs($username)
-    {
-        $crawler = $this->client->request('GET', '/login');
-        $form = $crawler->filter('button[type=submit]')->form();
-        $data = [
-            '_username' => $username,
-            '_password' => 'mypassword',
-        ];
-
-        $this->client->submit($form, $data);
-    }
-
-    /**
-     * Return the user id of the logged in user.
-     * You should be sure that you called `logInAs` before.
-     *
-     * @return int
-     */
-    public function getLoggedInUserId()
-    {
-        $token = static::$kernel->getContainer()->get('security.token_storage')->getToken();
-
-        if (null !== $token) {
-            return $token->getUser()->getId();
-        }
-
-        throw new \RuntimeException('No logged in User.');
-    }
-}