diff --git a/commons/src/test/java/commons/RecipeIngredientTest.java b/commons/src/test/java/commons/RecipeIngredientTest.java
index bdb4c08..6a08b23 100644
--- a/commons/src/test/java/commons/RecipeIngredientTest.java
+++ b/commons/src/test/java/commons/RecipeIngredientTest.java
@@ -8,65 +8,88 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class RecipeIngredientTest {
 
-    private Recipe recipe;
-    private Ingredient ingredient;
-    private RecipeIngredient recipeIngredient;
+    private RecipeIngredient gram;
+    private RecipeIngredient kilogram;
+    private RecipeIngredient milliliter;
+    private RecipeIngredient liter;
+    private RecipeIngredient teaspoon;
+    private RecipeIngredient tablespoon;
+    private RecipeIngredient cup;
+    private RecipeIngredient piece;
+    private RecipeIngredient pinch;
+    private RecipeIngredient handful;
+    private RecipeIngredient to_taste;
+    private RecipeIngredient invalid;
 
     @BeforeEach
     void setup(){
-        recipe = new Recipe();
-        ingredient = new Ingredient();
+        Recipe recipe = new Recipe();
+        Ingredient ingredient = new Ingredient();
+        gram = new RecipeIngredient(recipe,ingredient,1,"GRAM");
+        kilogram = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
+
+        milliliter = new RecipeIngredient(recipe,ingredient,1,"MILLILITER");
+        liter = new RecipeIngredient(recipe,ingredient,1,"LITER");
+        teaspoon = new RecipeIngredient(recipe,ingredient,1,"TEASPOON");
+        tablespoon = new RecipeIngredient(recipe,ingredient,1,"TABLESPOON");
+        cup = new RecipeIngredient(recipe,ingredient,1,"CUP");
+        piece = new RecipeIngredient(recipe,ingredient,1,"PIECE");
+        pinch = new RecipeIngredient(recipe,ingredient,1,"PINCH");
+        handful = new RecipeIngredient(recipe,ingredient,1,"HANDFUL");
+        to_taste = new RecipeIngredient(recipe,ingredient,1,"TO_TASTE");
+
+        invalid = new RecipeIngredient(recipe,ingredient,1,"INVALID");
     }
 
 
     @Test
     void getFormalUnitTest(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"GRAM");
-        assertEquals(Unit.GRAM, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
-        assertEquals(Unit.KILOGRAM, recipeIngredient.getUnit());
+        assertEquals(Unit.GRAM, gram.getUnit());
+        assertEquals(Unit.KILOGRAM, kilogram.getUnit());
+        assertEquals(Unit.MILLILITER, milliliter.getUnit());
+        assertEquals(Unit.LITER, liter.getUnit());
+        assertEquals(Unit.TEASPOON, teaspoon.getUnit());
+        assertEquals(Unit.TABLESPOON, tablespoon.getUnit());
+        assertEquals(Unit.CUP, cup.getUnit());
 
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"MILLILITER");
-        assertEquals(Unit.MILLILITER, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"LITER");
-        assertEquals(Unit.LITER, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TEASPOON");
-        assertEquals(Unit.TEASPOON, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TABLESPOON");
-        assertEquals(Unit.TABLESPOON, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"CUP");
-        assertEquals(Unit.CUP, recipeIngredient.getUnit());
-
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PIECE");
-        assertEquals(Unit.PIECE, recipeIngredient.getUnit());
+        assertEquals(Unit.PIECE, piece.getUnit());
     }
 
     @Test
     void getInformalUnitTest(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PINCH");
-        assertEquals(Unit.PINCH, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"HANDFUL");
-        assertEquals(Unit.HANDFUL, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TO_TASTE");
-        assertEquals(Unit.TO_TASTE, recipeIngredient.getUnit());
+        assertEquals(Unit.PINCH, pinch.getUnit());
+        assertEquals(Unit.HANDFUL, handful.getUnit());
+        assertEquals(Unit.TO_TASTE, to_taste.getUnit());
     }
 
     @Test
     void getUnknownUnitTest(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"RANDOM");
-        assertNull(recipeIngredient.getUnit());
+        assertNull(invalid.getUnit());
     }
 
     @Test
-    void convertToBaseUnit(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
-        assertEquals(1000, recipeIngredient.amountInBaseUnit());
+    void convertFormalToBaseUnit(){
+        assertEquals(1000, kilogram.amountInBaseUnit());
 
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PINCH");
-        assertEquals(0,recipeIngredient.amountInBaseUnit());
+        assertEquals(1,milliliter.amountInBaseUnit());
+        assertEquals(1000.0,liter.amountInBaseUnit());
+        assertEquals(15.0,tablespoon.amountInBaseUnit());
+        assertEquals(5,teaspoon.amountInBaseUnit());
+        assertEquals(240.0,cup.amountInBaseUnit());
 
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"RANDOM");
-        assertEquals(0,recipeIngredient.amountInBaseUnit());
+        assertEquals(1.0,piece.amountInBaseUnit());
+    }
+
+    @Test
+    void convertInformalToBaseUnit(){
+        assertEquals(0,pinch.amountInBaseUnit());
+        assertEquals(0,handful.amountInBaseUnit());
+        assertEquals(0,to_taste.amountInBaseUnit());
+    }
+
+    @Test
+    void convertUnknownToBaseUnit(){
+        assertEquals(0,invalid.amountInBaseUnit());
     }
 
 }