diff --git a/APED/app/src/main/java/com/example/aped/utils/Favorites.java b/APED/app/src/main/java/com/example/aped/utils/Favorites.java
deleted file mode 100644
index 77e8537..0000000
--- a/APED/app/src/main/java/com/example/aped/utils/Favorites.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.aped.utils;
-
-import java.util.List;
-
-public class Favorites implements IFAVORITES{
-
-    @Override
-    public List<String> getFavorites() {
-        return null;
-    }
-
-    @Override
-    public String addFavorite(String deviceName) {
-        return null;
-    }
-
-    @Override
-    public String removeFavorite(String deviceName) {
-        return null;
-    }
-}
diff --git a/APED/app/src/main/java/com/example/aped/utils/IFAVORITES.java b/APED/app/src/main/java/com/example/aped/utils/IFAVORITES.java
index e013a14..8e5eca6 100644
--- a/APED/app/src/main/java/com/example/aped/utils/IFAVORITES.java
+++ b/APED/app/src/main/java/com/example/aped/utils/IFAVORITES.java
@@ -2,8 +2,28 @@ package com.example.aped.utils;
 
 import java.util.List;
 
+/**
+ * Interface for managing the favorites.
+ */
 public interface IFAVORITES {
+
+    /**
+     * Returns the names of the favorite devices.
+     * @return list of strings
+     */
     List<String> getFavorites();
+
+    /**
+     * Adds a favorite to the list.
+     * @param deviceName the name of the device to be added
+     * @return the name of the device addition worked
+     */
     String addFavorite(String deviceName);
+
+    /**
+     * Removes a device from the favorite list.
+     * @param deviceName the name of the device to be removed
+     * @return the name of the device if the removal worked
+     */
     String removeFavorite(String deviceName);
 }
diff --git a/APED/app/src/main/java/com/example/aped/utils/TestFavorites.java b/APED/app/src/main/java/com/example/aped/utils/TestFavorites.java
new file mode 100644
index 0000000..18c185a
--- /dev/null
+++ b/APED/app/src/main/java/com/example/aped/utils/TestFavorites.java
@@ -0,0 +1,30 @@
+package com.example.aped.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestFavorites implements IFAVORITES{
+
+    private List<String> favorites = new ArrayList<>();
+
+    @Override
+    public List<String> getFavorites() {
+        return favorites;
+    }
+
+    @Override
+    public String addFavorite(String deviceName) {
+        if (!favorites.contains(deviceName)) {
+          favorites.add(deviceName);
+        }
+        return deviceName;
+    }
+
+    @Override
+    public String removeFavorite(String deviceName) {
+        if (favorites.contains(deviceName)) {
+           favorites.remove(deviceName);
+        }
+        return deviceName;
+    }
+}