diff --git a/commons/src/main/java/commons/RecipeIngredient.java b/commons/src/main/java/commons/RecipeIngredient.java
index 36488d9..8b18d41 100644
--- a/commons/src/main/java/commons/RecipeIngredient.java
+++ b/commons/src/main/java/commons/RecipeIngredient.java
@@ -69,7 +69,7 @@ public class RecipeIngredient {
 
     public double amountInBaseUnit() {
         Unit unit = getUnit();
-        if (unit == null || unit.isFormal() || unit.conversionFactor <= 0) {
+        if (unit == null || !unit.isFormal() || unit.conversionFactor <= 0) {
             return 0.0;
         }
         return amount * unit.conversionFactor;
diff --git a/commons/src/test/java/commons/RecipeIngredientTest.java b/commons/src/test/java/commons/RecipeIngredientTest.java
index 3e516e1..bdb4c08 100644
--- a/commons/src/test/java/commons/RecipeIngredientTest.java
+++ b/commons/src/test/java/commons/RecipeIngredientTest.java
@@ -11,13 +11,11 @@ public class RecipeIngredientTest {
     private Recipe recipe;
     private Ingredient ingredient;
     private RecipeIngredient recipeIngredient;
-    private RecipeIngredient testIngredient;
 
     @BeforeEach
     void setup(){
         recipe = new Recipe();
         ingredient = new Ingredient();
-        testIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
     }
 
 
@@ -59,6 +57,16 @@ public class RecipeIngredientTest {
         assertNull(recipeIngredient.getUnit());
     }
 
+    @Test
+    void convertToBaseUnit(){
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
+        assertEquals(1000, recipeIngredient.amountInBaseUnit());
 
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PINCH");
+        assertEquals(0,recipeIngredient.amountInBaseUnit());
+
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"RANDOM");
+        assertEquals(0,recipeIngredient.amountInBaseUnit());
+    }
 
 }