diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java
new file mode 100644
index 000000000..5f7ca0262
--- /dev/null
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishSerializerTest.java
@@ -0,0 +1,68 @@
+package com.iluwatar.tolerantreader;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+/**
+ * Date: 12/30/15 - 18:39 PM
+ *
+ * @author Jeroen Meulemeester
+ */
+public class RainbowFishSerializerTest {
+
+  /**
+   * Create a temporary folder, used to generate files in during this test
+   */
+  @Rule
+  public final TemporaryFolder testFolder = new TemporaryFolder();
+
+  /**
+   * Rainbow fish version 1 used during the tests
+   */
+  private static final RainbowFish V1 = new RainbowFish("version1", 1, 2, 3);
+
+  /**
+   * Rainbow fish version 2 used during the tests
+   */
+  private static final RainbowFishV2 V2 = new RainbowFishV2("version2", 4, 5, 6, true, false, true);
+
+  /**
+   * Verify if a fish, written as version 1 can be read back as version 1
+   */
+  @Test
+  public void testWriteV1ReadV1() throws Exception {
+    final File outputFile = this.testFolder.newFile();
+    RainbowFishSerializer.writeV1(V1, outputFile.getPath());
+
+    final RainbowFish fish = RainbowFishSerializer.readV1(outputFile.getPath());
+    assertNotSame(V1, fish);
+    assertEquals(V1.getName(), fish.getName());
+    assertEquals(V1.getAge(), fish.getAge());
+    assertEquals(V1.getLengthMeters(), fish.getLengthMeters());
+    assertEquals(V1.getWeightTons(), fish.getWeightTons());
+
+  }
+
+  /**
+   * Verify if a fish, written as version 2 can be read back as version 1
+   */
+  @Test
+  public void testWriteV2ReadV1() throws Exception {
+    final File outputFile = this.testFolder.newFile();
+    RainbowFishSerializer.writeV2(V2, outputFile.getPath());
+
+    final RainbowFish fish = RainbowFishSerializer.readV1(outputFile.getPath());
+    assertNotSame(V2, fish);
+    assertEquals(V2.getName(), fish.getName());
+    assertEquals(V2.getAge(), fish.getAge());
+    assertEquals(V2.getLengthMeters(), fish.getLengthMeters());
+    assertEquals(V2.getWeightTons(), fish.getWeightTons());
+  }
+
+}
\ No newline at end of file
diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java
new file mode 100644
index 000000000..0f7df25c8
--- /dev/null
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishTest.java
@@ -0,0 +1,26 @@
+package com.iluwatar.tolerantreader;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Date: 12/30/15 - 18:34 PM
+ *
+ * @author Jeroen Meulemeester
+ */
+public class RainbowFishTest {
+
+  /**
+   * Verify if the getters of a {@link RainbowFish} return the expected values
+   */
+  @Test
+  public void testValues() {
+    final RainbowFish fish = new RainbowFish("name", 1, 2, 3);
+    assertEquals("name", fish.getName());
+    assertEquals(1, fish.getAge());
+    assertEquals(2, fish.getLengthMeters());
+    assertEquals(3, fish.getWeightTons());
+  }
+
+}
\ No newline at end of file
diff --git a/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java
new file mode 100644
index 000000000..5e8bdcef5
--- /dev/null
+++ b/tolerant-reader/src/test/java/com/iluwatar/tolerantreader/RainbowFishV2Test.java
@@ -0,0 +1,29 @@
+package com.iluwatar.tolerantreader;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Date: 12/30/15 - 18:35 PM
+ *
+ * @author Jeroen Meulemeester
+ */
+public class RainbowFishV2Test {
+
+  /**
+   * Verify if the getters of a {@link RainbowFish} return the expected values
+   */
+  @Test
+  public void testValues() {
+    final RainbowFishV2 fish = new RainbowFishV2("name", 1, 2, 3, false, true, false);
+    assertEquals("name", fish.getName());
+    assertEquals(1, fish.getAge());
+    assertEquals(2, fish.getLengthMeters());
+    assertEquals(3, fish.getWeightTons());
+    assertEquals(false, fish.getSleeping());
+    assertEquals(true, fish.getHungry());
+    assertEquals(false, fish.getAngry());
+  }
+
+}
\ No newline at end of file