diff --git a/src/main/java/com/gildedrose/item_helpers/ItemFactory.java b/src/main/java/com/gildedrose/item_helpers/ItemFactory.java
index df26a13b..efa54fbb 100644
--- a/src/main/java/com/gildedrose/item_helpers/ItemFactory.java
+++ b/src/main/java/com/gildedrose/item_helpers/ItemFactory.java
@@ -8,8 +8,9 @@ import com.gildedrose.items.NormalItem;
 import com.gildedrose.main.Item;
 
 import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Stream.of;
 
 public class ItemFactory {
 
@@ -26,9 +27,9 @@ public class ItemFactory {
   }
 
   private static Map<String, ItemType> getItems(Item item) {
-    return Stream.of(new NormalItem(item), new AgedBrieItem(item), new LegendaryItem(item),
-            new BackstagePassItem(item), new ConjuredItem(item))
-        .collect(Collectors.toMap(ItemType::getName, itemType -> itemType));
+    return of(new NormalItem(item), new AgedBrieItem(item), new LegendaryItem(item),
+        new BackstagePassItem(item), new ConjuredItem(item))
+        .collect(toMap(ItemType::getName, itemType -> itemType));
   }
 
 }
diff --git a/src/test/java/com/gildedrose/main/ItemClassTest.java b/src/test/java/com/gildedrose/main/ItemClassTest.java
index 6ae310f2..169fcf6a 100644
--- a/src/test/java/com/gildedrose/main/ItemClassTest.java
+++ b/src/test/java/com/gildedrose/main/ItemClassTest.java
@@ -5,21 +5,20 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
-import static com.gildedrose.items.AgedBrieItem.AGED_BRIE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @TestMethodOrder(OrderAnnotation.class)
 class ItemClassTest {
 
-  private final Item item = new Item(AGED_BRIE, 5, 20);
+  private final Item item = new Item("foo", 5, 20);
 
   @Test
   @Order(1)
   void testItemSuccess() {
-    assertEquals(AGED_BRIE, item.name);
+    assertEquals("foo", item.name);
     assertEquals(5, item.sellIn);
     assertEquals(20, item.quality);
-    assertEquals("Aged Brie, 5, 20", item.toString());
+    assertEquals("foo, 5, 20", item.toString());
   }
 
 }