diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
new file mode 100644
index 000000000..b4f24be9b
--- /dev/null
+++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTest.java
@@ -0,0 +1,144 @@
+/**
+ * The MIT License
+ * Copyright (c) 2016 Thomas Bauer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.iluwatar.tls;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * 
+ * Test of the Callable
+ * 
+ * In this test {@link DateFormatCallable} is tested with only one thread (i.e. without concurrency situation)
+ * <p>
+ * After a successful run 5 date values should be in the result object. All dates should have
+ * the same value (15.11.2015). To avoid problems with time zone not the date instances themselves
+ * are compared by the test. For the test the dates are converted into string format DD.MM.YYY
+ * <p>
+ * Additionally the number of list entries are tested for both the list with the date values
+ * and the list with the exceptions 
+ * 
+ * @author Thomas Bauer, January 2017
+ *
+ */
+public class DateFormatCallableTest {
+
+  // Class variables used in setup() have to be static because setup() has to be static
+  /**
+   * Result object given back by DateFormatCallable
+   *   -- Array with converted date values
+   *   -- Array with thrown exceptions
+   */
+  static Result result;
+
+  /**
+   * The date values created by the run of of DateFormatRunnalbe. List will be filled in the setup() method
+   */
+  static List<String> createdDateValues = new ArrayList<String>();
+
+  /**
+   * Expected number of date values in the date value list created by the run of DateFormatRunnalbe
+   */
+  int expectedCounterDateValues = 5;
+
+  /**
+   * Expected number of exceptions in the exception list created by the run of DateFormatRunnalbe. 
+   */
+  int expectedCounterExceptions = 0;
+
+  /**
+   * Expected content of the list containing the date values created by the run of DateFormatRunnalbe
+   */
+  List<String> expectedDateValues = Arrays.asList("15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015");
+
+  /**
+   * Run Callable and prepare results for usage in the test methods
+   */
+  @BeforeClass
+  public static void setup() {
+    // Create a callable
+    DateFormatCallable callableDf = new DateFormatCallable("dd/MM/yyyy", "15/12/2015");
+    // start thread using the Callable instance
+    ExecutorService executor = Executors.newCachedThreadPool();
+    Future<Result> futureResult = executor.submit(callableDf);
+    try {
+      result = futureResult.get();
+      createdDateValues = convertDatesToString(result);
+    } catch (Exception e) {
+      fail("Setup failed: " + e);
+    }
+    executor.shutdown();
+  }
+
+  private static List<String> convertDatesToString(Result res) {
+    // Format date value as DD.MM.YYYY
+    if (res == null || res.getDateList() == null || res.getDateList().size() == 0) {
+      return null;
+    }
+    List<String> returnList = new ArrayList<String>();
+
+    for (Date dt : res.getDateList()) {
+      Calendar cal = Calendar.getInstance();
+      cal.setTime(dt);
+      returnList.add(cal.get(Calendar.DAY_OF_MONTH) + "." + cal.get(Calendar.MONTH) + "." + cal.get(Calendar.YEAR));
+    }
+    return returnList;
+  }
+
+  /**
+   * Test date values after the run of DateFormatRunnalbe. A correct run should deliver 5 times 15.12.2015
+   */
+  @Test
+  public void testDateValues() {
+    assertEquals(expectedDateValues, createdDateValues);
+  }
+
+  /**
+   * Test number of dates in the list after the run of DateFormatRunnalbe. A correct run should deliver 5 date values
+   */
+  @Test
+  public void testCounterDateValues() {
+    assertEquals(expectedCounterDateValues, result.getDateList().size());
+  }
+
+  /**
+   * Test number of Exceptions in the list after the run of DateFormatRunnalbe. A correct run should deliver 
+   * no exceptions
+   */
+  @Test
+  public void testCounterExceptions() {
+    assertEquals(expectedCounterExceptions, result.getExceptionList().size());
+  }
+}
diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java
new file mode 100644
index 000000000..e0a1507e9
--- /dev/null
+++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestIncorrectDateFormat.java
@@ -0,0 +1,127 @@
+/**
+ * The MIT License
+ * Copyright (c) 2016 Thomas Bauer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.iluwatar.tls;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * 
+ * Test of the Callable
+ * 
+ * In this test {@link DateFormatCallable} is tested with only one thread (i.e. without concurrency situation)
+ * <p>
+ * An incorrect formatted date is passed to the Callable
+ * After a successful run 0 date values and 5 exceptions should be in the result object. 
+ * 
+ * @author Thomas Bauer, January 2017
+ *
+ */
+public class DateFormatCallableTestIncorrectDateFormat {
+
+  // Class variables used in setup() have to be static because setup() has to be static
+  /**
+   * Result object given back by DateFormatCallable
+   *   -- Array with converted date values
+   *   -- Array with thrown exceptions
+   */
+  static Result result;
+
+  /**
+   * The date values created by the run of DateFormatRunnalbe. List will be filled in the setup() method
+   */
+  static List<String> createdExceptions = new ArrayList<String>();
+
+  /**
+   * Expected number of date values in the date value list created by the run of DateFormatRunnalbe
+   */
+  int expectedCounterDateValues = 0;
+
+  /**
+   * Expected number of exceptions in the exception list created by the run of DateFormatRunnalbe. 
+   */
+  int expectedCounterExceptions = 5;
+
+  /**
+   * Expected content of the list containing the exceptions created by the run of DateFormatRunnalbe
+   */
+  List<String> expectedExceptions = Arrays.asList("class java.text.ParseException: Unparseable date: \"15.12.2015\"",
+      "class java.text.ParseException: Unparseable date: \"15.12.2015\"",
+      "class java.text.ParseException: Unparseable date: \"15.12.2015\"",
+      "class java.text.ParseException: Unparseable date: \"15.12.2015\"",
+      "class java.text.ParseException: Unparseable date: \"15.12.2015\"");
+
+  /**
+   * Run Callable and prepare results for usage in the test methods
+   */
+  @BeforeClass
+  public static void setup() {
+    // Create a callable. Pass a string date value not matching the format string
+    DateFormatCallable callableDf = new DateFormatCallable("dd/MM/yyyy", "15.12.2015");
+    // start thread using the Callable instance
+    ExecutorService executor = Executors.newCachedThreadPool();
+    Future<Result> futureResult = executor.submit(callableDf);
+    try {
+      result = futureResult.get();
+    } catch (Exception e) {
+      fail("Setup failed: " + e);
+    }
+    executor.shutdown();
+  }
+
+  /**
+   * Test Exceptions after the run of DateFormatRunnalbe. A correct run should deliver 5 times the
+   * same exception
+   */
+  @Test
+  public void testExecptions() {
+    assertEquals(expectedExceptions, result.getExceptionList());
+  }
+
+  /**
+   * Test number of dates in the list after the run of DateFormatRunnalbe. A correct run should deliver no date values
+   */
+  @Test
+  public void testCounterDateValues() {
+    assertEquals(expectedCounterDateValues, result.getDateList().size());
+  }
+
+  /**
+   * Test number of Exceptions in the list after the run of DateFormatRunnalbe. A correct run should 
+   * deliver 5 exceptions
+   */
+  @Test
+  public void testCounterExceptions() {
+    assertEquals(expectedCounterExceptions, result.getExceptionList().size());
+  }
+}
diff --git a/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java
new file mode 100644
index 000000000..635d6f25a
--- /dev/null
+++ b/tls/src/test/java/com/iluwatar/tls/DateFormatCallableTestMultiThread.java
@@ -0,0 +1,164 @@
+/**
+ * The MIT License
+ * Copyright (c) 2016 Thomas Bauer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.iluwatar.tls;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+/**
+ * 
+ * Test of the Callable
+ * 
+ * In this test {@link DateFormatCallable} is used by 4 threads in parallel
+ * <p>
+ * After a successful run 5 date values should be in the result object of each thread. All dates 
+ * should have the same value (15.11.2015). To avoid problems with time zone not the date instances
+ * themselves are compared by the test. For the test the dates are converted into string format DD.MM.YYY
+ * <p>
+ * Additionally the number of list entries are tested for both the list with the date values
+ * and the list with the exceptions 
+ * 
+ * @author Thomas Bauer, January 2017
+ *
+ */
+public class DateFormatCallableTestMultiThread {
+
+  // Class variables used in setup() have to be static because setup() has to be static
+  /**
+   * Result object given back by DateFormatCallable, one for each thread
+   *   -- Array with converted date values
+   *   -- Array with thrown exceptions
+   */
+  static Result[] result = new Result[4];
+
+  /**
+   * The date values created by the run of of DateFormatRunnalbe. List will be filled in the setup() method
+   */
+  @SuppressWarnings("serial")
+  static class StringArrayList extends ArrayList<String> {
+    /* nothing needed here */
+  }
+  static List<String>[] createdDateValues = new StringArrayList[4];
+
+  /**
+   * Expected number of date values in the date value list created by each thread
+   */
+  int expectedCounterDateValues = 5;
+
+  /**
+   * Expected number of exceptions in the exception list created by each thread 
+   */
+  int expectedCounterExceptions = 0;
+
+  /**
+   * Expected content of the list containing the date values created by each thread 
+   */
+  List<String> expectedDateValues = Arrays.asList("15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015", "15.11.2015");
+
+  /**
+   * Run Callable and prepare results for usage in the test methods
+   */
+  @BeforeClass
+  public static void setup() {
+    // Create a callable
+    DateFormatCallable callableDf = new DateFormatCallable("dd/MM/yyyy", "15/12/2015");
+    // start thread using the Callable instance
+    ExecutorService executor = Executors.newCachedThreadPool();
+    Future<Result> futureResult1 = executor.submit(callableDf);
+    Future<Result> futureResult2 = executor.submit(callableDf);
+    Future<Result> futureResult3 = executor.submit(callableDf);
+    Future<Result> futureResult4 = executor.submit(callableDf);
+    try {
+      result[0] = futureResult1.get();
+      result[1] = futureResult2.get();
+      result[2] = futureResult3.get();
+      result[3] = futureResult4.get();
+      for (int i = 0; i < result.length; i++) {
+        createdDateValues[i] = convertDatesToString(result[i]);
+      }
+    } catch (Exception e) {
+      fail("Setup failed: " + e);
+    }
+    executor.shutdown();
+  }
+
+  private static List<String> convertDatesToString(Result res) {
+    // Format date value as DD.MM.YYYY
+    if (res == null || res.getDateList() == null || res.getDateList().size() == 0) {
+      return null;
+    }
+    List<String> returnList = new StringArrayList();
+
+    for (Date dt : res.getDateList()) {
+      Calendar cal = Calendar.getInstance();
+      cal.setTime(dt);
+      returnList.add(cal.get(Calendar.DAY_OF_MONTH) + "." + cal.get(Calendar.MONTH) + "." + cal.get(Calendar.YEAR));
+    }
+    return returnList;
+  }
+
+  /**
+   * Test date values after the run of DateFormatRunnalbe. A correct run should deliver 5 times 15.12.2015
+   * by each thread
+   */
+  @Test
+  public void testDateValues() {
+    for (int i = 0; i < createdDateValues.length; i++) {
+      assertEquals(expectedDateValues, createdDateValues[i]);
+    }
+  }
+
+  /**
+   * Test number of dates in the list after the run of DateFormatRunnalbe. A correct run should 
+   * deliver 5 date values by each thread
+   */
+  @Test
+  public void testCounterDateValues() {
+    for (int i = 0; i < result.length; i++) {
+      assertEquals(expectedCounterDateValues, result[i].getDateList().size());
+    }
+  }
+
+  /**
+   * Test number of Exceptions in the list after the run of DateFormatRunnalbe. A correct run should 
+   * deliver no exceptions
+   */
+  @Test
+  public void testCounterExceptions() {
+    for (int i = 0; i < result.length; i++) {
+      assertEquals(expectedCounterExceptions, result[i].getExceptionList().size());
+    }
+  }
+}