diff --git a/src/main/java/cz/cvut/eshop/shop/DiscountedItem.java b/src/main/java/cz/cvut/eshop/shop/DiscountedItem.java
index 404c1c1018c7081ae369a26cf84546973e4e479c..63d36a62cb576114bcc7b15cab0d559377cf27ce 100644
--- a/src/main/java/cz/cvut/eshop/shop/DiscountedItem.java
+++ b/src/main/java/cz/cvut/eshop/shop/DiscountedItem.java
@@ -19,7 +19,7 @@ public class DiscountedItem extends Item {
     public DiscountedItem(int id, String name, float price, String category, int discount, Date discountFrom, Date discountTo) {
         super(id, name, price, category);
         this.discount = discount > 100 ? 0 : discount;
-        this.discountTo = discountFrom;
+        this.discountFrom = discountFrom;
         this.discountTo = discountTo;
     }
     
diff --git a/src/main/java/cz/cvut/eshop/shop/Item.java b/src/main/java/cz/cvut/eshop/shop/Item.java
index a16f1f7293416971aa75a985190b7be4480ec456..043003560857c476a96eb835c24cb62ea631e2ba 100644
--- a/src/main/java/cz/cvut/eshop/shop/Item.java
+++ b/src/main/java/cz/cvut/eshop/shop/Item.java
@@ -64,7 +64,11 @@ public abstract class Item {
             Item zbozi = (Item) object;
             if( id == zbozi.getID()
                 && name.equals(zbozi.getName())
+
+                // TODO: tester's note: doing equals() on any floating point number representation is very bad idea! :(
                 && price == zbozi.getPrice()
+
+
                 && category.equals(zbozi.getCategory())
                ) {
                 return true;
diff --git a/src/test/java/cz/cvut/eshop/shop/DiscountedItemTest.java b/src/test/java/cz/cvut/eshop/shop/DiscountedItemTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c4f98449f7bf2d9f21eb84136e516c55dfe3a0c9
--- /dev/null
+++ b/src/test/java/cz/cvut/eshop/shop/DiscountedItemTest.java
@@ -0,0 +1,207 @@
+package cz.cvut.eshop.shop;
+
+
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+
+public class DiscountedItemTest {
+
+
+    private static Date fromDate, toDate;
+    private static int id;
+    private static float price;
+    private static int discountValid, discountInvalidSmall, discountInvalidLarge;
+    private static String itemName, itemCategory;
+    private static String fromDateString, toDateString;
+
+    @BeforeClass
+    public static void setUpClass() {
+
+        /*
+        Creating Date object using different constructor than Date() and Date(long milisSinceEpochBegining)
+        is deprecated!
+         */
+        long fromDateRaw = 1538344800000L;
+        long toDateRaw =   1541030399000L;
+
+        fromDate = new Date(fromDateRaw);  // Oct-01-2018
+        toDate = new Date(toDateRaw);    // Oct-30-2018
+
+        // expected valid date format is dd.mm.yyyy
+        fromDateString = "01.10.2018";
+        toDateString = "30.10.2018";
+
+        id = 1;
+        price = 50.0f;
+        discountValid = 45;
+        discountInvalidSmall = -2;
+        discountInvalidLarge = 250;
+
+        itemName = "TestName";
+        itemCategory = "TestCategory";
+
+    }
+
+
+    @Test
+    public void TestCreateDiscountedItemWithDateRangeByDateObject() {
+
+        DiscountedItem d = new DiscountedItem(id, itemName, price, itemCategory, discountValid, fromDate, toDate);
+
+        assertNotNull(d);
+    }
+
+    @Test
+    public void TestCreateDiscountedItemWithDateRangeByDateResultsInNonNullDateTo() {
+
+        DiscountedItem d = new DiscountedItem(id, itemName, price, itemCategory, discountValid, fromDate, toDate);
+
+        assertNotNull(d.getDiscountTo());
+
+    }
+
+
+    @Test
+    public void TestCreateDiscountedItemWithDateRangeByDateResultsInNonNullDateFrom() {
+
+        DiscountedItem d = new DiscountedItem(id, itemName, price, itemCategory, discountValid, fromDate, toDate);
+
+        assertNotNull(d.getDiscountFrom());
+
+    }
+
+    @Test
+    public void TestCreateDiscountedItemWithDateRangeByValidDateString() {
+
+        DiscountedItem d = new DiscountedItem(id, itemName, price, itemCategory, discountInvalidLarge, fromDateString, toDateString);
+
+        assertNotNull(d);
+    }
+
+    @Test
+    public void TestCreateDiscountedItemWithDateRangeByInvalidFromDateString() {
+
+        // expected valid date format is dd.mm.yyyy, let's do an invalid one and await null upon object creation attempt
+        String fromDateStringInvalid = "3.2018";
+
+        DiscountedItem d = new DiscountedItem(id, itemName, price, itemCategory, discountInvalidSmall, fromDateStringInvalid, toDateString);
+        assertNull(d.getDiscountFrom());
+    }
+
+    @Test
+    public void TestCreateDiscountedItemWithDateRangeByInvalidToDateString() {
+        // expected valid date format is dd.mm.yyyy, let's do an invalid one and await null upon object creation attempt
+        String toDateStringInvalid = "1.2017";
+
+        DiscountedItem d = new DiscountedItem(id, itemName, price, itemCategory, discountInvalidSmall, fromDateString, toDateStringInvalid);
+
+        assertNull(d.getDiscountTo());
+    }
+
+    // TODO: ignored  because of error in Item.equals() method, which needs fixing and possible redesign of the interface
+    @Ignore("Ignored  because of error in Item.equals() method, which needs fixing and possible redesign of the interface")
+    @Test
+    public void TestDiscountedItemsAreEqual() {
+        DiscountedItem d1 = new DiscountedItem(id, itemName, price, itemCategory, discountValid, fromDate, toDate);
+        DiscountedItem d2 = new DiscountedItem(id, itemName, price, itemCategory, discountValid, fromDate, toDate);
+
+        assertEquals(d1, d2);
+
+    }
+
+
+    @Test
+    public void TestDiscountedItemsAreNotEqual() {
+        DiscountedItem d1 = new DiscountedItem(id + 2, itemName, price, itemCategory, discountValid, fromDate, toDate);
+        DiscountedItem d2 = new DiscountedItem(id, itemName, price, itemCategory, discountValid, fromDate, toDate);
+
+        assertNotEquals(d1, d2);
+    }
+
+    @Test
+    public void TestSetDiscountToValidDate() {
+        DiscountedItem d = new DiscountedItem(id, itemName, price, itemCategory, discountValid, fromDate, toDate);
+        Date changedDate = new Date(toDate.getTime() + 1000);
+        d.setDiscountTo(changedDate);
+
+        assertEquals(changedDate.getTime(), d.getDiscountTo().getTime());
+    }
+
+    @Test
+    public void TestSetDiscountToByInvalidDateIsIgnored() {
+
+        DiscountedItem d = new DiscountedItem(
+                id,
+                itemName,
+                price,
+                itemCategory,
+                discountValid,
+                fromDate,
+                toDate
+        );
+
+        String toDateStringInvalid = "3.2018";
+        d.setDiscountTo(toDateStringInvalid);
+
+        Date toDateInItem = d.getDiscountTo();
+        assertEquals(toDate, toDateInItem);
+
+    }
+
+    @Test
+    public void TestSetDiscountFromByInvalidDateIsIgnored() {
+
+        DiscountedItem d = new DiscountedItem(
+                id,
+                itemName,
+                price,
+                itemCategory,
+                discountValid,
+                fromDate,
+                toDate
+        );
+
+        String fromDateStringInvalid = "1.2018";
+        d.setDiscountFrom(fromDateStringInvalid);
+
+        Date fromDateInItem = d.getDiscountFrom();
+        assertEquals(fromDate, fromDateInItem);
+
+    }
+
+
+    // TODO: ignored because of incorrect handling of price -> discounted price and also because of defects in Item.equals()
+    @Ignore("Ignored because of incorrect handling of price -> discounted price and also because of defects in Item.equals()")
+    @Test
+    public void TestDeepCopyOfDiscountedItem() {
+
+        DiscountedItem orig, cop;
+
+               orig = new DiscountedItem(
+                id,
+                itemName,
+                price,
+                itemCategory,
+                discountValid,
+                fromDate,
+                toDate
+        );
+
+       cop = orig.copy();
+
+       assertEquals(orig, cop);
+
+    }
+
+
+}
\ No newline at end of file